From 9690a72ae54450aafaa55872ffcbf8b973660436 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:11:57 +0100 Subject: [PATCH] gdbserver: turn target ops 'supports_{fork,vfork,exec}_events' into methods gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's supports_fork_events, supports_vfork_events, and supports_exec_events ops into methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. (target_supports_fork_events): Update the macro. (target_supports_vfork_events): Update the macro. (target_supports_exec_events): Update the macro. * target.cc (process_target::supports_fork_events): Define. (process_target::supports_vfork_events): Define. (process_target::supports_exec_events): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_supports_fork_events): Turn into ... (linux_process_target::supports_fork_events): ... this. (linux_supports_vfork_events): Turn into ... (linux_process_target::supports_vfork_events): ... this. (linux_supports_exec_events): Turn into ... (linux_process_target::supports_exec_events): ... 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 | 29 +++++++++++++++++++++++++++++ gdbserver/linux-low.cc | 15 ++++++--------- gdbserver/linux-low.h | 6 ++++++ gdbserver/lynx-low.cc | 3 --- gdbserver/nto-low.cc | 3 --- gdbserver/target.cc | 18 ++++++++++++++++++ gdbserver/target.h | 27 ++++++++++++--------------- gdbserver/win32-low.cc | 3 --- 8 files changed, 71 insertions(+), 33 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 66126fa1581..5b3c37f4859 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,32 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's supports_fork_events, + supports_vfork_events, and supports_exec_events ops into methods + of process_target. + + * target.h (struct process_stratum_target): Remove the target ops. + (class process_target): Add the target ops. + (target_supports_fork_events): Update the macro. + (target_supports_vfork_events): Update the macro. + (target_supports_exec_events): Update the macro. + * target.cc (process_target::supports_fork_events): Define. + (process_target::supports_vfork_events): Define. + (process_target::supports_exec_events): Define. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_supports_fork_events): Turn into ... + (linux_process_target::supports_fork_events): ... this. + (linux_supports_vfork_events): Turn into ... + (linux_process_target::supports_vfork_events): ... this. + (linux_supports_exec_events): Turn into ... + (linux_process_target::supports_exec_events): ... 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 supports_multi_process op into a diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index a00c74cdf05..65a74522b18 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6346,24 +6346,24 @@ linux_process_target::supports_multi_process () /* Check if fork events are supported. */ -static int -linux_supports_fork_events (void) +bool +linux_process_target::supports_fork_events () { return linux_supports_tracefork (); } /* Check if vfork events are supported. */ -static int -linux_supports_vfork_events (void) +bool +linux_process_target::supports_vfork_events () { return linux_supports_tracefork (); } /* Check if exec events are supported. */ -static int -linux_supports_exec_events (void) +bool +linux_process_target::supports_exec_events () { return linux_supports_traceexec (); } @@ -7429,9 +7429,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_fork_events, - linux_supports_vfork_events, - linux_supports_exec_events, linux_handle_new_gdb_connection, #ifdef USE_THREAD_DB thread_db_handle_monitor_command, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 58730e2c0a3..f78ef78ad6f 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -365,6 +365,12 @@ public: int start_non_stop (bool enable) override; bool supports_multi_process () override; + + bool supports_fork_events () override; + + bool supports_vfork_events () override; + + bool supports_exec_events () 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 897bc9e663f..088582b2609 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -735,9 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_fork_events */ - NULL, /* supports_vfork_events */ - NULL, /* supports_exec_events */ NULL, /* handle_new_gdb_connection */ NULL, /* handle_monitor_command */ NULL, /* core_of_thread */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 11b290a20a3..0d1432b8bac 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -947,9 +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_fork_events */ - NULL, /* supports_vfork_events */ - NULL, /* supports_exec_events */ NULL, /* handle_new_gdb_connection */ NULL, /* handle_monitor_command */ NULL, /* core_of_thread */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 485eecbee91..15d48427f31 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -553,3 +553,21 @@ process_target::supports_multi_process () { return false; } + +bool +process_target::supports_fork_events () +{ + return false; +} + +bool +process_target::supports_vfork_events () +{ + return false; +} + +bool +process_target::supports_exec_events () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 52c80b848d0..ef2fd018463 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,15 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns true if fork events are supported. */ - int (*supports_fork_events) (void); - - /* Returns true if vfork events are supported. */ - int (*supports_vfork_events) (void); - - /* Returns true if exec events are supported. */ - int (*supports_exec_events) (void); - /* Allows target to re-initialize connection-specific settings. */ void (*handle_new_gdb_connection) (void); @@ -486,6 +477,15 @@ public: /* Returns true if the target supports multi-process debugging. */ virtual bool supports_multi_process (); + + /* Returns true if fork events are supported. */ + virtual bool supports_fork_events (); + + /* Returns true if vfork events are supported. */ + virtual bool supports_vfork_events (); + + /* Returns true if exec events are supported. */ + virtual bool supports_exec_events (); }; extern process_stratum_target *the_target; @@ -504,16 +504,13 @@ void set_target_ops (process_stratum_target *); int kill_inferior (process_info *proc); #define target_supports_fork_events() \ - (the_target->supports_fork_events ? \ - (*the_target->supports_fork_events) () : 0) + the_target->pt->supports_fork_events () #define target_supports_vfork_events() \ - (the_target->supports_vfork_events ? \ - (*the_target->supports_vfork_events) () : 0) + the_target->pt->supports_vfork_events () #define target_supports_exec_events() \ - (the_target->supports_exec_events ? \ - (*the_target->supports_exec_events) () : 0) + the_target->pt->supports_exec_events () #define target_handle_new_gdb_connection() \ do \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index ee7a0ea92a6..4cea682ee52 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1852,9 +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_fork_events */ - NULL, /* supports_vfork_events */ - NULL, /* supports_exec_events */ NULL, /* handle_new_gdb_connection */ NULL, /* handle_monitor_command */ NULL, /* core_of_thread */ -- 2.30.2