From patchwork Tue Feb 11 09:01:32 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: 37910 Received: (qmail 119851 invoked by alias); 11 Feb 2020 09:03:41 -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 118315 invoked by uid 89); 11 Feb 2020 09:03:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.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: mga17.intel.com Received: from mga17.intel.com (HELO mga17.intel.com) (192.55.52.151) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:23 +0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:20 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 11 Feb 2020 01:03:19 -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 01B93J4R002186; Tue, 11 Feb 2020 09:03:19 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93IUN010482; Tue, 11 Feb 2020 10:03:18 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93Iaq010478; Tue, 11 Feb 2020 10:03:18 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 20/58] gdbserver: turn target op '{supports_}stopped_by_sw_breakpoint' into a method Date: Tue, 11 Feb 2020 10:01:32 +0100 Message-Id: <5b87137c00f522455e4759310e7be39b580d1646.1581410933.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_}stopped_by_sw_breakpoint ops methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. (target_stopped_by_sw_breakpoint): Update the macro. (target_supports_stopped_by_sw_breakpoint): Update the macro. * target.c (process_target::stopped_by_sw_breakpoint): Define. (process_target::supports_stopped_by_sw_breakpoint): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_stopped_by_sw_breakpoint): Turn into ... (linux_process_target::stopped_by_sw_breakpoint): ... this. (linux_supports_stopped_by_sw_breakpoint): Turn into ... (linux_process_target::supports_stopped_by_sw_breakpoint): ... 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 | 14 ++++++-------- gdbserver/linux-low.h | 4 ++++ gdbserver/lynx-low.c | 2 -- gdbserver/nto-low.c | 2 -- gdbserver/target.c | 12 ++++++++++++ gdbserver/target.h | 22 ++++++++++------------ gdbserver/win32-low.c | 2 -- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 9427b9bdeb9..636a4933841 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -5990,22 +5990,22 @@ linux_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr, return 1; } -/* Implement the to_stopped_by_sw_breakpoint target_ops +/* Implement the stopped_by_sw_breakpoint target_ops method. */ -static int -linux_stopped_by_sw_breakpoint (void) +bool +linux_process_target::stopped_by_sw_breakpoint () { struct lwp_info *lwp = get_thread_lwp (current_thread); return (lwp->stop_reason == TARGET_STOPPED_BY_SW_BREAKPOINT); } -/* Implement the to_supports_stopped_by_sw_breakpoint target_ops +/* Implement the supports_stopped_by_sw_breakpoint target_ops method. */ -static int -linux_supports_stopped_by_sw_breakpoint (void) +bool +linux_process_target::supports_stopped_by_sw_breakpoint () { return USE_SIGTRAP_SIGINFO; } @@ -7376,8 +7376,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_stopped_by_sw_breakpoint, - linux_supports_stopped_by_sw_breakpoint, linux_stopped_by_hw_breakpoint, linux_supports_stopped_by_hw_breakpoint, linux_supports_hardware_single_step, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 0887c932d6c..4ef1a3f4cf9 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -321,6 +321,10 @@ public: int remove_point (enum raw_bkpt_type type, CORE_ADDR addr, int size, raw_breakpoint *bp) override; + + bool stopped_by_sw_breakpoint () override; + + bool supports_stopped_by_sw_breakpoint () 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 60748ae03db..91ff7a1dd0b 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -729,8 +729,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* stopped_by_sw_breakpoint */ - NULL, /* supports_stopped_by_sw_breakpoint */ NULL, /* stopped_by_hw_breakpoint */ NULL, /* supports_stopped_by_hw_breakpoint */ target_can_do_hardware_single_step, diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index c554d91ceea..8a412868829 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -950,8 +950,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, /* stopped_by_sw_breakpoint */ - NULL, /* supports_stopped_by_sw_breakpoint */ NULL, /* stopped_by_hw_breakpoint */ NULL, /* supports_stopped_by_hw_breakpoint */ target_can_do_hardware_single_step, diff --git a/gdbserver/target.c b/gdbserver/target.c index fd443efd61e..70630db6d84 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -447,3 +447,15 @@ process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr, { return 1; } + +bool +process_target::stopped_by_sw_breakpoint () +{ + return false; +} + +bool +process_target::supports_stopped_by_sw_breakpoint () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 966741f21ed..3be0ff9cdb8 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,14 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns 1 if the target stopped because it executed a software - breakpoint instruction, 0 otherwise. */ - int (*stopped_by_sw_breakpoint) (void); - - /* Returns true if the target knows whether a trap was caused by a - SW breakpoint triggering. */ - int (*supports_stopped_by_sw_breakpoint) (void); - /* Returns 1 if the target stopped for a hardware breakpoint. */ int (*stopped_by_hw_breakpoint) (void); @@ -476,6 +468,14 @@ public: virtual int remove_point (enum raw_bkpt_type type, CORE_ADDR addr, int size, raw_breakpoint *bp); + + /* Returns true if the target stopped because it executed a software + breakpoint instruction, false otherwise. */ + virtual bool stopped_by_sw_breakpoint (); + + /* Returns true if the target knows whether a trap was caused by a + SW breakpoint triggering. */ + virtual bool supports_stopped_by_sw_breakpoint (); }; extern process_stratum_target *the_target; @@ -659,12 +659,10 @@ target_read_btrace_conf (struct btrace_target_info *tinfo, (*the_target->supports_range_stepping) () : 0) #define target_supports_stopped_by_sw_breakpoint() \ - (the_target->supports_stopped_by_sw_breakpoint ? \ - (*the_target->supports_stopped_by_sw_breakpoint) () : 0) + the_target->pt->supports_stopped_by_sw_breakpoint () #define target_stopped_by_sw_breakpoint() \ - (the_target->stopped_by_sw_breakpoint ? \ - (*the_target->stopped_by_sw_breakpoint) () : 0) + the_target->pt->stopped_by_sw_breakpoint () #define target_supports_stopped_by_hw_breakpoint() \ (the_target->supports_stopped_by_hw_breakpoint ? \ diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 9f705507e96..31be06c0af2 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1828,8 +1828,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, /* stopped_by_sw_breakpoint */ - NULL, /* supports_stopped_by_sw_breakpoint */ NULL, /* stopped_by_hw_breakpoint */ NULL, /* supports_stopped_by_hw_breakpoint */ target_can_do_hardware_single_step,