[PATCH 55/58] gdbserver: turn target op 'supports_catch_syscall' into a method

[Tankut Baris Aktemur]

gdbserver/ChangeLog:
2020-02-10  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	Make process_stratum_target's supports_catch_syscall op 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.c (process_target::supports_catch_syscall): Define.

	Update the derived structs and callers below.

	* linux-low.c (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.c (lynx_target_ops): Update.
	* nto-low.c (nto_target_ops): Update.
	* win32-low.c (win32_target_ops): Update.
---
 gdbserver/linux-low.c |  5 ++---
 gdbserver/linux-low.h |  2 ++
 gdbserver/lynx-low.c  |  1 -
 gdbserver/nto-low.c   |  1 -
 gdbserver/target.c    |  6 ++++++
 gdbserver/target.h    | 10 ++++------
 gdbserver/win32-low.c |  1 -
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 9b0d8a18278..4cbb82429a7 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6557,8 +6557,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 ());
@@ -7513,7 +7513,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 582d5c1924d..7d8931598b3 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -480,6 +480,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.c b/gdbserver/lynx-low.c
index ab4238cf373..888adb1cfb6 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -742,7 +742,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.c b/gdbserver/nto-low.c
index 192d6a53ba8..b3d80c48f33 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -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.c b/gdbserver/target.c
index 03145cce280..16c1d661f6c 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -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 8854bf3791f..b825cbd53a7 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.c b/gdbserver/win32-low.c
index c4c52e7b2aa..c45c81beff8 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1848,7 +1848,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,
 };
-- 
2.17.1