@@ -5650,8 +5650,8 @@ usr_store_inferior_registers (const struct regs_info *regs_info,
#endif
-static void
-linux_fetch_registers (struct regcache *regcache, int regno)
+void
+linux_process_target::fetch_registers (regcache *regcache, int regno)
{
int use_regsets;
int all = 0;
@@ -5683,8 +5683,8 @@ linux_fetch_registers (struct regcache *regcache, int regno)
}
}
-static void
-linux_store_registers (struct regcache *regcache, int regno)
+void
+linux_process_target::store_registers (regcache *regcache, int regno)
{
int use_regsets;
int all = 0;
@@ -7359,8 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_fetch_registers,
- linux_store_registers,
linux_prepare_to_access_memory,
linux_done_accessing_memory,
linux_read_memory,
@@ -290,6 +290,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
@@ -581,8 +581,8 @@ lynx_process_target::thread_alive (ptid_t ptid)
/* Implement the fetch_registers target_ops method. */
-static void
-lynx_fetch_registers (struct regcache *regcache, int regno)
+void
+lynx_process_target::fetch_registers (regcache *regcache, int regno)
{
struct lynx_regset_info *regset = lynx_target_regsets;
ptid_t inferior_ptid = ptid_of (current_thread);
@@ -606,8 +606,8 @@ lynx_fetch_registers (struct regcache *regcache, int regno)
/* Implement the store_registers target_ops method. */
-static void
-lynx_store_registers (struct regcache *regcache, int regno)
+void
+lynx_process_target::store_registers (regcache *regcache, int regno)
{
struct lynx_regset_info *regset = lynx_target_regsets;
ptid_t inferior_ptid = ptid_of (current_thread);
@@ -727,8 +727,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- lynx_fetch_registers,
- lynx_store_registers,
NULL, /* prepare_to_access_memory */
NULL, /* done_accessing_memory */
lynx_read_memory,
@@ -76,6 +76,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
/* The inferior's target description. This is a global because the
@@ -623,8 +623,8 @@ nto_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
/* Fetch inferior's registers for currently selected thread (CURRENT_INFERIOR).
If REGNO is -1, fetch all registers, or REGNO register only otherwise. */
-static void
-nto_fetch_registers (struct regcache *regcache, int regno)
+void
+nto_process_target::fetch_registers (regcache *regcache, int regno)
{
int regsize;
procfs_greg greg;
@@ -671,8 +671,8 @@ nto_fetch_registers (struct regcache *regcache, int regno)
/* Store registers for currently selected thread (CURRENT_INFERIOR).
We always store all registers, regardless of REGNO. */
-static void
-nto_store_registers (struct regcache *regcache, int regno)
+void
+nto_process_target::store_registers (regcache *regcache, int regno)
{
procfs_greg greg;
int err;
@@ -941,8 +941,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- nto_fetch_registers,
- nto_store_registers,
NULL, /* prepare_to_access_memory */
NULL, /* done_accessing_memory */
nto_read_memory,
@@ -66,6 +66,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
/* The inferior's target description. This is a global because the
@@ -70,18 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Fetch registers from the inferior process.
-
- If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
-
- void (*fetch_registers) (struct regcache *regcache, int regno);
-
- /* Store registers to the inferior process.
-
- If REGNO is -1, store all registers; otherwise, store at least REGNO. */
-
- void (*store_registers) (struct regcache *regcache, int regno);
-
/* Prepare to read or write memory from the inferior process.
Targets use this to do what is necessary to get the state of the
inferior such that it is possible to access memory.
@@ -481,6 +469,16 @@ public:
null_ptid/TARGET_WAITKIND_IGNORE. */
virtual ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) = 0;
+
+ /* Fetch registers from the inferior process.
+
+ If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
+ virtual void fetch_registers (regcache *regcache, int regno) = 0;
+
+ /* Store registers to the inferior process.
+
+ If REGNO is -1, store all registers; otherwise, store at least REGNO. */
+ virtual void store_registers (regcache *regcache, int regno) = 0;
};
extern process_stratum_target *the_target;
@@ -524,10 +522,10 @@ int kill_inferior (process_info *proc);
the_target->pt->thread_alive (pid)
#define fetch_inferior_registers(regcache, regno) \
- (*the_target->fetch_registers) (regcache, regno)
+ the_target->pt->fetch_registers (regcache, regno)
#define store_inferior_registers(regcache, regno) \
- (*the_target->store_registers) (regcache, regno)
+ the_target->pt->store_registers (regcache, regno)
#define join_inferior(pid) \
the_target->pt->join (pid)
@@ -1649,16 +1649,16 @@ win32_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
/* Fetch registers from the inferior process.
If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
-static void
-win32_fetch_inferior_registers (struct regcache *regcache, int regno)
+void
+win32_process_target::fetch_registers (regcache *regcache, int regno)
{
child_fetch_inferior_registers (regcache, regno);
}
/* Store registers to the inferior process.
If REGNO is -1, store all registers; otherwise, store at least REGNO. */
-static void
-win32_store_inferior_registers (struct regcache *regcache, int regno)
+void
+win32_process_target::store_registers (regcache *regcache, int regno)
{
child_store_inferior_registers (regcache, regno);
}
@@ -1827,8 +1827,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- win32_fetch_inferior_registers,
- win32_store_inferior_registers,
NULL, /* prepare_to_access_memory */
NULL, /* done_accessing_memory */
win32_read_inferior_memory,
@@ -125,6 +125,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
/* Retrieve the context for this thread, if not already retrieved. */