[v2,37/58] gdbserver: turn target op 'supports_tracepoints' into a method
Commit Message
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's supports_tracepoints 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_tracepoints): Update the macro.
* target.cc (process_target::supports_tracepoints): Define.
Update the derived classes and callers below.
* linux-low.cc (linux_target_ops): Update.
(linux_supports_tracepoints): Turn into ...
(linux_process_target::supports_tracepoints): ... 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.
---
gdbserver/linux-low.cc | 7 +++----
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.cc | 1 -
gdbserver/nto-low.cc | 1 -
gdbserver/target.cc | 6 ++++++
gdbserver/target.h | 10 ++++------
gdbserver/win32-low.cc | 1 -
7 files changed, 15 insertions(+), 13 deletions(-)
@@ -6542,11 +6542,11 @@ linux_get_ipa_tdesc_idx (void)
return (*the_low_target.get_ipa_tdesc_idx) ();
}
-static int
-linux_supports_tracepoints (void)
+bool
+linux_process_target::supports_tracepoints ()
{
if (*the_low_target.supports_tracepoints == NULL)
- return 0;
+ return false;
return (*the_low_target.supports_tracepoints) ();
}
@@ -7445,7 +7445,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_supports_tracepoints,
linux_read_pc,
linux_write_pc,
linux_thread_stopped,
@@ -386,6 +386,8 @@ public:
#endif
void process_qsupported (char **features, int count) override;
+
+ bool supports_tracepoints () override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
@@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* supports_tracepoints */
NULL, /* read_pc */
NULL, /* write_pc */
NULL, /* thread_stopped */
@@ -947,7 +947,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, /* supports_tracepoints */
NULL, /* read_pc */
NULL, /* write_pc */
NULL, /* thread_stopped */
@@ -608,3 +608,9 @@ process_target::process_qsupported (char **features, int count)
{
/* Nop. */
}
+
+bool
+process_target::supports_tracepoints ()
+{
+ return false;
+}
@@ -70,10 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Return 1 if the target supports tracepoints, 0 (or leave the
- callback NULL) otherwise. */
- int (*supports_tracepoints) (void);
-
/* Read PC from REGCACHE. */
CORE_ADDR (*read_pc) (struct regcache *regcache);
@@ -489,6 +485,9 @@ public:
/* Target specific qSupported support. FEATURES is an array of
features with COUNT elements. */
virtual void process_qsupported (char **features, int count);
+
+ /* Return true if the target supports tracepoints, false otherwise. */
+ virtual bool supports_tracepoints ();
};
extern process_stratum_target *the_target;
@@ -551,8 +550,7 @@ int kill_inferior (process_info *proc);
? (*the_target->get_ipa_tdesc_idx) () : 0)
#define target_supports_tracepoints() \
- (the_target->supports_tracepoints \
- ? (*the_target->supports_tracepoints) () : 0)
+ the_target->pt->supports_tracepoints ()
#define target_supports_fast_tracepoints() \
(the_target->install_fast_tracepoint_jump_pad != NULL)
@@ -1852,7 +1852,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, /* supports_tracepoints */
NULL, /* read_pc */
NULL, /* write_pc */
NULL, /* thread_stopped */