From patchwork Mon Feb 17 16:57:21 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: 38149 Received: (qmail 114304 invoked by alias); 17 Feb 2020 16:59:58 -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 113619 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=Neither X-HELO: mga05.intel.com Received: from mga05.intel.com (HELO mga05.intel.com) (192.55.52.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:30 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:22 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.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 01HGxKSH028181; Mon, 17 Feb 2020 16:59:20 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxKWj027085; Mon, 17 Feb 2020 17:59:20 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxKgO027081; Mon, 17 Feb 2020 17:59:20 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 13/58] gdbserver: turn prepare_to_access_memory & done_accessing_memory into methods Date: Mon, 17 Feb 2020 17:57:21 +0100 Message-Id: <4f403cabfa59bfe8c373956915377c55f88cd00c.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 prepare_to_access_memory and done_accessing_memory ops into methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. * target.cc (process_target::prepare_to_access_memory): Define. (process_target::done_accessing_memory): Define. (prepare_to_access_memory): Update. (done_accessing_memory): Update. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_prepare_to_access_memory): Turn into ... (linux_process_target::prepare_to_access_memory): ... this. (linux_done_accessing_memory): Turn into ... (linux_process_target::done_accessing_memory): ... 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 | 10 ++++------ gdbserver/linux-low.h | 4 ++++ gdbserver/lynx-low.cc | 2 -- gdbserver/nto-low.cc | 2 -- gdbserver/target.cc | 26 ++++++++++++++++---------- gdbserver/target.h | 32 +++++++++++++++----------------- gdbserver/win32-low.cc | 2 -- 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 7cf7d90fdbc..6f408ad9333 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6505,8 +6505,8 @@ linux_unpause_all (int unfreeze) unstop_all_lwps (unfreeze, NULL); } -static int -linux_prepare_to_access_memory (void) +int +linux_process_target::prepare_to_access_memory () { /* Neither ptrace nor /proc/PID/mem allow accessing memory through a running LWP. */ @@ -6515,8 +6515,8 @@ linux_prepare_to_access_memory (void) return 0; } -static void -linux_done_accessing_memory (void) +void +linux_process_target::done_accessing_memory () { /* Neither ptrace nor /proc/PID/mem allow accessing memory through a running LWP. */ @@ -7359,8 +7359,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_prepare_to_access_memory, - linux_done_accessing_memory, linux_read_memory, linux_write_memory, linux_look_up_symbols, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 85b5c8a62d1..2b7b357ba67 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -295,6 +295,10 @@ public: void fetch_registers (regcache *regcache, int regno) override; void store_registers (regcache *regcache, int regno) override; + + int prepare_to_access_memory () override; + + void done_accessing_memory () 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 5c46567f9ed..e243764a863 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -727,8 +727,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* prepare_to_access_memory */ - NULL, /* done_accessing_memory */ lynx_read_memory, lynx_write_memory, NULL, /* look_up_symbols */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index a051f36eecc..36bd40c20d8 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -941,8 +941,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, /* prepare_to_access_memory */ - NULL, /* done_accessing_memory */ nto_read_memory, nto_write_memory, NULL, /* nto_look_up_symbols */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index b73c4465f1c..f88e9faf191 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -57,14 +57,9 @@ prepare_to_access_memory (void) it. */ prev_general_thread = cs.general_thread; - if (the_target->prepare_to_access_memory != NULL) - { - int res; - - res = the_target->prepare_to_access_memory (); - if (res != 0) - return res; - } + int res = the_target->pt->prepare_to_access_memory (); + if (res != 0) + return res; for_each_thread (prev_general_thread.pid (), [&] (thread_info *thread) { @@ -114,8 +109,7 @@ done_accessing_memory (void) { client_state &cs = get_client_state (); - if (the_target->done_accessing_memory != NULL) - the_target->done_accessing_memory (); + the_target->pt->done_accessing_memory (); /* Restore the previous selected thread. */ cs.general_thread = prev_general_thread; @@ -402,3 +396,15 @@ process_target::post_create_inferior () { /* Nop. */ } + +int +process_target::prepare_to_access_memory () +{ + return 0; +} + +void +process_target::done_accessing_memory () +{ + /* Nop. */ +} diff --git a/gdbserver/target.h b/gdbserver/target.h index e42c7509bb1..e89ddbb0048 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,23 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Prepare to read or write memory from the inferior process. - Targets use this to do what is necessary to get the state of the - inferior such that it is possible to access memory. - - This should generally only be called from client facing routines, - such as gdb_read_memory/gdb_write_memory, or the GDB breakpoint - insertion routine. - - Like `read_memory' and `write_memory' below, returns 0 on success - and errno on failure. */ - - int (*prepare_to_access_memory) (void); - - /* Undo the effects of prepare_to_access_memory. */ - - void (*done_accessing_memory) (void); - /* Read memory from the inferior process. This should generally be called through read_inferior_memory, which handles breakpoint shadowing. @@ -480,6 +463,21 @@ public: If REGNO is -1, store all registers; otherwise, store at least REGNO. */ virtual void store_registers (regcache *regcache, int regno) = 0; + + /* Prepare to read or write memory from the inferior process. + Targets use this to do what is necessary to get the state of the + inferior such that it is possible to access memory. + + This should generally only be called from client facing routines, + such as gdb_read_memory/gdb_write_memory, or the GDB breakpoint + insertion routine. + + Like `read_memory' and `write_memory' below, returns 0 on success + and errno on failure. */ + virtual int prepare_to_access_memory (); + + /* Undo the effects of prepare_to_access_memory. */ + virtual void done_accessing_memory (); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 9e4e4c368ca..4a8e64d11ae 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1837,8 +1837,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, /* prepare_to_access_memory */ - NULL, /* done_accessing_memory */ win32_read_inferior_memory, win32_write_inferior_memory, NULL, /* lookup_symbols */