From patchwork Mon Feb 17 16:58:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 38157 Received: (qmail 121901 invoked by alias); 17 Feb 2020 17:01:40 -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 117159 invoked by uid 89); 17 Feb 2020 17:00:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.2 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: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:32 +0000 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:31 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga008.jf.intel.com with ESMTP; 17 Feb 2020 08:59:30 -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 01HGxUro028373; Mon, 17 Feb 2020 16:59:30 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxTbI027370; Mon, 17 Feb 2020 17:59:29 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxTBJ027366; Mon, 17 Feb 2020 17:59:29 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' into methods Date: Mon, 17 Feb 2020 17:58:01 +0100 Message-Id: <63dc3dced7480cd85e30a3358048e2fbf8f3df22.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 thread_name and thread_handle ops into methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. (target_thread_name): Update the macro. (target_thread_handle): Update the macro. * target.cc (process_target::thread_name): Define. (process_target::thread_handle): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_process_target::thread_name): Define. (linux_process_target::thread_handle): 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 | 21 +++++++++++++++------ gdbserver/linux-low.h | 7 +++++++ gdbserver/lynx-low.cc | 2 -- gdbserver/nto-low.cc | 2 -- gdbserver/target.cc | 13 +++++++++++++ gdbserver/target.h | 27 +++++++++++++-------------- gdbserver/win32-low.cc | 2 -- 7 files changed, 48 insertions(+), 26 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 9dce2a7c35e..cd079562d47 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -7393,6 +7393,21 @@ linux_process_target::breakpoint_kind_from_current_state (CORE_ADDR *pcptr) return breakpoint_kind_from_pc (pcptr); } +const char * +linux_process_target::thread_name (ptid_t thread) +{ + return linux_proc_tid_get_name (thread); +} + +#if USE_THREAD_DB +bool +linux_process_target::thread_handle (ptid_t ptid, gdb_byte **handle, + int *handle_len) +{ + return thread_db_thread_handle (ptid, handle, handle_len); +} +#endif + /* Default implementation of linux_target_ops method "set_pc" for 32-bit pc register which is literally named "pc". */ @@ -7505,15 +7520,9 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_proc_tid_get_name, linux_supports_software_single_step, linux_supports_catch_syscall, linux_get_ipa_tdesc_idx, -#if USE_THREAD_DB - thread_db_thread_handle, -#else - NULL, -#endif &the_linux_target, }; diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index ae422b83879..2acd65f2828 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -468,6 +468,13 @@ public: const gdb_byte *sw_breakpoint_from_kind (int kind, int *size) override; int breakpoint_kind_from_current_state (CORE_ADDR *pcptr) override; + + const char *thread_name (ptid_t thread) override; + +#if USE_THREAD_DB + bool thread_handle (ptid_t ptid, gdb_byte **handle, + int *handle_len) override; +#endif }; #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 b07412f0dcd..0c460be5f31 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -741,11 +741,9 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* thread_name */ NULL, /* supports_software_single_step */ NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ - NULL, /* thread_handle */ &the_lynx_target, }; diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index b0ac86f8790..4c3c5a3a42d 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -947,11 +947,9 @@ nto_process_target::sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* thread_name */ NULL, /* supports_software_single_step */ NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ - NULL, /* thread_handle */ &the_nto_target, }; diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 76eef626ce8..b7ed26b22f4 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -801,3 +801,16 @@ process_target::breakpoint_kind_from_current_state (CORE_ADDR *pcptr) { return breakpoint_kind_from_pc (pcptr); } + +const char * +process_target::thread_name (ptid_t thread) +{ + return nullptr; +} + +bool +process_target::thread_handle (ptid_t ptid, gdb_byte **handle, + int *handle_len) +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 4651e449a80..4d9de5513aa 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return the thread's name, or NULL if the target is unable to determine it. - The returned value must not be freed by the caller. */ - const char *(*thread_name) (ptid_t thread); - /* Returns true if the target can software single step. */ int (*supports_software_single_step) (void); @@ -84,11 +80,6 @@ struct process_stratum_target /* Return tdesc index for IPA. */ int (*get_ipa_tdesc_idx) (void); - /* Thread ID to (numeric) thread handle: Return true on success and - false for failure. Return pointer to thread handle via HANDLE - and the handle's length via HANDLE_LEN. */ - bool (*thread_handle) (ptid_t ptid, gdb_byte **handle, int *handle_len); - /* The object that will gradually replace this struct. */ process_target *pt; }; @@ -503,6 +494,17 @@ public: PC. The PCPTR is adjusted to the real memory location in case a flag (e.g., the Thumb bit on ARM) is present in the PC. */ virtual int breakpoint_kind_from_current_state (CORE_ADDR *pcptr); + + /* Return the thread's name, or NULL if the target is unable to + determine it. The returned value must not be freed by the + caller. */ + virtual const char *thread_name (ptid_t thread); + + /* Thread ID to (numeric) thread handle: Return true on success and + false for failure. Return pointer to thread handle via HANDLE + and the handle's length via HANDLE_LEN. */ + virtual bool thread_handle (ptid_t ptid, gdb_byte **handle, + int *handle_len); }; extern process_stratum_target *the_target; @@ -683,13 +685,10 @@ void done_accessing_memory (void); the_target->pt->core_of_thread (ptid) #define target_thread_name(ptid) \ - (the_target->thread_name ? (*the_target->thread_name) (ptid) \ - : NULL) + the_target->pt->thread_name (ptid) #define target_thread_handle(ptid, handle, handle_len) \ - (the_target->thread_handle ? (*the_target->thread_handle) \ - (ptid, handle, handle_len) \ - : false) + the_target->pt->thread_handle (ptid, handle, handle_len) int read_inferior_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len); diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 71adf18ebb5..218f007bdec 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,11 +1858,9 @@ win32_process_target::sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* thread_name */ NULL, /* supports_software_single_step */ NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ - NULL, /* thread_handle */ &the_win32_target, };