From c23c939174445a65de521041509b038f5839a742 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:12:00 +0100 Subject: [PATCH] gdbserver: turn fast tracepoint target ops into methods gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's install_fast_tracepoint_jump_pad and get_min_fast_tracepoint_insn_len ops into methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. Also add 'supports_fast_tracepoints'. (target_supports_fast_tracepoints): Update the macro. (target_get_min_fast_tracepoint_insn_len): Update the macro. (install_fast_tracepoint_jump_pad): Update and rename the macro to ... (target_install_fast_tracepoint_jump_pad): ... this. * target.cc (process_target::supports_fast_tracepoints): Define. (process_target::install_fast_tracepoint_jump_pad): Define. (process_target::get_min_fast_tracepoint_insn_len): Define. Update the derived classes and callers below. * tracepoint.cc (install_fast_tracepoint): Update. * linux-low.cc (linux_target_ops): Update. (linux_process_target::supports_fast_tracepoints): Define. (linux_install_fast_tracepoint_jump_pad): Turn into ... (linux_process_target::install_fast_tracepoint_jump_pad): ... this. (linux_get_min_fast_tracepoint_insn_len): Turn into ... (linux_process_target::get_min_fast_tracepoint_insn_len): ... 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 | 32 ++++++++++++ gdbserver/linux-low.cc | 33 ++++++------ gdbserver/linux-low.h | 18 +++++++ gdbserver/lynx-low.cc | 2 - gdbserver/nto-low.cc | 2 - gdbserver/target.cc | 25 ++++++++++ gdbserver/target.h | 108 ++++++++++++++++++++-------------------- gdbserver/tracepoint.cc | 16 ++---- gdbserver/win32-low.cc | 2 - 9 files changed, 149 insertions(+), 89 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index e15a43312cb..3aaf02a8112 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,35 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's install_fast_tracepoint_jump_pad + and get_min_fast_tracepoint_insn_len ops into methods of + process_target. + + * target.h (struct process_stratum_target): Remove the target ops. + (class process_target): Add the target ops. Also add + 'supports_fast_tracepoints'. + (target_supports_fast_tracepoints): Update the macro. + (target_get_min_fast_tracepoint_insn_len): Update the macro. + (install_fast_tracepoint_jump_pad): Update and rename the macro + to ... + (target_install_fast_tracepoint_jump_pad): ... this. + * target.cc (process_target::supports_fast_tracepoints): Define. + (process_target::install_fast_tracepoint_jump_pad): Define. + (process_target::get_min_fast_tracepoint_insn_len): Define. + + Update the derived classes and callers below. + + * tracepoint.cc (install_fast_tracepoint): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_process_target::supports_fast_tracepoints): Define. + (linux_install_fast_tracepoint_jump_pad): Turn into ... + (linux_process_target::install_fast_tracepoint_jump_pad): ... this. + (linux_get_min_fast_tracepoint_insn_len): Turn into ... + (linux_process_target::get_min_fast_tracepoint_insn_len): ... 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 stabilize_threads op into a diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 1e516d6bc70..ecd892b01ea 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6620,19 +6620,20 @@ linux_process_target::done_accessing_memory () target_unpause_all (true); } -static int -linux_install_fast_tracepoint_jump_pad (CORE_ADDR tpoint, CORE_ADDR tpaddr, - CORE_ADDR collector, - CORE_ADDR lockaddr, - ULONGEST orig_size, - CORE_ADDR *jump_entry, - CORE_ADDR *trampoline, - ULONGEST *trampoline_size, - unsigned char *jjump_pad_insn, - ULONGEST *jjump_pad_insn_size, - CORE_ADDR *adjusted_insn_addr, - CORE_ADDR *adjusted_insn_addr_end, - char *err) +bool +linux_process_target::supports_fast_tracepoints () +{ + return the_low_target.install_fast_tracepoint_jump_pad != nullptr; +} + +int +linux_process_target::install_fast_tracepoint_jump_pad + (CORE_ADDR tpoint, CORE_ADDR tpaddr, CORE_ADDR collector, + CORE_ADDR lockaddr, ULONGEST orig_size, CORE_ADDR *jump_entry, + CORE_ADDR *trampoline, ULONGEST *trampoline_size, + unsigned char *jjump_pad_insn, ULONGEST *jjump_pad_insn_size, + CORE_ADDR *adjusted_insn_addr, CORE_ADDR *adjusted_insn_addr_end, + char *err) { return (*the_low_target.install_fast_tracepoint_jump_pad) (tpoint, tpaddr, collector, lockaddr, orig_size, @@ -6651,8 +6652,8 @@ linux_emit_ops (void) return NULL; } -static int -linux_get_min_fast_tracepoint_insn_len (void) +int +linux_process_target::get_min_fast_tracepoint_insn_len () { return (*the_low_target.get_min_fast_tracepoint_insn_len) (); } @@ -7455,10 +7456,8 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_install_fast_tracepoint_jump_pad, linux_emit_ops, linux_supports_disable_randomization, - linux_get_min_fast_tracepoint_insn_len, linux_qxfer_libraries_svr4, linux_supports_agent, #ifdef HAVE_LINUX_BTRACE diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index d3866de03a2..35e30ed590d 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -402,6 +402,24 @@ public: void unpause_all (bool unfreeze) override; void stabilize_threads () override; + + bool supports_fast_tracepoints () override; + + int install_fast_tracepoint_jump_pad (CORE_ADDR tpoint, + CORE_ADDR tpaddr, + CORE_ADDR collector, + CORE_ADDR lockaddr, + ULONGEST orig_size, + CORE_ADDR *jump_entry, + CORE_ADDR *trampoline, + ULONGEST *trampoline_size, + unsigned char *jjump_pad_insn, + ULONGEST *jjump_pad_insn_size, + CORE_ADDR *adjusted_insn_addr, + CORE_ADDR *adjusted_insn_addr_end, + char *err) override; + + int get_min_fast_tracepoint_insn_len () 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 5ea50b4415d..4089b261bfd 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -735,10 +735,8 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* install_fast_tracepoint_jump_pad */ NULL, /* emit_ops */ NULL, /* supports_disable_randomization */ - NULL, /* get_min_fast_tracepoint_insn_len */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ NULL, /* enable_btrace */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index ef7a70ad97a..e0d3d49bb66 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -947,10 +947,8 @@ nto_sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* install_fast_tracepoint_jump_pad */ NULL, /* emit_ops */ NULL, /* supports_disable_randomization */ - NULL, /* get_min_fast_tracepoint_insn_len */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ NULL, /* enable_btrace */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 42f22846d02..29b5bbcd9b1 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -668,3 +668,28 @@ process_target::stabilize_threads () { /* Nop. */ } + +bool +process_target::supports_fast_tracepoints () +{ + return false; +} + +int +process_target::install_fast_tracepoint_jump_pad + (CORE_ADDR tpoint, CORE_ADDR tpaddr, CORE_ADDR collector, + CORE_ADDR lockaddr, ULONGEST orig_size, CORE_ADDR *jump_entry, + CORE_ADDR *trampoline, ULONGEST *trampoline_size, + unsigned char *jjump_pad_insn, ULONGEST *jjump_pad_insn_size, + CORE_ADDR *adjusted_insn_addr, CORE_ADDR *adjusted_insn_addr_end, + char *err) +{ + gdb_assert_not_reached ("target op install_fast_tracepoint_jump_pad " + "not supported"); +} + +int +process_target::get_min_fast_tracepoint_insn_len () +{ + return 0; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index c56267fb1f8..21f22a4d0db 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,34 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Install a fast tracepoint jump pad. TPOINT is the address of the - tracepoint internal object as used by the IPA agent. TPADDR is - the address of tracepoint. COLLECTOR is address of the function - the jump pad redirects to. LOCKADDR is the address of the jump - pad lock object. ORIG_SIZE is the size in bytes of the - instruction at TPADDR. JUMP_ENTRY points to the address of the - jump pad entry, and on return holds the address past the end of - the created jump pad. If a trampoline is created by the function, - then TRAMPOLINE and TRAMPOLINE_SIZE return the address and size of - the trampoline, else they remain unchanged. JJUMP_PAD_INSN is a - buffer containing a copy of the instruction at TPADDR. - ADJUST_INSN_ADDR and ADJUST_INSN_ADDR_END are output parameters that - return the address range where the instruction at TPADDR was relocated - to. If an error occurs, the ERR may be used to pass on an error - message. */ - int (*install_fast_tracepoint_jump_pad) (CORE_ADDR tpoint, CORE_ADDR tpaddr, - CORE_ADDR collector, - CORE_ADDR lockaddr, - ULONGEST orig_size, - CORE_ADDR *jump_entry, - CORE_ADDR *trampoline, - ULONGEST *trampoline_size, - unsigned char *jjump_pad_insn, - ULONGEST *jjump_pad_insn_size, - CORE_ADDR *adjusted_insn_addr, - CORE_ADDR *adjusted_insn_addr_end, - char *err); - /* Return the bytecode operations vector for the current inferior. Returns NULL if bytecode compilation is not supported. */ struct emit_ops *(*emit_ops) (void); @@ -105,10 +77,6 @@ struct process_stratum_target /* Returns true if the target supports disabling randomization. */ int (*supports_disable_randomization) (void); - /* Return the minimum length of an instruction that can be safely overwritten - for use as a fast tracepoint. */ - int (*get_min_fast_tracepoint_insn_len) (void); - /* Read solib info on SVR4 platforms. */ int (*qxfer_libraries_svr4) (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, @@ -494,6 +462,37 @@ public: /* Stabilize all threads. That is, force them out of jump pads. */ virtual void stabilize_threads (); + + /* Return true if the install_fast_tracepoint_jump_pad op is + supported. */ + virtual bool supports_fast_tracepoints (); + + /* Install a fast tracepoint jump pad. TPOINT is the address of the + tracepoint internal object as used by the IPA agent. TPADDR is + the address of tracepoint. COLLECTOR is address of the function + the jump pad redirects to. LOCKADDR is the address of the jump + pad lock object. ORIG_SIZE is the size in bytes of the + instruction at TPADDR. JUMP_ENTRY points to the address of the + jump pad entry, and on return holds the address past the end of + the created jump pad. If a trampoline is created by the function, + then TRAMPOLINE and TRAMPOLINE_SIZE return the address and size of + the trampoline, else they remain unchanged. JJUMP_PAD_INSN is a + buffer containing a copy of the instruction at TPADDR. + ADJUST_INSN_ADDR and ADJUST_INSN_ADDR_END are output parameters that + return the address range where the instruction at TPADDR was relocated + to. If an error occurs, the ERR may be used to pass on an error + message. */ + virtual int install_fast_tracepoint_jump_pad + (CORE_ADDR tpoint, CORE_ADDR tpaddr, CORE_ADDR collector, + CORE_ADDR lockaddr, ULONGEST orig_size, CORE_ADDR *jump_entry, + CORE_ADDR *trampoline, ULONGEST *trampoline_size, + unsigned char *jjump_pad_insn, ULONGEST *jjump_pad_insn_size, + CORE_ADDR *adjusted_insn_addr, CORE_ADDR *adjusted_insn_addr_end, + char *err); + + /* Return the minimum length of an instruction that can be safely + overwritten for use as a fast tracepoint. */ + virtual int get_min_fast_tracepoint_insn_len (); }; extern process_stratum_target *the_target; @@ -559,11 +558,10 @@ int kill_inferior (process_info *proc); the_target->pt->supports_tracepoints () #define target_supports_fast_tracepoints() \ - (the_target->install_fast_tracepoint_jump_pad != NULL) + the_target->pt->supports_fast_tracepoints () #define target_get_min_fast_tracepoint_insn_len() \ - (the_target->get_min_fast_tracepoint_insn_len \ - ? (*the_target->get_min_fast_tracepoint_insn_len) () : 0) + the_target->pt->get_min_fast_tracepoint_insn_len () #define target_thread_stopped(thread) \ the_target->pt->thread_stopped (thread) @@ -577,26 +575,26 @@ int kill_inferior (process_info *proc); #define target_stabilize_threads() \ the_target->pt->stabilize_threads () -#define install_fast_tracepoint_jump_pad(tpoint, tpaddr, \ - collector, lockaddr, \ - orig_size, \ - jump_entry, \ - trampoline, trampoline_size, \ - jjump_pad_insn, \ - jjump_pad_insn_size, \ - adjusted_insn_addr, \ - adjusted_insn_addr_end, \ - err) \ - (*the_target->install_fast_tracepoint_jump_pad) (tpoint, tpaddr, \ - collector,lockaddr, \ - orig_size, jump_entry, \ - trampoline, \ - trampoline_size, \ - jjump_pad_insn, \ - jjump_pad_insn_size, \ - adjusted_insn_addr, \ - adjusted_insn_addr_end, \ - err) +#define target_install_fast_tracepoint_jump_pad(tpoint, tpaddr, \ + collector, lockaddr, \ + orig_size, \ + jump_entry, \ + trampoline, trampoline_size, \ + jjump_pad_insn, \ + jjump_pad_insn_size, \ + adjusted_insn_addr, \ + adjusted_insn_addr_end, \ + err) \ + the_target->pt->install_fast_tracepoint_jump_pad (tpoint, tpaddr, \ + collector,lockaddr, \ + orig_size, jump_entry, \ + trampoline, \ + trampoline_size, \ + jjump_pad_insn, \ + jjump_pad_insn_size, \ + adjusted_insn_addr, \ + adjusted_insn_addr_end, \ + err) #define target_emit_ops() \ (the_target->emit_ops ? (*the_target->emit_ops) () : NULL) diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index be40c9b4cf1..e587d6561dc 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -3117,17 +3117,11 @@ install_fast_tracepoint (struct tracepoint *tpoint, char *errbuf) trampoline_size = 0; /* Install the jump pad. */ - err = install_fast_tracepoint_jump_pad (tpoint->obj_addr_on_target, - tpoint->address, - collect, - ipa_sym_addrs.addr_collecting, - tpoint->orig_size, - &jentry, - &trampoline, &trampoline_size, - fjump, &fjump_size, - &tpoint->adjusted_insn_addr, - &tpoint->adjusted_insn_addr_end, - errbuf); + err = target_install_fast_tracepoint_jump_pad + (tpoint->obj_addr_on_target, tpoint->address, collect, + ipa_sym_addrs.addr_collecting, tpoint->orig_size, &jentry, + &trampoline, &trampoline_size, fjump, &fjump_size, + &tpoint->adjusted_insn_addr, &tpoint->adjusted_insn_addr_end, errbuf); if (err) return 1; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 8e0be15fdaf..9c715fea362 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,10 +1858,8 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* install_fast_tracepoint_jump_pad */ NULL, /* emit_ops */ NULL, /* supports_disable_randomization */ - NULL, /* get_min_fast_tracepoint_insn_len */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ NULL, /* enable_btrace */ -- 2.30.2