[PATCH 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' into a method
Tankut Baris Aktemur
tankut.baris.aktemur@intel.com
Tue Feb 11 09:03:00 GMT 2020
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's qxfer_libraries_svr4 op a method of
process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op. Also add
'supports_qxfer_libraries_svr4'.
* target.c (process_target::qxfer_libraries_svr4): Define.
(process_target::supports_qxfer_libraries_svr4): Define.
Update the derived structs and callers below.
* server.c (handle_qxfer_libraries_svr4): Update.
(handle_query): Update.
* linux-low.c (linux_target_ops): Update.
(linux_process_target::supports_qxfer_libraries_svr4): Define.
(linux_qxfer_libraries_svr4): Turn into ...
(linux_process_target::qxfer_libraries_svr4): ... 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 | 16 +++++++++++-----
gdbserver/linux-low.h | 7 +++++++
gdbserver/lynx-low.c | 1 -
gdbserver/nto-low.c | 1 -
gdbserver/server.c | 8 +++++---
gdbserver/target.c | 15 +++++++++++++++
gdbserver/target.h | 14 +++++++++-----
gdbserver/win32-low.c | 1 -
8 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 1a35b5ed681..fcca23f0510 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6920,6 +6920,12 @@ read_one_ptr (CORE_ADDR memaddr, CORE_ADDR *ptr, int ptr_size)
return ret;
}
+bool
+linux_process_target::supports_qxfer_libraries_svr4 ()
+{
+ return true;
+}
+
struct link_map_offsets
{
/* Offset and size of r_debug.r_version. */
@@ -6946,10 +6952,11 @@ struct link_map_offsets
/* Construct qXfer:libraries-svr4:read reply. */
-static int
-linux_qxfer_libraries_svr4 (const char *annex, unsigned char *readbuf,
- unsigned const char *writebuf,
- CORE_ADDR offset, int len)
+int
+linux_process_target::qxfer_libraries_svr4 (const char *annex,
+ unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, int len)
{
struct process_info_private *const priv = current_process ()->priv;
char filename[PATH_MAX];
@@ -7445,7 +7452,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_qxfer_libraries_svr4,
linux_supports_agent,
#ifdef HAVE_LINUX_BTRACE
linux_enable_btrace,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 90569ec2abc..e0938fdf340 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -427,6 +427,13 @@ public:
struct emit_ops *emit_ops () override;
bool supports_disable_randomization () override;
+
+ bool supports_qxfer_libraries_svr4 () override;
+
+ int qxfer_libraries_svr4 (const char *annex,
+ unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, 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 0f2eb05c4ef..43fa36c5fbd 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, /* qxfer_libraries_svr4 */
NULL, /* support_agent */
NULL, /* enable_btrace */
NULL, /* disable_btrace */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index 2c6ad118026..7940325c3b5 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, /* qxfer_libraries_svr4 */
NULL, /* support_agent */
NULL, /* enable_btrace */
NULL, /* disable_btrace */
diff --git a/gdbserver/server.c b/gdbserver/server.c
index 448089fd47c..61346e3ce5b 100644
--- a/gdbserver/server.c
+++ b/gdbserver/server.c
@@ -1574,10 +1574,12 @@ handle_qxfer_libraries_svr4 (const char *annex,
if (writebuf != NULL)
return -2;
- if (current_thread == NULL || the_target->qxfer_libraries_svr4 == NULL)
+ if (current_thread == NULL
+ || !the_target->pt->supports_qxfer_libraries_svr4 ())
return -1;
- return the_target->qxfer_libraries_svr4 (annex, readbuf, writebuf, offset, len);
+ return the_target->pt->qxfer_libraries_svr4 (annex, readbuf, writebuf,
+ offset, len);
}
/* Handle qXfer:osadata:read. */
@@ -2364,7 +2366,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
if (target_supports_catch_syscall ())
strcat (own_buf, ";QCatchSyscalls+");
- if (the_target->qxfer_libraries_svr4 != NULL)
+ if (the_target->pt->supports_qxfer_libraries_svr4 ())
strcat (own_buf, ";qXfer:libraries-svr4:read+"
";augmented-libraries-svr4-read+");
else
diff --git a/gdbserver/target.c b/gdbserver/target.c
index 0c8c13ae2f3..34b3ffd1cfd 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -705,3 +705,18 @@ process_target::supports_disable_randomization ()
{
return false;
}
+
+bool
+process_target::supports_qxfer_libraries_svr4 ()
+{
+ return false;
+}
+
+int
+process_target::qxfer_libraries_svr4 (const char *annex,
+ unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, int len)
+{
+ gdb_assert_not_reached ("target op qxfer_libraries_svr4 not supported");
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 85ce8034543..3e90227c4fd 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,11 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Read solib info on SVR4 platforms. */
- int (*qxfer_libraries_svr4) (const char *annex, unsigned char *readbuf,
- unsigned const char *writebuf,
- CORE_ADDR offset, int len);
-
/* Return true if target supports debugging agent. */
int (*supports_agent) (void);
@@ -493,6 +488,15 @@ public:
/* Returns true if the target supports disabling randomization. */
virtual bool supports_disable_randomization ();
+
+ /* Return true if the qxfer_libraries_svr4 op is supported. */
+ virtual bool supports_qxfer_libraries_svr4 ();
+
+ /* Read solib info on SVR4 platforms. */
+ virtual int qxfer_libraries_svr4 (const char *annex,
+ unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, int len);
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index 81c04f65251..f54d1bf0ef3 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1848,7 +1848,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, /* qxfer_libraries_svr4 */
NULL, /* support_agent */
NULL, /* enable_btrace */
NULL, /* disable_btrace */
--
2.17.1
More information about the Gdb-patches
mailing list