[15/58] gdbserver: turn target op 'look_up_symbols' into a method

Message ID 9a549a34d4c48d61e63c5d997daca31b298af533.1581410933.git.tankut.baris.aktemur@intel.com
State Superseded
Headers show
Series
  • Turn gdbserver's process_stratum_target into a class
Related show

Commit Message

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 look_up_symbols op a method of
	process_target.

	* target.h (struct process_stratum_target): Remove the target op.
	(class process_target): Add the target op.
	* target.c (process_target::look_up_symbols): Define.

	Update the derived structs and callers below.

	* server.c (handle_query): Update.
	* linux-low.c (linux_target_ops): Update.
	(linux_look_up_symbols): Turn into ...
	(linux_process_target::look_up_symbols): ... 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/server.c    |  4 ++--
 gdbserver/target.c    |  6 ++++++
 gdbserver/target.h    | 15 +++++++--------
 gdbserver/win32-low.c |  1 -
 8 files changed, 19 insertions(+), 16 deletions(-)

-- 
2.17.1

Comments

Pedro Alves Feb. 13, 2020, 8:28 p.m. | #1
On 2/11/20 9:01 AM, Tankut Baris Aktemur wrote:
> @@ -476,6 +468,13 @@ public:

>       Returns 0 on success and errno on failure.  */

>    virtual int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr,

>  			    int len) = 0;

> +

> +  /* Query GDB for the values of any symbols we're interested in.

> +     This function is called whenever we receive a "qSymbols::"

> +     query, which corresponds to every time more symbols (might)

> +     become available.  NULL if we aren't interested in any

> +     symbols.  */


This "NULL if we aren't interested ..." remark no longer makes
sense, since a method can never be null.  Please double-check
whether other methods need similar adjustment as well.

> +  virtual void look_up_symbols ();


Thanks,
Pedro Alves

Patch

diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index dad9dcf86fc..89ef5ab9224 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -5898,8 +5898,8 @@  linux_process_target::write_memory (CORE_ADDR memaddr,
   return 0;
 }
 
-static void
-linux_look_up_symbols (void)
+void
+linux_process_target::look_up_symbols ()
 {
 #ifdef USE_THREAD_DB
   struct process_info *proc = current_process ();
@@ -7369,7 +7369,6 @@  linux_get_hwcap2 (int wordsize)
 static linux_process_target the_linux_target;
 
 static process_stratum_target linux_target_ops = {
-  linux_look_up_symbols,
   linux_request_interrupt,
   linux_read_auxv,
   linux_supports_z_point_type,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 58fd665ba66..ae9484d8211 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -304,6 +304,8 @@  public:
 
   int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
 		    int len) override;
+
+  void look_up_symbols () 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 fe55f9bcdf3..21a03cf5d00 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -729,7 +729,6 @@  static lynx_process_target the_lynx_target;
 /* The LynxOS target_ops vector.  */
 
 static process_stratum_target lynx_target_ops = {
-  NULL,  /* look_up_symbols */
   lynx_request_interrupt,
   NULL,  /* read_auxv */
   NULL,  /* supports_z_point_type */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index f1c4be09f7f..fc548ff72ba 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -943,7 +943,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, /* nto_look_up_symbols */
   nto_request_interrupt,
   nto_read_auxv,
   nto_supports_z_point_type,
diff --git a/gdbserver/server.c b/gdbserver/server.c
index 92feff36516..4785eabaf06 100644
--- a/gdbserver/server.c
+++ b/gdbserver/server.c
@@ -2192,8 +2192,8 @@  handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
       if (target_supports_tracepoints ())
 	tracepoint_look_up_symbols ();
 
-      if (current_thread != NULL && the_target->look_up_symbols != NULL)
-	(*the_target->look_up_symbols) ();
+      if (current_thread != NULL)
+	the_target->pt->look_up_symbols ();
 
       current_thread = save_thread;
 
diff --git a/gdbserver/target.c b/gdbserver/target.c
index 49302f61dfb..dd9ee8dfd47 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -408,3 +408,9 @@  process_target::done_accessing_memory ()
 {
   /* Nop.  */
 }
+
+void
+process_target::look_up_symbols ()
+{
+  /* Nop.  */
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 5621dc1d60e..73343bd0c03 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,14 +70,6 @@  class process_target;
    shared code.  */
 struct process_stratum_target
 {
-  /* Query GDB for the values of any symbols we're interested in.
-     This function is called whenever we receive a "qSymbols::"
-     query, which corresponds to every time more symbols (might)
-     become available.  NULL if we aren't interested in any
-     symbols.  */
-
-  void (*look_up_symbols) (void);
-
   /* Send an interrupt request to the inferior process,
      however is appropriate.  */
 
@@ -476,6 +468,13 @@  public:
      Returns 0 on success and errno on failure.  */
   virtual int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
 			    int len) = 0;
+
+  /* Query GDB for the values of any symbols we're interested in.
+     This function is called whenever we receive a "qSymbols::"
+     query, which corresponds to every time more symbols (might)
+     become available.  NULL if we aren't interested in any
+     symbols.  */
+  virtual void look_up_symbols ();
 };
 
 extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index 1a56c9c45a4..8baf4a32e4f 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1828,7 +1828,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, /* lookup_symbols */
   win32_request_interrupt,
   NULL, /* read_auxv */
   win32_supports_z_point_type,