From patchwork Mon Feb 17 16:57:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tankut Baris Aktemur X-Patchwork-Id: 38173 Received: (qmail 122779 invoked by alias); 17 Feb 2020 17:01:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 120715 invoked by uid 89); 17 Feb 2020 17:01:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mga14.intel.com Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 17:00:51 +0000 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:27 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 17 Feb 2020 08:59:26 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 01HGxPY0028252; Mon, 17 Feb 2020 16:59:25 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxPn1027235; Mon, 17 Feb 2020 17:59:25 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxPwq027231; Mon, 17 Feb 2020 17:59:25 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 34/58] gdbserver: turn target op 'core_of_thread' into a method Date: Mon, 17 Feb 2020 17:57:42 +0100 Message-Id: <2d8b8c840bde032c2ac19146c72dac0eefa47435.1581956647.git.tankut.baris.aktemur@intel.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur Turn process_stratum_target's core_of_thread op into a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (target_core_of_thread): Update the macro. * target.cc (process_target::core_of_thread): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_process_target::core_of_thread): Define. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. * nto-low.cc (nto_target_ops): Update. * win32-low.cc (win32_target_ops): Update. --- gdbserver/linux-low.cc | 7 ++++++- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 9 ++++----- gdbserver/win32-low.cc | 1 - 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 5fb38819e61..8ddaf64c103 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6404,6 +6404,12 @@ linux_process_target::handle_monitor_command (char *mon) #endif } +int +linux_process_target::core_of_thread (ptid_t ptid) +{ + return linux_common_core_of_thread (ptid); +} + static int linux_supports_disable_randomization (void) { @@ -7435,7 +7441,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_common_core_of_thread, linux_read_loadmap, linux_process_qsupported, linux_supports_tracepoints, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index d3157220730..1d89ebd7a2d 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -375,6 +375,8 @@ public: void handle_new_gdb_connection () override; int handle_monitor_command (char *mon) override; + + int core_of_thread (ptid_t ptid) override; }; #define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr))) diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc index d489886755e..2e177594c3a 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ NULL, /* supports_tracepoints */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 9cd30da32e6..9a708712905 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -947,7 +947,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ NULL, /* supports_tracepoints */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 74cd90a48a4..e1c802d65bc 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -583,3 +583,9 @@ process_target::handle_monitor_command (char *mon) { return 0; } + +int +process_target::core_of_thread (ptid_t ptid) +{ + return -1; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index b607ca62540..96d986a09ab 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns the core given a thread, or -1 if not known. */ - int (*core_of_thread) (ptid_t); - /* Read loadmaps. Read LEN bytes at OFFSET into a buffer at MYADDR. */ int (*read_loadmap) (const char *annex, CORE_ADDR offset, unsigned char *myaddr, unsigned int len); @@ -486,6 +483,9 @@ public: /* The target-specific routine to process monitor command. Returns 1 if handled, or 0 to perform default processing. */ virtual int handle_monitor_command (char *mon); + + /* Returns the core given a thread, or -1 if not known. */ + virtual int core_of_thread (ptid_t ptid); }; extern process_stratum_target *the_target; @@ -700,8 +700,7 @@ int prepare_to_access_memory (void); void done_accessing_memory (void); #define target_core_of_thread(ptid) \ - (the_target->core_of_thread ? (*the_target->core_of_thread) (ptid) \ - : -1) + the_target->pt->core_of_thread (ptid) #define target_thread_name(ptid) \ (the_target->thread_name ? (*the_target->thread_name) (ptid) \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index fcb3906197d..c0b73268238 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1852,7 +1852,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ NULL, /* supports_tracepoints */