[PATCH 17/58] gdbserver: turn target op 'read_auxv' into a method
Tankut Baris Aktemur
tankut.baris.aktemur@intel.com
Tue Feb 11 09:04:00 GMT 2020
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's read_auxv op a method of
process_target.
* target.h (class process_stratum_target): Remove the target op.
(struct process_target): Add the target op. Also add
'supports_read_auxv'.
* target.c (process_target::read_auxv): Define.
(process_target::supports_read_auxv): Define.
Update the derived classs and callers below.
* server.c (handle_qxfer_auxv): Update.
(handle_query): Update.
* linux-low.c (linux_target_ops): Update.
(linux_process_target::supports_read_auxv): Define.
(linux_read_auxv): Turn into ...
(linux_process_target::read_auxv): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
* nto-low.c (nto_target_ops): Update.
(nto_process_target::supports_read_auxv): Define.
(nto_read_auxv): Turn into ...
(nto_process_target::read_auxv): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.c (win32_target_ops): Update.
---
gdbserver/linux-low.c | 14 ++++++++++----
gdbserver/linux-low.h | 5 +++++
gdbserver/lynx-low.c | 1 -
gdbserver/nto-low.c | 12 +++++++++---
gdbserver/nto-low.h | 5 +++++
gdbserver/server.c | 6 +++---
gdbserver/target.c | 13 +++++++++++++
gdbserver/target.h | 16 +++++++++-------
gdbserver/win32-low.c | 1 -
9 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index cf5192fef61..1bbd215d775 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -5919,11 +5919,18 @@ linux_process_target::request_interrupt ()
::kill (-signal_pid, SIGINT);
}
+bool
+linux_process_target::supports_read_auxv ()
+{
+ return true;
+}
+
/* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET
to debugger memory starting at MYADDR. */
-static int
-linux_read_auxv (CORE_ADDR offset, unsigned char *myaddr, unsigned int len)
+int
+linux_process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr,
+ unsigned int len)
{
char filename[PATH_MAX];
int fd, n;
@@ -7317,7 +7324,7 @@ linux_get_auxv (int wordsize, CORE_ADDR match, CORE_ADDR *valp)
gdb_assert (wordsize == 4 || wordsize == 8);
- while ((*the_target->read_auxv) (offset, data, 2 * wordsize) == 2 * wordsize)
+ while (the_target->pt->read_auxv (offset, data, 2 * wordsize) == 2 * wordsize)
{
if (wordsize == 4)
{
@@ -7369,7 +7376,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_read_auxv,
linux_supports_z_point_type,
linux_insert_point,
linux_remove_point,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 9340c78cdd0..eccd65c795e 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -308,6 +308,11 @@ public:
void look_up_symbols () override;
void request_interrupt () override;
+
+ bool supports_read_auxv () override;
+
+ int read_auxv (CORE_ADDR offset, unsigned char *myaddr,
+ unsigned int len) 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 0687aacfe61..730c66a33a3 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, /* read_auxv */
NULL, /* supports_z_point_type */
NULL, /* insert_point */
NULL, /* remove_point */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index f7b08b4524f..c5de7540079 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -755,14 +755,21 @@ nto_process_target::request_interrupt ()
TRACE ("Error stopping inferior.\n");
}
+bool
+nto_process_target::supports_read_auxv ()
+{
+ return true;
+}
+
/* Read auxiliary vector from inferior's memory into gdbserver's buffer
MYADDR. We always read whole auxv.
Return number of bytes stored in MYADDR buffer, 0 if OFFSET > 0
or -1 on error. */
-static int
-nto_read_auxv (CORE_ADDR offset, unsigned char *myaddr, unsigned int len)
+int
+nto_process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr,
+ unsigned int len)
{
int err;
CORE_ADDR initial_stack;
@@ -943,7 +950,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- nto_read_auxv,
nto_supports_z_point_type,
nto_insert_point,
nto_remove_point,
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index 1ce518189c6..f1e9e31478c 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -78,6 +78,11 @@ public:
int len) override;
void request_interrupt () override;
+
+ bool supports_read_auxv () override;
+
+ int read_auxv (CORE_ADDR offset, unsigned char *myaddr,
+ unsigned int len) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/server.c b/gdbserver/server.c
index bc497f87b7f..f13061c871b 100644
--- a/gdbserver/server.c
+++ b/gdbserver/server.c
@@ -1442,13 +1442,13 @@ handle_qxfer_auxv (const char *annex,
gdb_byte *readbuf, const gdb_byte *writebuf,
ULONGEST offset, LONGEST len)
{
- if (the_target->read_auxv == NULL || writebuf != NULL)
+ if (!the_target->pt->supports_read_auxv () || writebuf != NULL)
return -2;
if (annex[0] != '\0' || current_thread == NULL)
return -1;
- return (*the_target->read_auxv) (offset, readbuf, len);
+ return the_target->pt->read_auxv (offset, readbuf, len);
}
/* Handle qXfer:exec-file:read. */
@@ -2374,7 +2374,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
strcat (own_buf, ";qXfer:libraries:read+");
}
- if (the_target->read_auxv != NULL)
+ if (the_target->pt->supports_read_auxv ())
strcat (own_buf, ";qXfer:auxv:read+");
if (the_target->qxfer_siginfo != NULL)
diff --git a/gdbserver/target.c b/gdbserver/target.c
index dd9ee8dfd47..97e9d4ac507 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -414,3 +414,16 @@ process_target::look_up_symbols ()
{
/* Nop. */
}
+
+bool
+process_target::supports_read_auxv ()
+{
+ return false;
+}
+
+int
+process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr,
+ unsigned int len)
+{
+ gdb_assert_not_reached ("target op read_auxv not supported");
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 1eb5657045c..0d3e16c6ed5 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,13 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Read auxiliary vector data from the inferior process.
-
- Read LEN bytes at OFFSET into a buffer at MYADDR. */
-
- int (*read_auxv) (CORE_ADDR offset, unsigned char *myaddr,
- unsigned int len);
-
/* Returns true if GDB Z breakpoint type TYPE is supported, false
otherwise. The type is coded as follows:
'0' - software-breakpoint
@@ -474,6 +467,15 @@ public:
/* Send an interrupt request to the inferior process,
however is appropriate. */
virtual void request_interrupt () = 0;
+
+ /* Return true if the read_auxv target op is supported. */
+ virtual bool supports_read_auxv ();
+
+ /* Read auxiliary vector data from the inferior process.
+
+ Read LEN bytes at OFFSET into a buffer at MYADDR. */
+ virtual int read_auxv (CORE_ADDR offset, unsigned char *myaddr,
+ unsigned int len);
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index b2ed7f8b01e..18e977993dc 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, /* read_auxv */
win32_supports_z_point_type,
win32_insert_point,
win32_remove_point,
--
2.17.1
More information about the Gdb-patches
mailing list