Patchwork [34/58] gdbserver: turn target op 'core_of_thread' into a method

login
register
mail settings
Submitter Tankut Baris Aktemur
Date Feb. 11, 2020, 9:01 a.m.
Message ID <17ab8d9076aad21c70af91326776568db46c4c97.1581410934.git.tankut.baris.aktemur@intel.com>
Download mbox | patch
Permalink /patch/37936/
State New
Headers show

Comments

Tankut Baris Aktemur - Feb. 11, 2020, 9:01 a.m.
gdbserver/ChangeLog:
2020-02-10  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	Make process_stratum_target's core_of_thread op a method of
	process_target.

	* target.h (struct process_stratum_target): Remove the target op.
	(class process_target): Add the target op.
	(target_core_of_thread): Update the macro.
	* target.c (process_target::core_of_thread): Define.

	Update the derived structs and callers below.

	* linux-low.c (linux_target_ops): Update.
	(linux_process_target::core_of_thread): Define.
	* 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 | 7 ++++++-
 gdbserver/linux-low.h | 2 ++
 gdbserver/lynx-low.c  | 1 -
 gdbserver/nto-low.c   | 1 -
 gdbserver/target.c    | 6 ++++++
 gdbserver/target.h    | 9 ++++-----
 gdbserver/win32-low.c | 1 -
 7 files changed, 18 insertions(+), 9 deletions(-)

Patch

diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index ef68a8a89e2..713ad3af8aa 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6397,6 +6397,12 @@  linux_process_target::handle_monitor_command (char *mon)
 #endif
 }
 
+int
+linux_process_target::core_of_thread (ptid_t ptid)
+{
+  return linux_common_core_of_thread (ptid);
+}
+
 static int
 linux_supports_disable_randomization (void)
 {
@@ -7428,7 +7434,6 @@  linux_get_hwcap2 (int wordsize)
 static linux_process_target the_linux_target;
 
 static process_stratum_target linux_target_ops = {
-  linux_common_core_of_thread,
   linux_read_loadmap,
   linux_process_qsupported,
   linux_supports_tracepoints,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index c37db38749b..57663ef9419 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -378,6 +378,8 @@  public:
   void handle_new_gdb_connection () override;
 
   int handle_monitor_command (char *mon) override;
+
+  int core_of_thread (ptid_t ptid) 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 5db9d2f154d..aa744e5e6a3 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -735,7 +735,6 @@  static lynx_process_target the_lynx_target;
 /* The LynxOS target_ops vector.  */
 
 static process_stratum_target lynx_target_ops = {
-  NULL,  /* core_of_thread */
   NULL,  /* read_loadmap */
   NULL,  /* process_qsupported */
   NULL,  /* supports_tracepoints */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index 880e8ccecd1..1700fd54278 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -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, /* core_of_thread */
   NULL, /* read_loadmap */
   NULL, /* process_qsupported */
   NULL, /* supports_tracepoints */
diff --git a/gdbserver/target.c b/gdbserver/target.c
index 74cd90a48a4..e1c802d65bc 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -583,3 +583,9 @@  process_target::handle_monitor_command (char *mon)
 {
   return 0;
 }
+
+int
+process_target::core_of_thread (ptid_t ptid)
+{
+  return -1;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 7d7e371cf32..7b077a5a89a 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,9 +70,6 @@  class process_target;
    shared code.  */
 struct process_stratum_target
 {
-  /* Returns the core given a thread, or -1 if not known.  */
-  int (*core_of_thread) (ptid_t);
-
   /* Read loadmaps.  Read LEN bytes at OFFSET into a buffer at MYADDR.  */
   int (*read_loadmap) (const char *annex, CORE_ADDR offset,
 		       unsigned char *myaddr, unsigned int len);
@@ -486,6 +483,9 @@  public:
   /* The target-specific routine to process monitor command.
      Returns 1 if handled, or 0 to perform default processing.  */
   virtual int handle_monitor_command (char *mon);
+
+  /* Returns the core given a thread, or -1 if not known.  */
+  virtual int core_of_thread (ptid_t ptid);
 };
 
 extern process_stratum_target *the_target;
@@ -700,8 +700,7 @@  int prepare_to_access_memory (void);
 void done_accessing_memory (void);
 
 #define target_core_of_thread(ptid)		\
-  (the_target->core_of_thread ? (*the_target->core_of_thread) (ptid) \
-   : -1)
+  the_target->pt->core_of_thread (ptid)
 
 #define target_thread_name(ptid)                                \
   (the_target->thread_name ? (*the_target->thread_name) (ptid)  \
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index ed847447e40..bc1fdc845b7 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1842,7 +1842,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, /* core_of_thread */
   NULL, /* read_loadmap */
   NULL, /* process_qsupported */
   NULL, /* supports_tracepoints */