From bc8d3ae4328513fad0120244b734d533f84906d7 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:12:03 +0100 Subject: [PATCH] gdbserver: turn target op 'supports_catch_syscall' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's supports_catch_syscall 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_catch_syscall): Update the macro. * target.cc (process_target::supports_catch_syscall): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_supports_catch_syscall): Turn into ... (linux_process_target::supports_catch_syscall): ... 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 | 5 ++--- 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, 34 insertions(+), 12 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 5d4cd335a7..4a299bc7b8 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,23 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's supports_catch_syscall 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_catch_syscall): Update the macro. + * target.cc (process_target::supports_catch_syscall): Define. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_supports_catch_syscall): Turn into ... + (linux_process_target::supports_catch_syscall): ... 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_software_single_step op diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 1624ea4561..4db25cbdc6 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6568,8 +6568,8 @@ linux_process_target::process_qsupported (char **features, int count) the_low_target.process_qsupported (features, count); } -static int -linux_supports_catch_syscall (void) +bool +linux_process_target::supports_catch_syscall () { return (the_low_target.get_syscall_trapinfo != NULL && linux_supports_tracesysgood ()); @@ -7524,7 +7524,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_catch_syscall, linux_get_ipa_tdesc_idx, &the_linux_target, }; diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 1595926eae..349f4b7e1e 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -477,6 +477,8 @@ public: #endif bool supports_software_single_step () override; + + bool supports_catch_syscall () 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 399ccaefad..76519692a3 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -741,7 +741,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ &the_lynx_target, }; diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index a50213583b..2ee8442016 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -947,7 +947,6 @@ nto_process_target::sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ &the_nto_target, }; diff --git a/gdbserver/target.cc b/gdbserver/target.cc index b1a28e68cc..2ea8234be0 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -820,3 +820,9 @@ process_target::supports_software_single_step () { return false; } + +bool +process_target::supports_catch_syscall () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 26ce137bf5..21b6bace68 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 catch syscall, 0 (or leave the - callback NULL) otherwise. */ - int (*supports_catch_syscall) (void); - /* Return tdesc index for IPA. */ int (*get_ipa_tdesc_idx) (void); @@ -505,6 +501,9 @@ public: /* Returns true if the target can software single step. */ virtual bool supports_software_single_step (); + + /* Return true if the target supports catch syscall. */ + virtual bool supports_catch_syscall (); }; extern process_stratum_target *the_target; @@ -559,8 +558,7 @@ int kill_inferior (process_info *proc); the_target->pt->process_qsupported (features, count) #define target_supports_catch_syscall() \ - (the_target->supports_catch_syscall ? \ - (*the_target->supports_catch_syscall) () : 0) + the_target->pt->supports_catch_syscall () #define target_get_ipa_tdesc_idx() \ (the_target->get_ipa_tdesc_idx \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index b218ff5f3f..132d33441b 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,7 +1858,6 @@ win32_process_target::sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ &the_win32_target, };