aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTankut Baris Aktemur <tankut.baris.aktemur@intel.com>2020-02-17 16:12:03 +0100
committerTankut Baris Aktemur <tankut.baris.aktemur@intel.com>2020-02-20 17:35:19 +0100
commit5303a34f9021a918a53376f215798dc65bf1a45c (patch)
tree9f1f5257c783a1b35be9a192fa06450cedc6369c
parent7f63b89b3a4229c2274f613111a907623853351f (diff)
downloadgdb-5303a34f9021a918a53376f215798dc65bf1a45c.zip
gdb-5303a34f9021a918a53376f215798dc65bf1a45c.tar.gz
gdb-5303a34f9021a918a53376f215798dc65bf1a45c.tar.bz2
gdbserver: turn target op 'supports_software_single_step' into a method
gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> Turn process_stratum_target's supports_software_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_software_single_step): Update the macro. * target.cc (process_target::supports_software_single_step): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_supports_software_single_step): Turn into ... (linux_process_target::supports_software_single_step): ... 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.
-rw-r--r--gdbserver/ChangeLog20
-rw-r--r--gdbserver/linux-low.cc5
-rw-r--r--gdbserver/linux-low.h2
-rw-r--r--gdbserver/lynx-low.cc1
-rw-r--r--gdbserver/nto-low.cc1
-rw-r--r--gdbserver/target.cc6
-rw-r--r--gdbserver/target.h9
-rw-r--r--gdbserver/win32-low.cc1
8 files changed, 34 insertions, 11 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 592697a..5d4cd33 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,5 +1,25 @@
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+ Turn process_stratum_target's supports_software_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_software_single_step): Update the macro.
+ * target.cc (process_target::supports_software_single_step): Define.
+
+ Update the derived classes and callers below.
+
+ * linux-low.cc (linux_target_ops): Update.
+ (linux_supports_software_single_step): Turn into ...
+ (linux_process_target::supports_software_single_step): ... 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 thread_name and thread_handle ops
into methods of process_target.
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index f910866..1624ea4 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6044,8 +6044,8 @@ linux_process_target::supports_hardware_single_step ()
return can_hardware_single_step ();
}
-static int
-linux_supports_software_single_step (void)
+bool
+linux_process_target::supports_software_single_step ()
{
return can_software_single_step ();
}
@@ -7524,7 +7524,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_supports_software_single_step,
linux_supports_catch_syscall,
linux_get_ipa_tdesc_idx,
&the_linux_target,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 2acd65f..1595926 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -475,6 +475,8 @@ public:
bool thread_handle (ptid_t ptid, gdb_byte **handle,
int *handle_len) override;
#endif
+
+ bool supports_software_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 0c460be..399ccae 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -741,7 +741,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* supports_software_single_step */
NULL, /* supports_catch_syscall */
NULL, /* get_ipa_tdesc_idx */
&the_lynx_target,
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 4c3c5a3..a502135 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -947,7 +947,6 @@ nto_process_target::sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- NULL, /* supports_software_single_step */
NULL, /* supports_catch_syscall */
NULL, /* get_ipa_tdesc_idx */
&the_nto_target,
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index b7ed26b..b1a28e6 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -814,3 +814,9 @@ process_target::thread_handle (ptid_t ptid, gdb_byte **handle,
{
return false;
}
+
+bool
+process_target::supports_software_single_step ()
+{
+ return false;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 4d9de55..26ce137 100644
--- 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 software single step. */
- int (*supports_software_single_step) (void);
-
/* Return 1 if the target supports catch syscall, 0 (or leave the
callback NULL) otherwise. */
int (*supports_catch_syscall) (void);
@@ -505,6 +502,9 @@ public:
and the handle's length via HANDLE_LEN. */
virtual bool thread_handle (ptid_t ptid, gdb_byte **handle,
int *handle_len);
+
+ /* Returns true if the target can software single step. */
+ virtual bool supports_software_single_step ();
};
extern process_stratum_target *the_target;
@@ -669,8 +669,7 @@ target_read_btrace_conf (struct btrace_target_info *tinfo,
the_target->pt->breakpoint_kind_from_current_state (pcptr)
#define target_supports_software_single_step() \
- (the_target->supports_software_single_step ? \
- (*the_target->supports_software_single_step) () : 0)
+ the_target->pt->supports_software_single_step ()
ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
int connected_wait);
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 218f007..b218ff5 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1858,7 +1858,6 @@ win32_process_target::sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- NULL, /* supports_software_single_step */
NULL, /* supports_catch_syscall */
NULL, /* get_ipa_tdesc_idx */
&the_win32_target,