diff options
| -rw-r--r-- | gdbserver/ChangeLog | 24 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 14 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 4 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 2 | ||||
| -rw-r--r-- | gdbserver/nto-low.cc | 2 | ||||
| -rw-r--r-- | gdbserver/target.cc | 12 | ||||
| -rw-r--r-- | gdbserver/target.h | 22 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 2 |
8 files changed, 56 insertions, 26 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 2d613f6..55063df 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,29 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's {supports_}stopped_by_sw_breakpoint + ops into 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.cc (process_target::stopped_by_sw_breakpoint): Define. + (process_target::supports_stopped_by_sw_breakpoint): Define. + + Update the derived classes and callers below. + + * linux-low.cc (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.cc (lynx_target_ops): Update. + * nto-low.cc (nto_target_ops): Update. + * win32-low.cc (win32_target_ops): Update. + +2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's insert_point and remove_point ops into methods of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 96692cd..b1cba91 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -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 6d58d66..bb9c4b0 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -322,6 +322,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.cc b/gdbserver/lynx-low.cc index dc864e8..0bb7e00 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -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.cc b/gdbserver/nto-low.cc index 56d3462..5912ee9 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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.cc b/gdbserver/target.cc index fd443ef..70630db 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -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 f04c1c1..563884f 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.cc b/gdbserver/win32-low.cc index c42d8d7..6f8b51f 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1838,8 +1838,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, |