@@ -66,6 +66,8 @@ public:
bool supports_z_point_type (char z_type) override;
+ bool supports_tracepoints () override;
+
protected:
void low_arch_setup () override;
@@ -716,13 +718,13 @@ aarch64_target::get_regs_info ()
return ®s_info_aarch64;
}
-/* Implementation of linux_target_ops method "supports_tracepoints". */
+/* Implementation of target ops method "supports_tracepoints". */
-static int
-aarch64_supports_tracepoints (void)
+bool
+aarch64_target::supports_tracepoints ()
{
if (current_thread == NULL)
- return 1;
+ return true;
else
{
/* We don't support tracepoints on aarch32 now. */
@@ -3148,7 +3150,6 @@ aarch64_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
- aarch64_supports_tracepoints,
aarch64_get_thread_area,
aarch64_install_fast_tracepoint_jump_pad,
aarch64_emit_ops,
@@ -1119,7 +1119,6 @@ arm_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -165,7 +165,6 @@ bfin_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -470,7 +470,6 @@ crisv32_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -6441,15 +6441,6 @@ linux_process_target::get_ipa_tdesc_idx ()
return (*the_low_target.get_ipa_tdesc_idx) ();
}
-bool
-linux_process_target::supports_tracepoints ()
-{
- if (*the_low_target.supports_tracepoints == NULL)
- return false;
-
- return (*the_low_target.supports_tracepoints) ();
-}
-
CORE_ADDR
linux_process_target::read_pc (regcache *regcache)
{
@@ -131,9 +131,6 @@ struct lwp_info;
struct linux_target_ops
{
- /* Returns true if the low target supports tracepoints. */
- int (*supports_tracepoints) (void);
-
/* Fill ADDRP with the thread area address of LWPID. Returns 0 on
success, -1 on failure. */
int (*get_thread_area) (int lwpid, CORE_ADDR *addrp);
@@ -298,8 +295,6 @@ class linux_process_target : public process_stratum_target
unsigned char *myaddr, unsigned int len) override;
#endif
- bool supports_tracepoints () override;
-
CORE_ADDR read_pc (regcache *regcache) override;
void write_pc (regcache *regcache, CORE_ADDR pc) override;
@@ -163,7 +163,6 @@ m32r_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -259,7 +259,6 @@ m68k_supports_hardware_single_step (void)
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -64,6 +64,9 @@ public:
void low_supply_ptrace_register (regcache *regcache, int regno,
const char *buf) override;
+
+ bool supports_tracepoints () override;
+
protected:
void low_arch_setup () override;
@@ -1026,12 +1029,12 @@ ppc_target::low_arch_setup ()
}
}
-/* Implementation of linux_target_ops method "supports_tracepoints". */
+/* Implementation of target ops method "supports_tracepoints". */
-static int
-ppc_supports_tracepoints (void)
+bool
+ppc_target::supports_tracepoints ()
{
- return 1;
+ return true;
}
/* Get the thread area address. This is used to recognize which
@@ -3430,7 +3433,6 @@ ppc_get_ipa_tdesc_idx (void)
}
struct linux_target_ops the_low_target = {
- ppc_supports_tracepoints,
ppc_get_thread_area,
ppc_install_fast_tracepoint_jump_pad,
ppc_emit_ops,
@@ -68,6 +68,8 @@ public:
bool supports_z_point_type (char z_type) override;
+ bool supports_tracepoints () override;
+
void low_collect_ptrace_register (regcache *regcache, int regno,
char *buf) override;
@@ -764,12 +766,12 @@ s390_target::get_regs_info ()
return &myregs_info;
}
-/* The "supports_tracepoints" linux_target_ops method. */
+/* The "supports_tracepoints" target ops method. */
-static int
-s390_supports_tracepoints (void)
+bool
+s390_target::supports_tracepoints ()
{
- return 1;
+ return true;
}
/* Implementation of linux_target_ops method "get_thread_area". */
@@ -2839,7 +2841,6 @@ s390_emit_ops (void)
}
struct linux_target_ops the_low_target = {
- s390_supports_tracepoints,
s390_get_thread_area,
s390_install_fast_tracepoint_jump_pad,
s390_emit_ops,
@@ -194,7 +194,6 @@ sh_target::low_arch_setup ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -425,7 +425,6 @@ tic6x_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -226,7 +226,6 @@ tile_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
@@ -110,6 +110,8 @@ public:
void process_qsupported (char **features, int count) override;
+ bool supports_tracepoints () override;
+
protected:
void low_arch_setup () override;
@@ -1102,10 +1104,10 @@ x86_get_syscall_trapinfo (struct regcache *regcache, int *sysno)
collect_register_by_name (regcache, "orig_eax", sysno);
}
-static int
-x86_supports_tracepoints (void)
+bool
+x86_target::supports_tracepoints ()
{
- return 1;
+ return true;
}
static void
@@ -2960,7 +2962,6 @@ x86_get_ipa_tdesc_idx (void)
struct linux_target_ops the_low_target =
{
- x86_supports_tracepoints,
x86_get_thread_area,
x86_install_fast_tracepoint_jump_pad,
x86_emit_ops,
@@ -331,7 +331,6 @@ xtensa_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* supports_tracepoints */
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */