From patchwork Mon Feb 17 16:57:46 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: 38180 Received: (qmail 123087 invoked by alias); 17 Feb 2020 17:01:48 -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 121643 invoked by uid 89); 17 Feb 2020 17:01:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.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: 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; Mon, 17 Feb 2020 17:01:21 +0000 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:28 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 17 Feb 2020 08:59:27 -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 01HGxQCA028326; Mon, 17 Feb 2020 16:59:26 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxQoN027263; Mon, 17 Feb 2020 17:59:26 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxQN6027259; Mon, 17 Feb 2020 17:59:26 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 38/58] gdbserver: turn target ops 'read_pc' and 'write_pc' into methods Date: Mon, 17 Feb 2020 17:57:46 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur Turn process_stratum_target's read_pc and write_pc 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::read_pc): Define. (process_target::write_pc): Define. Update the derived classes and callers below. * regcache.cc (regcache_read_pc): Update. (regcache_write_pc): Update. * linux-low.cc (linux_target_ops): Update. (linux_read_pc): Turn into ... (linux_process_target::read_pc): ... this. (linux_write_pc): Turn into ... (linux_process_target::write_pc): ... 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/regcache.cc | 16 ++-------------- gdbserver/target.cc | 12 ++++++++++++ gdbserver/target.h | 12 ++++++------ gdbserver/win32-low.cc | 2 -- 8 files changed, 28 insertions(+), 32 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 5e325eb0e7f..8065632a476 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6551,8 +6551,8 @@ linux_process_target::supports_tracepoints () return (*the_low_target.supports_tracepoints) (); } -static CORE_ADDR -linux_read_pc (struct regcache *regcache) +CORE_ADDR +linux_process_target::read_pc (regcache *regcache) { if (the_low_target.get_pc == NULL) return 0; @@ -6560,8 +6560,8 @@ linux_read_pc (struct regcache *regcache) return (*the_low_target.get_pc) (regcache); } -static void -linux_write_pc (struct regcache *regcache, CORE_ADDR pc) +void +linux_process_target::write_pc (regcache *regcache, CORE_ADDR pc) { gdb_assert (the_low_target.set_pc != NULL); @@ -7445,8 +7445,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_read_pc, - linux_write_pc, linux_thread_stopped, NULL, linux_pause_all, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 1d71ff51cf2..67a36c8a67d 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -388,6 +388,10 @@ public: void process_qsupported (char **features, int count) override; bool supports_tracepoints () override; + + CORE_ADDR read_pc (regcache *regcache) override; + + void write_pc (regcache *regcache, CORE_ADDR pc) 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 5a0648987c7..2ac59c3c14a 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -735,8 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* read_pc */ - NULL, /* write_pc */ NULL, /* thread_stopped */ NULL, /* get_tib_address */ NULL, /* pause_all */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index efb342f5938..2b5b02b69bd 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -947,8 +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, /* read_pc */ - NULL, /* write_pc */ NULL, /* thread_stopped */ NULL, /* get_tib_address */ NULL, /* pause_all */ diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index f63463344af..ec9d70d42fb 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -477,25 +477,13 @@ collect_register_by_name (struct regcache *regcache, CORE_ADDR regcache_read_pc (struct regcache *regcache) { - CORE_ADDR pc_val; - - if (the_target->read_pc) - pc_val = the_target->read_pc (regcache); - else - internal_error (__FILE__, __LINE__, - "regcache_read_pc: Unable to find PC"); - - return pc_val; + return the_target->pt->read_pc (regcache); } void regcache_write_pc (struct regcache *regcache, CORE_ADDR pc) { - if (the_target->write_pc) - the_target->write_pc (regcache, pc); - else - internal_error (__FILE__, __LINE__, - "regcache_write_pc: Unable to update PC"); + the_target->pt->write_pc (regcache, pc); } #endif diff --git a/gdbserver/target.cc b/gdbserver/target.cc index ded8f3fee9d..4f8d91c171f 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -614,3 +614,15 @@ process_target::supports_tracepoints () { return false; } + +CORE_ADDR +process_target::read_pc (regcache *regcache) +{ + gdb_assert_not_reached ("process_target::read_pc: Unable to find PC"); +} + +void +process_target::write_pc (regcache *regcache, CORE_ADDR pc) +{ + gdb_assert_not_reached ("process_target::write_pc: Unable to update PC"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index e36f121a9ae..2aef0208c11 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,12 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Read PC from REGCACHE. */ - CORE_ADDR (*read_pc) (struct regcache *regcache); - - /* Write PC to REGCACHE. */ - void (*write_pc) (struct regcache *regcache, CORE_ADDR pc); - /* Return true if THREAD is known to be stopped now. */ int (*thread_stopped) (struct thread_info *thread); @@ -488,6 +482,12 @@ public: /* Return true if the target supports tracepoints, false otherwise. */ virtual bool supports_tracepoints (); + + /* Read PC from REGCACHE. */ + virtual CORE_ADDR read_pc (regcache *regcache); + + /* Write PC to REGCACHE. */ + virtual void write_pc (regcache *regcache, CORE_ADDR pc); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 87a59648c30..a7329fe20cf 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1852,8 +1852,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, /* read_pc */ - NULL, /* write_pc */ NULL, /* thread_stopped */ win32_get_tib_address, NULL, /* pause_all */