diff options
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/ChangeLog | 24 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 16 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 6 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 1 | ||||
| -rw-r--r-- | gdbserver/nto-low.cc | 1 | ||||
| -rw-r--r-- | gdbserver/server.cc | 6 | ||||
| -rw-r--r-- | gdbserver/target.cc | 14 | ||||
| -rw-r--r-- | gdbserver/target.h | 13 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 1 |
9 files changed, 66 insertions, 16 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 13fd47d..a14fb7a 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,29 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's qxfer_osdata op into 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_osdata'. + * target.cc (process_target::qxfer_osdata): Define. + (process_target::supports_qxfer_osdata): Define. + + Update the derived classes and callers below. + + * server.cc (handle_qxfer_osdata): Update. + (handle_query): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_process_target::supports_qxfer_osdata): Define. + (linux_qxfer_osdata): Turn into ... + (linux_process_target::qxfer_osdata): ... 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 hostio_last_error op into a method of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index a863474..14a895d 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6145,10 +6145,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); } @@ -7414,7 +7421,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, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 3c2fdaf..8927671 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -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))) diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc index 0e904d0..ecd7476 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, /* qxfer_osdata */ NULL, /* qxfer_siginfo */ NULL, /* supports_non_stop */ NULL, /* async */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index ec0b477..fffe631 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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 */ diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 01d41af..59eb1c0 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -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 ()) diff --git a/gdbserver/target.cc b/gdbserver/target.cc index e09ee7d..c6ed544 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -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"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 5f603fd..53f88a0 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -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; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 727bc9c..ce750b5 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -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 */ |