@@ -6141,10 +6141,17 @@ linux_process_target::get_tls_address (thread_info *thread,
#endif
}
-static int
-linux_qxfer_osdata (const char *annex,
- unsigned char *readbuf, unsigned const char *writebuf,
- CORE_ADDR offset, int len)
+bool
+linux_process_target::supports_qxfer_osdata ()
+{
+ return true;
+}
+
+int
+linux_process_target::qxfer_osdata (const char *annex,
+ unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, int len)
{
return linux_common_xfer_osdata (annex, readbuf, offset, len);
}
@@ -7410,7 +7417,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_qxfer_osdata,
linux_xfer_siginfo,
linux_supports_non_stop,
linux_async,
@@ -345,6 +345,12 @@ public:
int get_tls_address (thread_info *thread, CORE_ADDR offset,
CORE_ADDR load_module, CORE_ADDR *address) override;
+
+ bool supports_qxfer_osdata () override;
+
+ int qxfer_osdata (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)))
@@ -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_osdata */
NULL, /* qxfer_siginfo */
NULL, /* supports_non_stop */
NULL, /* async */
@@ -956,7 +956,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_qxfer_osdata */
NULL, /* xfer_siginfo */
nto_supports_non_stop,
NULL, /* async */
@@ -1587,10 +1587,10 @@ handle_qxfer_osdata (const char *annex,
gdb_byte *readbuf, const gdb_byte *writebuf,
ULONGEST offset, LONGEST len)
{
- if (the_target->qxfer_osdata == NULL || writebuf != NULL)
+ if (!the_target->pt->supports_qxfer_osdata () || writebuf != NULL)
return -2;
- return (*the_target->qxfer_osdata) (annex, readbuf, NULL, offset, len);
+ return the_target->pt->qxfer_osdata (annex, readbuf, NULL, offset, len);
}
/* Handle qXfer:siginfo:read and qXfer:siginfo:write. */
@@ -2392,7 +2392,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
if (cs.transport_is_reliable)
strcat (own_buf, ";QStartNoAckMode+");
- if (the_target->qxfer_osdata != NULL)
+ if (the_target->pt->supports_qxfer_osdata ())
strcat (own_buf, ";qXfer:osdata:read+");
if (target_supports_multi_process ())
@@ -513,3 +513,17 @@ process_target::hostio_last_error (char *buf)
{
hostio_last_error_from_errno (buf);
}
+
+bool
+process_target::supports_qxfer_osdata ()
+{
+ return false;
+}
+
+int
+process_target::qxfer_osdata (const char *annex, unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, int len)
+{
+ gdb_assert_not_reached ("target op qxfer_osdata not supported");
+}
@@ -70,11 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Read/Write OS data using qXfer packets. */
- int (*qxfer_osdata) (const char *annex, unsigned char *readbuf,
- unsigned const char *writebuf, CORE_ADDR offset,
- int len);
-
/* Read/Write extra signal info. */
int (*qxfer_siginfo) (const char *annex, unsigned char *readbuf,
unsigned const char *writebuf,
@@ -479,6 +474,14 @@ public:
/* Fill BUF with an hostio error packet representing the last hostio
error. */
virtual void hostio_last_error (char *buf);
+
+ /* Return true if the qxfer_osdata target op is supported. */
+ virtual bool supports_qxfer_osdata ();
+
+ /* Read/Write OS data using qXfer packets. */
+ virtual int qxfer_osdata (const char *annex, unsigned char *readbuf,
+ unsigned const char *writebuf,
+ CORE_ADDR offset, int len);
};
extern process_stratum_target *the_target;
@@ -1844,7 +1844,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_osdata */
win32_xfer_siginfo,
NULL, /* supports_non_stop */
NULL, /* async */