[v2,56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' into a method

Message ID 327f34aa5cd2fd88e608eeba5a9407dc1865d8c4.1581956647.git.tankut.baris.aktemur@intel.com
State New
Headers show
Series
  • Turn gdbserver's process_stratum_target into a class
Related show

Commit Message

Tankut Baris Aktemur Feb. 17, 2020, 4:58 p.m.
gdbserver/ChangeLog:
2020-02-10  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	Turn process_stratum_target's get_ipa_tdesc_idx 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_get_ipa_tdesc_idx): Update the macro.
	* target.cc (process_target::get_ipa_tdesc_idx): Define.

	Update the derived classes and callers below.

	* linux-low.cc (linux_target_ops): Update.
	(linux_get_ipa_tdesc_idx): Turn into ...
	(linux_process_target::get_ipa_tdesc_idx): ... 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/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     | 9 ++++-----
 gdbserver/win32-low.cc | 1 -
 7 files changed, 14 insertions(+), 11 deletions(-)

-- 
2.17.1

Patch

diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 559f7519a7d..8183567137b 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6571,8 +6571,8 @@  linux_process_target::supports_catch_syscall ()
 	  && linux_supports_tracesysgood ());
 }
 
-static int
-linux_get_ipa_tdesc_idx (void)
+int
+linux_process_target::get_ipa_tdesc_idx ()
 {
   if (the_low_target.get_ipa_tdesc_idx == NULL)
     return 0;
@@ -7520,7 +7520,6 @@  linux_get_hwcap2 (int wordsize)
 static linux_process_target the_linux_target;
 
 static process_stratum_target linux_target_ops = {
-  linux_get_ipa_tdesc_idx,
   &the_linux_target,
 };
 
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 349f4b7e1eb..33f208efd3b 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -479,6 +479,8 @@  public:
   bool supports_software_single_step () override;
 
   bool supports_catch_syscall () override;
+
+  int get_ipa_tdesc_idx () 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 76519692a3e..5e11355fcaa 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,  /* get_ipa_tdesc_idx */
   &the_lynx_target,
 };
 
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 2ee84420169..309c698bc2a 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, /* get_ipa_tdesc_idx */
   &the_nto_target,
 };
 
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 2ea8234be08..4df1f9d4bd8 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -826,3 +826,9 @@  process_target::supports_catch_syscall ()
 {
   return false;
 }
+
+int
+process_target::get_ipa_tdesc_idx ()
+{
+  return 0;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 21b6bace681..f6976303ee0 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,9 +70,6 @@  class process_target;
    shared code.  */
 struct process_stratum_target
 {
-  /* Return tdesc index for IPA.  */
-  int (*get_ipa_tdesc_idx) (void);
-
   /* The object that will gradually replace this struct.  */
   process_target *pt;
 };
@@ -504,6 +501,9 @@  public:
 
   /* Return true if the target supports catch syscall.  */
   virtual bool supports_catch_syscall ();
+
+  /* Return tdesc index for IPA.  */
+  virtual int get_ipa_tdesc_idx ();
 };
 
 extern process_stratum_target *the_target;
@@ -561,8 +561,7 @@  int kill_inferior (process_info *proc);
   the_target->pt->supports_catch_syscall ()
 
 #define target_get_ipa_tdesc_idx()			\
-  (the_target->get_ipa_tdesc_idx			\
-   ? (*the_target->get_ipa_tdesc_idx) () : 0)
+  the_target->pt->get_ipa_tdesc_idx ()
 
 #define target_supports_tracepoints()			\
   the_target->pt->supports_tracepoints ()
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 132d33441bf..640252805e0 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, /* get_ipa_tdesc_idx */
   &the_win32_target,
 };