From patchwork Tue Feb 11 09:01:52 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: 37927 Received: (qmail 122146 invoked by alias); 11 Feb 2020 09:03:56 -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 119559 invoked by uid 89); 11 Feb 2020 09:03:39 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.3 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=arrange 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; Tue, 11 Feb 2020 09:03:28 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:26 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 11 Feb 2020 01:03:25 -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 01B93Nnn002275; Tue, 11 Feb 2020 09:03:23 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93Ngt010625; Tue, 11 Feb 2020 10:03:23 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93NsA010621; Tue, 11 Feb 2020 10:03:23 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 40/58] gdbserver: turn target op 'get_tib_address' into a method Date: Tue, 11 Feb 2020 10:01:52 +0100 Message-Id: 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_tib_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_tib_address'. * target.c (process_target::get_tib_address): Define. (process_target::supports_get_tib_address): Define. Update the derived structs and callers below. * server.c (handle_query): Update. * linux-low.c (win32_target_ops): Update. * lynx-low.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. * win32-low.c (win32_target_ops): Update. (win32_process_target::supports_get_tib_address): Define. (win32_get_tib_address): Turn into ... (win32_process_target::get_tib_address): ... this. * win32-low.h (class win32_process_target): Update. --- gdbserver/linux-low.c | 1 - gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/server.c | 4 ++-- gdbserver/target.c | 12 ++++++++++++ gdbserver/target.h | 9 ++++++--- gdbserver/win32-low.c | 11 ++++++++--- gdbserver/win32-low.h | 4 ++++ 8 files changed, 32 insertions(+), 11 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index dc7b70b5e59..a75c7ade312 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -7444,7 +7444,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - NULL, linux_pause_all, linux_unpause_all, linux_stabilize_threads, diff --git a/gdbserver/lynx-low.c b/gdbserver/lynx-low.c index 2842036d7ca..5553e87a137 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_tib_address */ NULL, /* pause_all */ NULL, /* unpause_all */ NULL, /* stabilize_threads */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index ce25e335e3b..877e264e1dc 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -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, /* get_tib_address */ NULL, /* pause_all */ NULL, /* unpause_all */ NULL, /* stabilize_threads */ diff --git a/gdbserver/server.c b/gdbserver/server.c index f3dca8d3ce0..77155935fab 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -2532,7 +2532,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) } /* Windows OS Thread Information Block address support. */ - if (the_target->get_tib_address != NULL + if (the_target->pt->supports_get_tib_address () && startswith (own_buf, "qGetTIBAddr:")) { const char *annex; @@ -2540,7 +2540,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) CORE_ADDR tlb; ptid_t ptid = read_ptid (own_buf + 12, &annex); - n = (*the_target->get_tib_address) (ptid, &tlb); + n = the_target->pt->get_tib_address (ptid, &tlb); if (n == 1) { strcpy (own_buf, paddress(tlb)); diff --git a/gdbserver/target.c b/gdbserver/target.c index 34805ef5b88..f1cdfc0446d 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -638,3 +638,15 @@ process_target::thread_stopped (thread_info *thread) { gdb_assert_not_reached ("target op thread_stopped not supported"); } + +bool +process_target::supports_get_tib_address () +{ + return false; +} + +int +process_target::get_tib_address (ptid_t ptid, CORE_ADDR *address) +{ + gdb_assert_not_reached ("target op get_tib_address not supported"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 554bfe09af1..aba4bbfab96 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Read Thread Information Block address. */ - int (*get_tib_address) (ptid_t ptid, CORE_ADDR *address); - /* Pause all threads. If FREEZE, arrange for any resume attempt to be ignored until an unpause_all call unfreezes threads again. There can be nested calls to pause_all, so a freeze counter @@ -491,6 +488,12 @@ public: /* Return true if THREAD is known to be stopped now. */ virtual bool thread_stopped (thread_info *thread); + + /* Return true if the get_tib_address op is supported. */ + virtual bool supports_get_tib_address (); + + /* Read Thread Information Block address. */ + virtual int get_tib_address (ptid_t ptid, CORE_ADDR *address); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 5e9a05ac97c..781ca7557a9 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1814,10 +1814,16 @@ win32_process_target::qxfer_siginfo (const char *annex, return len; } +bool +win32_process_target::supports_get_tib_address () +{ + return true; +} + /* Write Windows OS Thread Information Block address. */ -static int -win32_get_tib_address (ptid_t ptid, CORE_ADDR *addr) +int +win32_process_target::get_tib_address (ptid_t ptid, CORE_ADDR *addr) { win32_thread_info *th; th = thread_rec (ptid, 0); @@ -1842,7 +1848,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - win32_get_tib_address, NULL, /* pause_all */ NULL, /* unpause_all */ NULL, /* stabilize_threads */ diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 105c1443968..fcd50e2a45b 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -161,6 +161,10 @@ public: int qxfer_siginfo (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len) override; + + bool supports_get_tib_address () override; + + int get_tib_address (ptid_t ptid, CORE_ADDR *addr) override; }; /* Retrieve the context for this thread, if not already retrieved. */