gdbserver: turn target op 'supports_hardware_single_step' into a method

gdbserver/ChangeLog:
2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	Turn process_stratum_target's supports_hardware_single_step op into
	a method of process_target.

	* target.h (struct process_stratum_target): Remove the target op.
	(class process_target): Add the target op.
	(target_supports_hardware_single_step): Update the macro.
	(target_can_do_hardware_single_step): Remove declaration.
	* target.cc (process_target::supports_hardware_single_step): Define.
	(target_can_do_hardware_single_step): Remove.

	Update the derived classes and callers below.

	* linux-low.h (class linux_process_target): Update.
	* linux-low.cc (linux_target_ops): Update.
	(linux_supports_hardware_single_step): Turn into ...
	(linux_process_target::supports_hardware_single_step): ... this.
	* lynx-low.h (class lynx_process_target): Update.
	* lynx-low.cc (lynx_target_ops): Update.
	(lynx_process_target::supports_hardware_single_step): Define.
	* nto-low.h (class nto_process_target): Update.
	* nto-low.cc (nto_target_ops): Update.
	(nto_process_target::supports_hardware_single_step): Define.
	* win32-low.h (class win32_process_target): Update.
	* win32-low.cc (win32_target_ops): Update.
	(win32_process_target::supports_hardware_single_step): Define.

diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index a2f3fceed79b8b3b65d9a8f3e8719674c186c9cf..9757bc0fa3c1eba1f8fa116a9ae94c33bfe0c975 100644 (file)
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,31 @@
+2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+       Turn process_stratum_target's supports_hardware_single_step op into
+       a method of process_target.
+
+       * target.h (struct process_stratum_target): Remove the target op.
+       (class process_target): Add the target op.
+       (target_supports_hardware_single_step): Update the macro.
+       (target_can_do_hardware_single_step): Remove declaration.
+       * target.cc (process_target::supports_hardware_single_step): Define.
+       (target_can_do_hardware_single_step): Remove.
+
+       Update the derived classes and callers below.
+
+       * linux-low.h (class linux_process_target): Update.
+       * linux-low.cc (linux_target_ops): Update.
+       (linux_supports_hardware_single_step): Turn into ...
+       (linux_process_target::supports_hardware_single_step): ... this.
+       * lynx-low.h (class lynx_process_target): Update.
+       * lynx-low.cc (lynx_target_ops): Update.
+       (lynx_process_target::supports_hardware_single_step): Define.
+       * nto-low.h (class nto_process_target): Update.
+       * nto-low.cc (nto_target_ops): Update.
+       (nto_process_target::supports_hardware_single_step): Define.
+       * win32-low.h (class win32_process_target): Update.
+       * win32-low.cc (win32_target_ops): Update.
+       (win32_process_target::supports_hardware_single_step): Define.
+
 2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
 
        Turn process_stratum_target's {supports_}stopped_by_hw_breakpoint

diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 9ad5e19207a4c64472a536155cd4b2735e8f3875..fec2c3c56737706579574872a79a72b50ac92ead 100644 (file)
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6032,8 +6032,8 @@ linux_process_target::supports_stopped_by_hw_breakpoint ()
 
 /* Implement the supports_hardware_single_step target_ops method.  */
 
-static int
-linux_supports_hardware_single_step (void)
+bool
+linux_process_target::supports_hardware_single_step ()
 {
   return can_hardware_single_step ();
 }
@@ -7376,7 +7376,6 @@ linux_get_hwcap2 (int wordsize)
 static linux_process_target the_linux_target;
 
 static process_stratum_target linux_target_ops = {
-  linux_supports_hardware_single_step,
   linux_stopped_by_watchpoint,
   linux_stopped_data_address,
 #if defined(__UCLIBC__) && defined(HAS_NOMMU)        \

diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 95dabf3a44e8c48baa917027e2ff8ebc25166d1d..57fc9a594156c7b5733409479f28a6f2f6b491f6 100644 (file)
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -330,6 +330,8 @@ public:
   bool stopped_by_hw_breakpoint () override;
 
   bool supports_stopped_by_hw_breakpoint () override;
+
+  bool supports_hardware_single_step () 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 e4f276b5af056252b503decb60165c60219c549d..ea328b7efe335f3155e05cf8fff8db4232fa758a 100644 (file)
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -722,6 +722,12 @@ lynx_process_target::request_interrupt ()
   kill (lynx_ptid_get_pid (inferior_ptid), SIGINT);
 }
 
+bool
+lynx_process_target::supports_hardware_single_step ()
+{
+  return true;
+}
+
 /* The LynxOS target ops object.  */
 
 static lynx_process_target the_lynx_target;
@@ -729,7 +735,6 @@ static lynx_process_target the_lynx_target;
 /* The LynxOS target_ops vector.  */
 
 static process_stratum_target lynx_target_ops = {
-  target_can_do_hardware_single_step,
   NULL,  /* stopped_by_watchpoint */
   NULL,  /* stopped_data_address */
   NULL,  /* read_offsets */

diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h
index 795603af0d7d95a932c48f0da41f5308615ca473..4253f1259c29e6650a10e6ce89c3377c59aba368 100644 (file)
--- a/gdbserver/lynx-low.h
+++ b/gdbserver/lynx-low.h
@@ -89,6 +89,8 @@ public:
                    int len) override;
 
   void request_interrupt () override;
