@@ -6551,8 +6551,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;
@@ -6560,8 +6560,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);
@@ -7445,8 +7445,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,
@@ -388,6 +388,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)))
@@ -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 */
@@ -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 */
@@ -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
@@ -614,3 +614,15 @@ process_target::supports_tracepoints ()
{
return false;
}
+
+CORE_ADDR
+process_target::read_pc (regcache *regcache)
+{
+ gdb_assert_not_reached ("process_target::read_pc: Unable to find PC");
+}
+
+void
+process_target::write_pc (regcache *regcache, CORE_ADDR pc)
+{
+ gdb_assert_not_reached ("process_target::write_pc: Unable to update PC");
+}
@@ -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;
@@ -1852,8 +1852,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 */