From patchwork Tue Feb 11 09:01:37 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: 37909 Received: (qmail 119936 invoked by alias); 11 Feb 2020 09:03:42 -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 118165 invoked by uid 89); 11 Feb 2020 09:03:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.5 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: mga07.intel.com Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:22 +0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:21 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga005.jf.intel.com with ESMTP; 11 Feb 2020 01:03:21 -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 01B93KR7002211; Tue, 11 Feb 2020 09:03:20 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93KxH010520; Tue, 11 Feb 2020 10:03:20 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93Jkw010516; Tue, 11 Feb 2020 10:03:20 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 25/58] gdbserver: turn target op 'get_tls_address' into a method Date: Tue, 11 Feb 2020 10:01:37 +0100 Message-Id: <58edb2e18b9958fc868a67b12dc6c4898e29674f.1581410934.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 Make process_stratum_target's get_tls_address op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. Also add 'supports_get_tls_address'. * target.c (process_target::get_tls_address): Define. (process_target::supports_get_tls_address): Define. Update the derived structs and callers below. * server.c (handle_query): Update. * linux-low.c (linux_target_ops): Update. (linux_process_target::supports_get_tls_address): Define. (linux_process_target::get_tls_address): Define. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. * win32-low.c (win32_target_ops): Update. --- gdbserver/linux-low.c | 28 +++++++++++++++++++++++----- gdbserver/linux-low.h | 5 +++++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/server.c | 6 +++--- gdbserver/target.c | 13 +++++++++++++ gdbserver/target.h | 20 +++++++++++--------- gdbserver/win32-low.c | 1 - 8 files changed, 55 insertions(+), 20 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 93cd2bf57d4..66732a2d77f 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6112,6 +6112,29 @@ linux_process_target::read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) } #endif +bool +linux_process_target::supports_get_tls_address () +{ +#ifdef USE_THREAD_DB + return true; +#else + return false; +#endif +} + +int +linux_process_target::get_tls_address (thread_info *thread, + CORE_ADDR offset, + CORE_ADDR load_module, + CORE_ADDR *address) +{ +#ifdef USE_THREAD_DB + return thread_db_get_tls_address (thread, offset, load_module, address); +#else + return -1; +#endif +} + static int linux_qxfer_osdata (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, @@ -7381,11 +7404,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { -#ifdef USE_THREAD_DB - thread_db_get_tls_address, -#else - NULL, -#endif hostio_last_error_from_errno, linux_qxfer_osdata, linux_xfer_siginfo, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 5cf2e62dffb..be6310da723 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -343,6 +343,11 @@ public: int read_offsets (CORE_ADDR *text, CORE_ADDR *data) override; #endif + + bool supports_get_tls_address () override; + + int get_tls_address (thread_info *thread, CORE_ADDR offset, + CORE_ADDR load_module, CORE_ADDR *address) override; }; #define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr))) diff --git a/gdbserver/lynx-low.c b/gdbserver/lynx-low.c index 2a3eda61b5f..4525d6e694a 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* get_tls_address */ NULL, /* hostio_last_error */ NULL, /* qxfer_osdata */ NULL, /* qxfer_siginfo */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 5d4540cff7e..38ddcbaa33a 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -956,7 +956,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, /* thread_db_set_tls_address */ hostio_last_error_from_errno, NULL, /* nto_qxfer_osdata */ NULL, /* xfer_siginfo */ diff --git a/gdbserver/server.c b/gdbserver/server.c index b4fd9c6a5e5..01d41af0f89 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -2467,7 +2467,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) } /* Thread-local storage support. */ - if (the_target->get_tls_address != NULL + if (the_target->pt->supports_get_tls_address () && startswith (own_buf, "qGetTLSAddr:")) { char *p = own_buf + 12; @@ -2513,8 +2513,8 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (thread == NULL) err = 2; else - err = the_target->get_tls_address (thread, parts[0], parts[1], - &address); + err = the_target->pt->get_tls_address (thread, parts[0], parts[1], + &address); } if (err == 0) diff --git a/gdbserver/target.c b/gdbserver/target.c index 501a8d675db..f578dbea0da 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -493,3 +493,16 @@ process_target::read_offsets (CORE_ADDR *text, CORE_ADDR *data) { gdb_assert_not_reached ("target op read_offsets not supported"); } + +bool +process_target::supports_get_tls_address () +{ + return false; +} + +int +process_target::get_tls_address (thread_info *thread, CORE_ADDR offset, + CORE_ADDR load_module, CORE_ADDR *address) +{ + gdb_assert_not_reached ("target op get_tls_address not supported"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 8919d43317e..aed363991ef 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,15 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Fetch the address associated with a specific thread local storage - area, determined by the specified THREAD, OFFSET, and LOAD_MODULE. - Stores it in *ADDRESS and returns zero on success; otherwise returns - an error code. A return value of -1 means this system does not - support the operation. */ - - int (*get_tls_address) (struct thread_info *thread, CORE_ADDR offset, - CORE_ADDR load_module, CORE_ADDR *address); - /* Fill BUF with an hostio error packet representing the last hostio error. */ void (*hostio_last_error) (char *buf); @@ -477,6 +468,17 @@ public: needed for uclinux where the executable is relocated during load time. */ virtual int read_offsets (CORE_ADDR *text, CORE_ADDR *data); + + /* Return true if the get_tls_address target op is supported. */ + virtual bool supports_get_tls_address (); + + /* Fetch the address associated with a specific thread local storage + area, determined by the specified THREAD, OFFSET, and LOAD_MODULE. + Stores it in *ADDRESS and returns zero on success; otherwise returns + an error code. A return value of -1 means this system does not + support the operation. */ + virtual int get_tls_address (thread_info *thread, CORE_ADDR offset, + CORE_ADDR load_module, CORE_ADDR *address); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 48b70a5e334..21008ccc7ab 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1834,7 +1834,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, /* get_tls_address */ #ifdef _WIN32_WCE wince_hostio_last_error, #else