+
+  bool supports_hardware_single_step () override;
 };
 
 /* The inferior's target description.  This is a global because the

diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 6bb926d52781cad7f7be1f2506c52b4807439396..3e10436df3dc0702aa44e546caea1f685b9fd8ee 100644 (file)
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -869,6 +869,12 @@ nto_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
   return nto_breakpoint (addr, wtype, -1);
 }
 
+bool
+nto_process_target::supports_hardware_single_step ()
+{
+  return true;
+}
+
 /* Check if the reason of stop for current thread (CURRENT_INFERIOR) is
    a watchpoint.
 
@@ -950,7 +956,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
 static nto_process_target the_nto_target;
 
 static process_stratum_target nto_target_ops = {
-  target_can_do_hardware_single_step,
   nto_stopped_by_watchpoint,
   nto_stopped_data_address,
   NULL, /* nto_read_offsets */

diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index b0b276319d2e8cf259f6a645ba7fd297f1f9db5e..001ccb6687cf79b24e9ecd434a4cbee6539ec1f4 100644 (file)
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -92,6 +92,8 @@ public:
 
   int remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
                    int size, raw_breakpoint *bp) override;
+
+  bool supports_hardware_single_step () override;
 };
 
 /* The inferior's target description.  This is a global because the

diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index f7dc0f4d65827e8400057f5f891575c4b8752217..09b3a633fc8308e4aedaf6026a3a272f6b03fbd9 100644 (file)
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -316,14 +316,6 @@ kill_inferior (process_info *proc)
   return the_target->pt->kill (proc);
 }
 
-/* Target can do hardware single step.  */
-
-int
-target_can_do_hardware_single_step (void)
-{
-  return 1;
-}
-
 /* Default implementation for breakpoint_kind_for_pc.
 
    The default behavior for targets that don't implement breakpoint_kind_for_pc
@@ -471,3 +463,9 @@ process_target::supports_stopped_by_hw_breakpoint ()
 {
   return false;
 }
+
+bool
+process_target::supports_hardware_single_step ()
+{
+  return false;
+}

diff --git a/gdbserver/target.h b/gdbserver/target.h
index c5b1ef21b07db597ccacd99493f6cc1e11d1bb51..92b85cb061eb1d18b8e6c8334e63dcd11d1d2465 100644 (file)
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,9 +70,6 @@ class process_target;
    shared code.  */
 struct process_stratum_target
 {
-  /* Returns true if the target can do hardware single step.  */
-  int (*supports_hardware_single_step) (void);
-
   /* Returns 1 if target was stopped due to a watchpoint hit, 0 otherwise.  */
 
   int (*stopped_by_watchpoint) (void);
@@ -476,6 +473,9 @@ public:
   /* Returns true if the target knows whether a trap was caused by a
      HW breakpoint triggering.  */
   virtual bool supports_stopped_by_hw_breakpoint ();
+
+  /* Returns true if the target can do hardware single step.  */
+  virtual bool supports_hardware_single_step ();
 };
 
 extern process_stratum_target *the_target;
@@ -668,8 +668,7 @@ target_read_btrace_conf (struct btrace_target_info *tinfo,
   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)
+  the_target->pt->supports_hardware_single_step ()
 
 #define target_stopped_by_hw_breakpoint() \
   the_target->pt->stopped_by_hw_breakpoint ()
@@ -720,8 +719,6 @@ int set_desired_thread ();
 
 const char *target_pid_to_str (ptid_t);
 
-int target_can_do_hardware_single_step (void);
-
 int default_breakpoint_kind_from_pc (CORE_ADDR *pcptr);
 
 #endif /* GDBSERVER_TARGET_H */

diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 7edad6200503673aef32f8c60a9b46ea8611dfb3..2862a9c241cd3f73b21854b0156dd2cd46d7c4be 100644 (file)
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1728,6 +1728,12 @@ win32_process_target::request_interrupt ()
   soft_interrupt_requested = 1;
 }
 
+bool
+win32_process_target::supports_hardware_single_step ()
+{
+  return true;
+}
+
 #ifdef _WIN32_WCE
 int
 win32_error_to_fileio_error (DWORD err)
@@ -1838,7 +1844,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
 static win32_process_target the_win32_target;
 
 static process_stratum_target win32_target_ops = {
-  target_can_do_hardware_single_step,
   win32_stopped_by_watchpoint,
   win32_stopped_data_address,
   NULL, /* read_offsets */

diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index a6b27918f4c727119dc0800a504642bb5788407a..c5f9a13e02946e50636609ea74ba9e40c646ac95 100644 (file)
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -146,6 +146,8 @@ public:
 
   int remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
                    int size, raw_breakpoint *bp) override;
+
+  bool supports_hardware_single_step () override;
 };
 
 /* Retrieve the context for this thread, if not already retrieved.  */