From 290732bfb3805dd31fa640d022481dbb5d436988 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:11:59 +0100 Subject: [PATCH 1/1] gdbserver: turn target op 'supports_tracepoints' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur 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/ChangeLog | 20 ++++++++++++++++++++ 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 - 8 files changed, 35 insertions(+), 13 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index b8d2014d25..1a14953eb4 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,23 @@ +2020-02-20 Tankut Baris Aktemur + + 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. + 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's process_qsupported op into a method diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 7927a18402..d389aab62a 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6546,11 +6546,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) (); } @@ -7449,7 +7449,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, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 5c75ae44ec..1d71ff51cf 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -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))) diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc index c42a9b401e..5a0648987c 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -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 */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 86863f67f7..efb342f593 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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 */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 49e4b01495..ded8f3fee9 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -608,3 +608,9 @@ process_target::process_qsupported (char **features, int count) { /* Nop. */ } + +bool +process_target::supports_tracepoints () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 61f13e3a6f..e36f121a9a 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -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) diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index f068091dc9..87a59648c3 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -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 */ -- 2.34.1