[24/58] gdbserver: turn target op 'read_offsets' into a method
Commit Message
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's read_offsets 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_read_offsets'.
* target.c (process_target::read_offsets): Define.
(process_target::supports_read_offsets): Define.
Update the derived structs and callers below.
* server.c (handle_query): Update.
* linux-low.c (linux_target_ops): Update.
(linux_process_target::supports_read_offsets): Define.
(linux_read_offsets): Turn into ...
(linux_process_target::read_offsets): ... 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 | 17 ++++++++---------
gdbserver/linux-low.h | 8 ++++++++
gdbserver/lynx-low.c | 1 -
gdbserver/nto-low.c | 1 -
gdbserver/server.c | 4 ++--
gdbserver/target.c | 12 ++++++++++++
gdbserver/target.h | 14 ++++++++------
gdbserver/win32-low.c | 1 -
8 files changed, 38 insertions(+), 20 deletions(-)
Comments
On 2/11/20 9:01 AM, Tankut Baris Aktemur wrote:
> --- a/gdbserver/linux-low.h
> +++ b/gdbserver/linux-low.h
> @@ -335,6 +335,14 @@ public:
> bool stopped_by_watchpoint () override;
>
> CORE_ADDR stopped_data_address () override;
> +
> +#if defined(__UCLIBC__) && defined(HAS_NOMMU) \
> + && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \
> + && defined(PT_TEXT_END_ADDR)
You'll need to move more things to the header. E.g.,
this in linux-low.c:
/* Some targets did not define these ptrace constants from the start,
so gdbserver defines them locally here. In the future, these may
be removed after they are added to asm/ptrace.h. */
#if !(defined(PT_TEXT_ADDR) \
|| defined(PT_DATA_ADDR) \
|| defined(PT_TEXT_END_ADDR))
#if defined(__mcoldfire__)
/* These are still undefined in 3.10 kernels. */
#define PT_TEXT_ADDR 49*4
#define PT_DATA_ADDR 50*4
You may need to move some #includes as well.
Alternatively, always define the methods, and make linux-low.c
put the #ifdef conditionals inside
linux_process_target::supports_read_offsets and
linux_process_target::read_offsets.
Thanks,
Pedro Alves
@@ -6068,11 +6068,17 @@ linux_process_target::stopped_data_address ()
the target has different ways of acquiring this information, like
loadmaps. */
+bool
+linux_process_target::supports_read_offsets ()
+{
+ return true;
+}
+
/* Under uClinux, programs are loaded at non-zero offsets, which we need
to tell gdb about. */
-static int
-linux_read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p)
+int
+linux_process_target::read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p)
{
unsigned long text, text_end, data;
int pid = lwpid_of (current_thread);
@@ -7375,13 +7381,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
-#if defined(__UCLIBC__) && defined(HAS_NOMMU) \
- && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \
- && defined(PT_TEXT_END_ADDR)
- linux_read_offsets,
-#else
- NULL,
-#endif
#ifdef USE_THREAD_DB
thread_db_get_tls_address,
#else
@@ -335,6 +335,14 @@ public:
bool stopped_by_watchpoint () override;
CORE_ADDR stopped_data_address () override;
+
+#if defined(__UCLIBC__) && defined(HAS_NOMMU) \
+ && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \
+ && defined(PT_TEXT_END_ADDR)
+ bool supports_read_offsets () override;
+
+ int read_offsets (CORE_ADDR *text, CORE_ADDR *data) override;
+#endif
};
#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, /* read_offsets */
NULL, /* get_tls_address */
NULL, /* hostio_last_error */
NULL, /* qxfer_osdata */
@@ -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_read_offsets */
NULL, /* thread_db_set_tls_address */
hostio_last_error_from_errno,
NULL, /* nto_qxfer_osdata */
@@ -2234,13 +2234,13 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
}
}
- if (the_target->read_offsets != NULL
+ if (the_target->pt->supports_read_offsets ()
&& strcmp ("qOffsets", own_buf) == 0)
{
CORE_ADDR text, data;
require_running_or_return (own_buf);
- if (the_target->read_offsets (&text, &data))
+ if (the_target->pt->read_offsets (&text, &data))
sprintf (own_buf, "Text=%lX;Data=%lX;Bss=%lX",
(long)text, (long)data, (long)data);
else
@@ -481,3 +481,15 @@ process_target::stopped_data_address ()
{
return 0;
}
+
+bool
+process_target::supports_read_offsets ()
+{
+ return false;
+}
+
+int
+process_target::read_offsets (CORE_ADDR *text, CORE_ADDR *data)
+{
+ gdb_assert_not_reached ("target op read_offsets not supported");
+}
@@ -70,12 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Reports the text, data offsets of the executable. This is
- needed for uclinux where the executable is relocated during load
- time. */
-
- int (*read_offsets) (CORE_ADDR *text, CORE_ADDR *data);
-
/* Fetch the address associated with a specific thread local storage
area, determined by the specified THREAD, OFFSET, and LOAD_MODULE.
Stores it in *ADDRESS and returns zero on success; otherwise returns
@@ -475,6 +469,14 @@ public:
/* Returns the address associated with the watchpoint that hit, if any;
returns 0 otherwise. */
virtual CORE_ADDR stopped_data_address ();
+
+ /* Return true if the read_offsets target op is supported. */
+ virtual bool supports_read_offsets ();
+
+ /* Reports the text, data offsets of the executable. This is
+ needed for uclinux where the executable is relocated during load
+ time. */
+ virtual int read_offsets (CORE_ADDR *text, CORE_ADDR *data);
};
extern process_stratum_target *the_target;
@@ -1834,7 +1834,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_offsets */
NULL, /* get_tls_address */
#ifdef _WIN32_WCE
wince_hostio_last_error,