From patchwork Mon Feb 17 16:57:52 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: 38152 Received: (qmail 121696 invoked by alias); 17 Feb 2020 17:01:38 -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 114930 invoked by uid 89); 17 Feb 2020 17:00:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.2 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: mga04.intel.com Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:31 +0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:30 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga005.fm.intel.com with ESMTP; 17 Feb 2020 08:59:28 -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 01HGxROd028344; Mon, 17 Feb 2020 16:59:28 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxRDX027307; Mon, 17 Feb 2020 17:59:27 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxRY6027303; Mon, 17 Feb 2020 17:59:27 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 44/58] gdbserver: turn target op 'emit_ops' into a method Date: Mon, 17 Feb 2020 17:57:52 +0100 Message-Id: <3429bdb29daee49f7e5e1ba247d3872ce8600e6e.1581956647.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 emit_ops 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_emit_ops): Update the macro. * target.cc (process_target::emit_ops): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_emit_ops): Turn into ... (linux_process_target::emit_ops): ... 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/target.cc | 6 ++++++ gdbserver/target.h | 10 +++++----- gdbserver/win32-low.cc | 1 - 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index f1d61190b12..0203afa66cf 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6639,8 +6639,8 @@ linux_process_target::install_fast_tracepoint_jump_pad err); } -static struct emit_ops * -linux_emit_ops (void) +emit_ops * +linux_process_target::emit_ops () { if (the_low_target.emit_ops != NULL) return (*the_low_target.emit_ops) (); @@ -7452,7 +7452,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_emit_ops, linux_supports_disable_randomization, linux_qxfer_libraries_svr4, linux_supports_agent, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 35e30ed590d..3a6d2d02dff 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -420,6 +420,8 @@ public: char *err) override; int get_min_fast_tracepoint_insn_len () override; + + struct emit_ops *emit_ops () 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 4089b261bfd..1c71c60f096 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* emit_ops */ NULL, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index e0d3d49bb66..502e6104638 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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, /* emit_ops */ NULL, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 29b5bbcd9b1..44069f1ad44 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -693,3 +693,9 @@ process_target::get_min_fast_tracepoint_insn_len () { return 0; } + +struct emit_ops * +process_target::emit_ops () +{ + return nullptr; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 21f22a4d0db..0d51af7965c 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return the bytecode operations vector for the current inferior. - Returns NULL if bytecode compilation is not supported. */ - struct emit_ops *(*emit_ops) (void); - /* Returns true if the target supports disabling randomization. */ int (*supports_disable_randomization) (void); @@ -493,6 +489,10 @@ public: /* Return the minimum length of an instruction that can be safely overwritten for use as a fast tracepoint. */ virtual int get_min_fast_tracepoint_insn_len (); + + /* Return the bytecode operations vector for the current inferior. + Returns nullptr if bytecode compilation is not supported. */ + virtual struct emit_ops *emit_ops (); }; extern process_stratum_target *the_target; @@ -597,7 +597,7 @@ int kill_inferior (process_info *proc); err) #define target_emit_ops() \ - (the_target->emit_ops ? (*the_target->emit_ops) () : NULL) + the_target->pt->emit_ops () #define target_supports_disable_randomization() \ (the_target->supports_disable_randomization ? \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 9c715fea362..297882bc8a8 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,7 +1858,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, /* emit_ops */ NULL, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */