[v2,44/58] gdbserver: turn target op 'emit_ops' into a method

Message ID 3429bdb29daee49f7e5e1ba247d3872ce8600e6e.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:57 p.m.
gdbserver/ChangeLog:
2020-02-10  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

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

	Update the derived classes and callers below.

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

-- 
2.17.1

Patch

diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index f1d61190b12..0203afa66cf 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6639,8 +6639,8 @@  linux_process_target::install_fast_tracepoint_jump_pad
      err);
 }
 
-static struct emit_ops *
-linux_emit_ops (void)
+emit_ops *
+linux_process_target::emit_ops ()
 {
   if (the_low_target.emit_ops != NULL)
     return (*the_low_target.emit_ops) ();
@@ -7452,7 +7452,6 @@  linux_get_hwcap2 (int wordsize)
 static linux_process_target the_linux_target;
 
 static process_stratum_target linux_target_ops = {
-  linux_emit_ops,
   linux_supports_disable_randomization,
   linux_qxfer_libraries_svr4,
   linux_supports_agent,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 35e30ed590d..3a6d2d02dff 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -420,6 +420,8 @@  public:
 					char *err) override;
 
   int get_min_fast_tracepoint_insn_len () override;
+
+  struct emit_ops *emit_ops () 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 4089b261bfd..1c71c60f096 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -735,7 +735,6 @@  static lynx_process_target the_lynx_target;
 /* The LynxOS target_ops vector.  */
 
 static process_stratum_target lynx_target_ops = {
-  NULL,  /* emit_ops */
   NULL,  /* supports_disable_randomization */
   NULL,  /* qxfer_libraries_svr4 */
   NULL,  /* support_agent */
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index e0d3d49bb66..502e6104638 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -947,7 +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, /* emit_ops */
   NULL, /* supports_disable_randomization */
   NULL, /* qxfer_libraries_svr4 */
   NULL, /* support_agent */
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 29b5bbcd9b1..44069f1ad44 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -693,3 +693,9 @@  process_target::get_min_fast_tracepoint_insn_len ()
 {
   return 0;
 }
+
+struct emit_ops *
+process_target::emit_ops ()
+{
+  return nullptr;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 21f22a4d0db..0d51af7965c 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,10 +70,6 @@  class process_target;
    shared code.  */
 struct process_stratum_target
 {
-  /* Return the bytecode operations vector for the current inferior.
-     Returns NULL if bytecode compilation is not supported.  */
-  struct emit_ops *(*emit_ops) (void);
-
   /* Returns true if the target supports disabling randomization.  */
   int (*supports_disable_randomization) (void);
 
@@ -493,6 +489,10 @@  public:
   /* 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 ();
+
+  /* Return the bytecode operations vector for the current inferior.
+     Returns nullptr if bytecode compilation is not supported.  */
+  virtual struct emit_ops *emit_ops ();
 };
 
 extern process_stratum_target *the_target;
@@ -597,7 +597,7 @@  int kill_inferior (process_info *proc);
 						    err)
 
 #define target_emit_ops() \
-  (the_target->emit_ops ? (*the_target->emit_ops) () : NULL)
+  the_target->pt->emit_ops ()
 
 #define target_supports_disable_randomization() \
   (the_target->supports_disable_randomization ? \
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 9c715fea362..297882bc8a8 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1858,7 +1858,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, /* emit_ops */
   NULL, /* supports_disable_randomization */
   NULL, /* qxfer_libraries_svr4 */
   NULL, /* support_agent */