From patchwork Tue Feb 11 09:01:56 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: 37934 Received: (qmail 124081 invoked by alias); 11 Feb 2020 09:04:07 -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 121083 invoked by uid 89); 11 Feb 2020 09:03:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.7 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; Tue, 11 Feb 2020 09:03:35 +0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.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 orsmga003.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 01B93OY0002289; Tue, 11 Feb 2020 09:03:24 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93Obb010653; Tue, 11 Feb 2020 10:03:24 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93Ow1010649; Tue, 11 Feb 2020 10:03:24 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 44/58] gdbserver: turn target op 'emit_ops' into a method Date: Tue, 11 Feb 2020 10:01:56 +0100 Message-Id: <30639ef2ce91e5298bfb301f5f1085f4655d3b0e.1581410935.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 Make process_stratum_target's emit_ops op 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.c (process_target::emit_ops): Define. Update the derived structs and callers below. * linux-low.c (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.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. * win32-low.c (win32_target_ops): Update. --- gdbserver/linux-low.c | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/target.c | 6 ++++++ gdbserver/target.h | 10 +++++----- gdbserver/win32-low.c | 1 - 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index d3f6edce5bc..93a79cb4e37 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6632,8 +6632,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) (); @@ -7445,7 +7445,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 475e882712b..6f53450898e 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -423,6 +423,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.c b/gdbserver/lynx-low.c index 6520302ef7e..8b5d26b8956 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, /* emit_ops */ NULL, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 555cba190b5..be496bd6686 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, /* emit_ops */ NULL, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 5f0316bf081..5bd591df16d 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -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 c1276be152c..fea4f8e23e5 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.c b/gdbserver/win32-low.c index 7108f39c6f9..342f19fcdcf 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1848,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 = { - NULL, /* emit_ops */ NULL, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */