From patchwork Mon Feb 17 16:57:23 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: 38146 Received: (qmail 114187 invoked by alias); 17 Feb 2020 16:59:57 -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 113611 invoked by uid 89); 17 Feb 2020 16:59:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.1 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: mga18.intel.com Received: from mga18.intel.com (HELO mga18.intel.com) (134.134.136.126) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:28 +0000 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:24 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga006.fm.intel.com with ESMTP; 17 Feb 2020 08:59: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 01HGxL7Y028187; Mon, 17 Feb 2020 16:59:21 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxK7h027099; Mon, 17 Feb 2020 17:59:20 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxKjg027095; Mon, 17 Feb 2020 17:59:20 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 15/58] gdbserver: turn target op 'look_up_symbols' into a method Date: Mon, 17 Feb 2020 17:57:23 +0100 Message-Id: <7229a8b2c6999c6deb25c12974e4cb986b9683b1.1581956646.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 look_up_symbols 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.cc (process_target::look_up_symbols): Define. Update the derived classes and callers below. * server.cc (handle_query): Update. * linux-low.cc (linux_target_ops): Update. (linux_look_up_symbols): Turn into ... (linux_process_target::look_up_symbols): ... this. * 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 | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/server.cc | 4 ++-- gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 14 ++++++-------- gdbserver/win32-low.cc | 1 - 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 1a790e5eae9..f073a38f092 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -5898,8 +5898,8 @@ linux_process_target::write_memory (CORE_ADDR memaddr, return 0; } -static void -linux_look_up_symbols (void) +void +linux_process_target::look_up_symbols () { #ifdef USE_THREAD_DB struct process_info *proc = current_process (); @@ -7369,7 +7369,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_look_up_symbols, linux_request_interrupt, linux_read_auxv, linux_supports_z_point_type, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index b8b10143dec..05269dc18ab 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -305,6 +305,8 @@ public: int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) override; + + void look_up_symbols () 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 eb5147d907b..bedf9182ce2 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -729,7 +729,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* look_up_symbols */ lynx_request_interrupt, NULL, /* read_auxv */ NULL, /* supports_z_point_type */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index d56f247acb4..c229e41d525 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -943,7 +943,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, /* nto_look_up_symbols */ nto_request_interrupt, nto_read_auxv, nto_supports_z_point_type, diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 92feff36516..4785eabaf06 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -2192,8 +2192,8 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (target_supports_tracepoints ()) tracepoint_look_up_symbols (); - if (current_thread != NULL && the_target->look_up_symbols != NULL) - (*the_target->look_up_symbols) (); + if (current_thread != NULL) + the_target->pt->look_up_symbols (); current_thread = save_thread; diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 49302f61dfb..dd9ee8dfd47 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -408,3 +408,9 @@ process_target::done_accessing_memory () { /* Nop. */ } + +void +process_target::look_up_symbols () +{ + /* Nop. */ +} diff --git a/gdbserver/target.h b/gdbserver/target.h index ead4a613e90..7f37a904f76 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,14 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Query GDB for the values of any symbols we're interested in. - This function is called whenever we receive a "qSymbols::" - query, which corresponds to every time more symbols (might) - become available. NULL if we aren't interested in any - symbols. */ - - void (*look_up_symbols) (void); - /* Send an interrupt request to the inferior process, however is appropriate. */ @@ -477,6 +469,12 @@ public: Returns 0 on success and errno on failure. */ virtual int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) = 0; + + /* Query GDB for the values of any symbols we're interested in. + This function is called whenever we receive a "qSymbols::" + query, which corresponds to every time more symbols (might) + become available. */ + virtual void look_up_symbols (); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index ef0d6035e93..4ac1b3a1ca2 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1838,7 +1838,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, /* lookup_symbols */ win32_request_interrupt, NULL, /* read_auxv */ win32_supports_z_point_type,