[PATCH 38/58] gdbserver: turn target ops 'read_pc' and 'write_pc' into methods
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_pc and write_pc ops methods of
process_target.
* target.h (struct process_stratum_target): Remove the target ops.
(class process_target): Add the target ops.
* target.c (process_target::read_pc): Define.
(process_target::write_pc): Define.
Update the derived structs and callers below.
* regcache.c (regcache_read_pc): Update.
(regcache_write_pc): Update.
* linux-low.c (linux_target_ops): Update.
(linux_read_pc): Turn into ...
(linux_process_target::read_pc): ... this.
(linux_write_pc): Turn into ...
(linux_process_target::write_pc): ... 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 | 10 ++++------
gdbserver/linux-low.h | 4 ++++
gdbserver/lynx-low.c | 2 --
gdbserver/nto-low.c | 2 --
gdbserver/regcache.c | 16 ++--------------
gdbserver/target.c | 12 ++++++++++++
gdbserver/target.h | 12 ++++++------
gdbserver/win32-low.c | 2 --
8 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 758dd1108f8..3ac40a0ad38 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6544,8 +6544,8 @@ linux_process_target::supports_tracepoints ()
return (*the_low_target.supports_tracepoints) ();
}
-static CORE_ADDR
-linux_read_pc (struct regcache *regcache)
+CORE_ADDR
+linux_process_target::read_pc (regcache *regcache)
{
if (the_low_target.get_pc == NULL)
return 0;
@@ -6553,8 +6553,8 @@ linux_read_pc (struct regcache *regcache)
return (*the_low_target.get_pc) (regcache);
}
-static void
-linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
+void
+linux_process_target::write_pc (regcache *regcache, CORE_ADDR pc)
{
gdb_assert (the_low_target.set_pc != NULL);
@@ -7438,8 +7438,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_read_pc,
- linux_write_pc,
linux_thread_stopped,
NULL,
linux_pause_all,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index e142f6bfeb1..01f21b9f29c 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -391,6 +391,10 @@ public:
void process_qsupported (char **features, int count) override;
bool supports_tracepoints () override;
+
+ CORE_ADDR read_pc (regcache *regcache) override;
+
+ void write_pc (regcache *regcache, CORE_ADDR pc) 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 eeeddc5f175..667e06fd2fd 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -735,8 +735,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* read_pc */
- NULL, /* write_pc */
NULL, /* thread_stopped */
NULL, /* get_tib_address */
NULL, /* pause_all */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index d76014808ba..6a8baa08b2c 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -947,8 +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, /* read_pc */
- NULL, /* write_pc */
NULL, /* thread_stopped */
NULL, /* get_tib_address */
NULL, /* pause_all */
diff --git a/gdbserver/regcache.c b/gdbserver/regcache.c
index f63463344af..ec9d70d42fb 100644
--- a/gdbserver/regcache.c
+++ b/gdbserver/regcache.c
@@ -477,25 +477,13 @@ collect_register_by_name (struct regcache *regcache,
CORE_ADDR
regcache_read_pc (struct regcache *regcache)
{
- CORE_ADDR pc_val;
-
- if (the_target->read_pc)
- pc_val = the_target->read_pc (regcache);
- else
- internal_error (__FILE__, __LINE__,
- "regcache_read_pc: Unable to find PC");
-
- return pc_val;
+ return the_target->pt->read_pc (regcache);
}
void
regcache_write_pc (struct regcache *regcache, CORE_ADDR pc)
{
- if (the_target->write_pc)
- the_target->write_pc (regcache, pc);
- else
- internal_error (__FILE__, __LINE__,
- "regcache_write_pc: Unable to update PC");
+ the_target->pt->write_pc (regcache, pc);
}
#endif
diff --git a/gdbserver/target.c b/gdbserver/target.c
index ded8f3fee9d..2fb13b348e4 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -614,3 +614,15 @@ process_target::supports_tracepoints ()
{
return false;
}
+
+CORE_ADDR
+process_target::read_pc (regcache *regcache)
+{
+ gdb_assert_not_reached ("regcache_read_pc: Unable to find PC");
+}
+
+void
+process_target::write_pc (regcache *regcache, CORE_ADDR pc)
+{
+ gdb_assert_not_reached ("regcache_write_pc: Unable to update PC");
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 8a0146e4c32..00b473e61dc 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,12 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Read PC from REGCACHE. */
- CORE_ADDR (*read_pc) (struct regcache *regcache);
-
- /* Write PC to REGCACHE. */
- void (*write_pc) (struct regcache *regcache, CORE_ADDR pc);
-
/* Return true if THREAD is known to be stopped now. */
int (*thread_stopped) (struct thread_info *thread);
@@ -488,6 +482,12 @@ public:
/* Return true if the target supports tracepoints, false otherwise. */
virtual bool supports_tracepoints ();
+
+ /* Read PC from REGCACHE. */
+ virtual CORE_ADDR read_pc (regcache *regcache);
+
+ /* Write PC to REGCACHE. */
+ virtual void write_pc (regcache *regcache, CORE_ADDR pc);
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index 81746dedcbb..6d5860f595f 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1842,8 +1842,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_pc */
- NULL, /* write_pc */
NULL, /* thread_stopped */
win32_get_tib_address,
NULL, /* pause_all */
--
2.17.1
More information about the Gdb-patches
mailing list