From patchwork Tue Feb 11 09:02:01 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: 37940 Received: (qmail 124858 invoked by alias); 11 Feb 2020 09:04:11 -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 121075 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:38 +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:27 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 11 Feb 2020 01:03:26 -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 01B93PCJ002304; Tue, 11 Feb 2020 09:03:26 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93P9R010688; Tue, 11 Feb 2020 10:03:25 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93PaZ010684; Tue, 11 Feb 2020 10:03:25 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 49/58] gdbserver: turn target op 'supports_range_stepping' into a method Date: Tue, 11 Feb 2020 10:02:01 +0100 Message-Id: <650329f6fb6f40fbdfb79e258122871f1e07baf3.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 supports_range_stepping op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (target_supports_range_stepping): Update the macro. * target.c (process_target::supports_range_stepping): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_supports_range_stepping): Turn into ... (linux_process_target::supports_range_stepping): ... 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 | 9 ++++----- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/target.c | 6 ++++++ gdbserver/target.h | 9 ++++----- gdbserver/win32-low.c | 1 - 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 4cd18de5249..0d814bd7325 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6419,13 +6419,13 @@ linux_process_target::supports_agent () return true; } -static int -linux_supports_range_stepping (void) +bool +linux_process_target::supports_range_stepping () { if (can_software_single_step ()) - return 1; + return true; if (*the_low_target.supports_range_stepping == NULL) - return 0; + return false; return (*the_low_target.supports_range_stepping) (); } @@ -7460,7 +7460,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_range_stepping, linux_proc_pid_to_exec_file, linux_mntns_open_cloexec, linux_mntns_unlink, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 090700cf011..f0618758941 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -449,6 +449,8 @@ public: int read_btrace_conf (const btrace_target_info *tinfo, buffer *buf) override; #endif + + bool supports_range_stepping () 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 b2a5c2cc22b..066134d11d6 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, /* supports_range_stepping */ NULL, /* pid_to_exec_file */ NULL, /* multifs_open */ NULL, /* multifs_unlink */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 5978dbbc742..142edf71d77 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, /* supports_range_stepping */ NULL, /* pid_to_exec_file */ NULL, /* multifs_open */ NULL, /* multifs_unlink */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 534508446b4..2c35fe5459b 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -753,3 +753,9 @@ process_target::read_btrace_conf (const btrace_target_info *tinfo, { error (_("Target does not support branch tracing.")); } + +bool +process_target::supports_range_stepping () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index d3a8cc9d581..c0c38331426 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return true if target supports range stepping. */ - int (*supports_range_stepping) (void); - /* Return the full absolute name of the executable file that was run to create the process PID. If the executable file cannot be determined, NULL is returned. Otherwise, a pointer to a @@ -498,6 +495,9 @@ public: otherwise. */ virtual int read_btrace_conf (const btrace_target_info *tinfo, buffer *buf); + + /* Return true if target supports range stepping. */ + virtual bool supports_range_stepping (); }; extern process_stratum_target *the_target; @@ -638,8 +638,7 @@ target_read_btrace_conf (struct btrace_target_info *tinfo, } #define target_supports_range_stepping() \ - (the_target->supports_range_stepping ? \ - (*the_target->supports_range_stepping) () : 0) + the_target->pt->supports_range_stepping () #define target_supports_stopped_by_sw_breakpoint() \ the_target->pt->supports_stopped_by_sw_breakpoint () diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index d54bd2cfff1..55dbc3a3386 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, /* supports_range_stepping */ NULL, /* pid_to_exec_file */ NULL, /* multifs_open */ NULL, /* multifs_unlink */