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 | 20 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 2 |
8 files changed, 55 insertions, 25 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 55063df..a2f3fce 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_hw_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_hw_breakpoint): Update the macro. + (target_supports_stopped_by_hw_breakpoint): Update the macro. + * target.cc (process_target::stopped_by_hw_breakpoint): Define. + (process_target::supports_stopped_by_hw_breakpoint): Define. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_stopped_by_hw_breakpoint): Turn into ... + (linux_process_target::stopped_by_hw_breakpoint): ... this. + (linux_supports_stopped_by_hw_breakpoint): Turn into ... + (linux_process_target::supports_stopped_by_hw_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 {supports_}stopped_by_sw_breakpoint ops into methods of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index b1cba91..9ad5e19 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6010,22 +6010,22 @@ linux_process_target::supports_stopped_by_sw_breakpoint () return USE_SIGTRAP_SIGINFO; } -/* Implement the to_stopped_by_hw_breakpoint target_ops +/* Implement the stopped_by_hw_breakpoint target_ops method. */ -static int -linux_stopped_by_hw_breakpoint (void) +bool +linux_process_target::stopped_by_hw_breakpoint () { struct lwp_info *lwp = get_thread_lwp (current_thread); return (lwp->stop_reason == TARGET_STOPPED_BY_HW_BREAKPOINT); } -/* Implement the to_supports_stopped_by_hw_breakpoint target_ops +/* Implement the supports_stopped_by_hw_breakpoint target_ops method. */ -static int -linux_supports_stopped_by_hw_breakpoint (void) +bool +linux_process_target::supports_stopped_by_hw_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_hw_breakpoint, - linux_supports_stopped_by_hw_breakpoint, linux_supports_hardware_single_step, linux_stopped_by_watchpoint, linux_stopped_data_address, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index bb9c4b0..95dabf3 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -326,6 +326,10 @@ public: bool stopped_by_sw_breakpoint () override; bool supports_stopped_by_sw_breakpoint () override; + + bool stopped_by_hw_breakpoint () override; + + bool supports_stopped_by_hw_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 0bb7e00..e4f276b 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_hw_breakpoint */ - NULL, /* supports_stopped_by_hw_breakpoint */ target_can_do_hardware_single_step, NULL, /* stopped_by_watchpoint */ NULL, /* stopped_data_address */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 5912ee9..6bb926d 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_hw_breakpoint */ - NULL, /* supports_stopped_by_hw_breakpoint */ target_can_do_hardware_single_step, nto_stopped_by_watchpoint, nto_stopped_data_address, diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 70630db..f7dc0f4 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -459,3 +459,15 @@ process_target::supports_stopped_by_sw_breakpoint () { return false; } + +bool +process_target::stopped_by_hw_breakpoint () +{ + return false; +} + +bool +process_target::supports_stopped_by_hw_breakpoint () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 563884f..c5b1ef2 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,13 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns 1 if the target stopped for a hardware breakpoint. */ - int (*stopped_by_hw_breakpoint) (void); - - /* Returns true if the target knows whether a trap was caused by a - HW breakpoint triggering. */ - int (*supports_stopped_by_hw_breakpoint) (void); - /* Returns true if the target can do hardware single step. */ int (*supports_hardware_single_step) (void); @@ -476,6 +469,13 @@ public: /* Returns true if the target knows whether a trap was caused by a SW breakpoint triggering. */ virtual bool supports_stopped_by_sw_breakpoint (); + + /* Returns true if the target stopped for a hardware breakpoint. */ + virtual bool stopped_by_hw_breakpoint (); + + /* Returns true if the target knows whether a trap was caused by a + HW breakpoint triggering. */ + virtual bool supports_stopped_by_hw_breakpoint (); }; extern process_stratum_target *the_target; @@ -665,16 +665,14 @@ target_read_btrace_conf (struct btrace_target_info *tinfo, the_target->pt->stopped_by_sw_breakpoint () #define target_supports_stopped_by_hw_breakpoint() \ - (the_target->supports_stopped_by_hw_breakpoint ? \ - (*the_target->supports_stopped_by_hw_breakpoint) () : 0) + the_target->pt->supports_stopped_by_hw_breakpoint () #define target_supports_hardware_single_step() \ (the_target->supports_hardware_single_step ? \ (*the_target->supports_hardware_single_step) () : 0) #define target_stopped_by_hw_breakpoint() \ - (the_target->stopped_by_hw_breakpoint ? \ - (*the_target->stopped_by_hw_breakpoint) () : 0) + the_target->pt->stopped_by_hw_breakpoint () #define target_breakpoint_kind_from_pc(pcptr) \ (the_target->breakpoint_kind_from_pc \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 6f8b51f..7edad62 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_hw_breakpoint */ - NULL, /* supports_stopped_by_hw_breakpoint */ target_can_do_hardware_single_step, win32_stopped_by_watchpoint, win32_stopped_data_address, |