[binutils-gdb] gdbserver: turn target op 'handle_new_gdb_connection' into a method

[Tankut Baris Aktemur <aktemur@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fb00dfcef00f12501e52d2259464ee85d81334c5

commit fb00dfcef00f12501e52d2259464ee85d81334c5
Author: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Date:   Mon Feb 17 16:11:57 2020 +0100

    gdbserver: turn target op 'handle_new_gdb_connection' into a method
    
    gdbserver/ChangeLog:
    2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
    
    	Turn process_stratum_target's handle_new_gdb_connection 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_handle_new_gdb_connection): Update the macro.
    	* target.cc (process_target::handle_new_gdb_connection): Define.
    
    	Update the derived classes and callers below.
    
    	* linux-low.cc (linux_target_ops): Update.
    	(linux_handle_new_gdb_connection): Turn into ...
    	(linux_process_target::handle_new_gdb_connection): ... 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.

Diff:
---
 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     | 12 ++++--------
 gdbserver/win32-low.cc |  1 -
 8 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 5b3c37f..271ef7e 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,5 +1,25 @@
 2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
 
+	Turn process_stratum_target's handle_new_gdb_connection 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_handle_new_gdb_connection): Update the macro.
+	* target.cc (process_target::handle_new_gdb_connection): Define.
+
+	Update the derived classes and callers below.
+
+	* linux-low.cc (linux_target_ops): Update.
+	(linux_handle_new_gdb_connection): Turn into ...
+	(linux_process_target::handle_new_gdb_connection): ... 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  <tankut.baris.aktemur@intel.com>
+
 	Turn process_stratum_target's supports_fork_events,
 	supports_vfork_events, and supports_exec_events ops into methods
 	of process_target.
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 65a7452..b323489 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6372,8 +6372,8 @@ linux_process_target::supports_exec_events ()
    ptrace flags for all inferiors.  This is in case the new GDB connection
    doesn't support the same set of events that the previous one did.  */
 
-static void
-linux_handle_new_gdb_connection (void)
+void
+linux_process_target::handle_new_gdb_connection ()
 {
   /* Request that all the lwps reset their ptrace options.  */
   for_each_thread ([] (thread_info *thread)
@@ -7429,7 +7429,6 @@ linux_get_hwcap2 (int wordsize)
 static linux_process_target the_linux_target;
 
 static process_stratum_target linux_target_ops = {
-  linux_handle_new_gdb_connection,
 #ifdef USE_THREAD_DB
   thread_db_handle_monitor_command,
 #else
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index f78ef78..aa3baf3 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -371,6 +371,8 @@ public:
   bool supports_vfork_events () override;
 
   bool supports_exec_events () override;
+
+  void handle_new_gdb_connection () 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 088582b..f197139 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,  /* handle_new_gdb_connection */
   NULL,  /* handle_monitor_command */
   NULL,  /* core_of_thread */
   NULL,  /* read_loadmap */
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 0d1432b..3cb0f63 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, /* handle_new_gdb_connection */
   NULL, /* handle_monitor_command */
   NULL, /* core_of_thread */
   NULL, /* read_loadmap */
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 15d4842..3416a3f 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -571,3 +571,9 @@ process_target::supports_exec_events ()
 {
   return false;
 }
+
+void
+process_target::handle_new_gdb_connection ()
+{
+  /* Nop.  */
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index ef2fd01..b615063 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,9 +70,6 @@ class process_target;
    shared code.  */
 struct process_stratum_target
 {
-  /* Allows target to re-initialize connection-specific settings.  */
-  void (*handle_new_gdb_connection) (void);
-
   /* If not NULL, target-specific routine to process monitor command.
      Returns 1 if handled, or 0 to perform default processing.  */
   int (*handle_monitor_command) (char *);
@@ -486,6 +483,9 @@ public:
 
   /* Returns true if exec events are supported.  */
   virtual bool supports_exec_events ();
+
+  /* Allows target to re-initialize connection-specific settings.  */
+  virtual void handle_new_gdb_connection ();
 };
 
 extern process_stratum_target *the_target;
@@ -513,11 +513,7 @@ int kill_inferior (process_info *proc);
   the_target->pt->supports_exec_events ()
 
 #define target_handle_new_gdb_connection()		 \
-  do							 \
-    {							 \
-      if (the_target->handle_new_gdb_connection != NULL) \
-	(*the_target->handle_new_gdb_connection) ();	 \
-    } while (0)
+  the_target->pt->handle_new_gdb_connection ()
 
 #define detach_inferior(proc) \
   the_target->pt->detach (proc)
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 4cea682e..024479d 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1852,7 +1852,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, /* handle_new_gdb_connection */
   NULL, /* handle_monitor_command */
   NULL, /* core_of_thread */
   NULL, /* read_loadmap */