@@ -3114,8 +3114,6 @@ aarch64_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
aarch64_linux_siginfo_fixup,
aarch64_linux_new_process,
aarch64_linux_delete_process,
@@ -1107,8 +1107,6 @@ arm_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
arm_new_process,
arm_delete_process,
@@ -165,8 +165,6 @@ bfin_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -470,8 +470,6 @@ crisv32_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -5408,10 +5408,7 @@ linux_process_target::fetch_register (const usrregs_info *usrregs,
}
}
- if (the_low_target.supply_ptrace_register)
- the_low_target.supply_ptrace_register (regcache, regno, buf);
- else
- supply_register (regcache, regno, buf);
+ low_supply_ptrace_register (regcache, regno, buf);
}
void
@@ -5438,10 +5435,7 @@ linux_process_target::store_register (const usrregs_info *usrregs,
buf = (char *) alloca (size);
memset (buf, 0, size);
- if (the_low_target.collect_ptrace_register)
- the_low_target.collect_ptrace_register (regcache, regno, buf);
- else
- collect_register (regcache, regno, buf);
+ low_collect_ptrace_register (regcache, regno, buf);
pid = lwpid_of (current_thread);
for (i = 0; i < size; i += sizeof (PTRACE_XFER_TYPE))
@@ -5470,6 +5464,20 @@ linux_process_target::store_register (const usrregs_info *usrregs,
}
#endif /* HAVE_LINUX_USRREGS */
+void
+linux_process_target::low_collect_ptrace_register (regcache *regcache,
+ int regno, char *buf)
+{
+ collect_register (regcache, regno, buf);
+}
+
+void
+linux_process_target::low_supply_ptrace_register (regcache *regcache,
+ int regno, const char *buf)
+{
+ supply_register (regcache, regno, buf);
+}
+
void
linux_process_target::usr_fetch_inferior_registers (const regs_info *regs_info,
regcache *regcache,
@@ -131,13 +131,6 @@ struct lwp_info;
struct linux_target_ops
{
- /* Hooks to reformat register data for PEEKUSR/POKEUSR (in particular
- for registers smaller than an xfer unit). */
- void (*collect_ptrace_register) (struct regcache *regcache,
- int regno, char *buf);
- void (*supply_ptrace_register) (struct regcache *regcache,
- int regno, const char *buf);
-
/* Hook to convert from target format to ptrace format and back.
Returns true if any conversion was done; false otherwise.
If DIRECTION is 1, then copy from INF to NATIVE.
@@ -684,6 +677,14 @@ class linux_process_target : public process_stratum_target
virtual CORE_ADDR low_stopped_data_address ();
+ /* Hooks to reformat register data for PEEKUSR/POKEUSR (in particular
+ for registers smaller than an xfer unit). */
+ virtual void low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf);
+
+ virtual void low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf);
+
/* How many bytes the PC should be decremented after a break. */
int m_decr_pc_after_break;
};
@@ -163,8 +163,6 @@ m32r_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -259,8 +259,6 @@ m68k_supports_hardware_single_step (void)
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -66,6 +66,12 @@ protected:
bool low_stopped_by_watchpoint () override;
CORE_ADDR low_stopped_data_address () override;
+
+ void low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf) override;
+
+ void low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf) override;
};
/* The singleton target ops object. */
@@ -893,9 +899,9 @@ mips_store_fpregset (struct regcache *regcache, const void *buf)
/* Take care of 32-bit registers with 64-bit ptrace, POKEUSER side. */
-static void
-mips_collect_ptrace_register (struct regcache *regcache,
- int regno, char *buf)
+void
+mips_target::low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf)
{
int use_64bit = sizeof (PTRACE_XFER_TYPE) == 8;
@@ -912,9 +918,9 @@ mips_collect_ptrace_register (struct regcache *regcache,
/* Take care of 32-bit registers with 64-bit ptrace, PEEKUSER side. */
-static void
-mips_supply_ptrace_register (struct regcache *regcache,
- int regno, const char *buf)
+void
+mips_target::low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf)
{
int use_64bit = sizeof (PTRACE_XFER_TYPE) == 8;
@@ -982,8 +988,6 @@ mips_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- mips_collect_ptrace_register,
- mips_supply_ptrace_register,
NULL, /* siginfo_fixup */
mips_linux_new_process,
mips_linux_delete_process,
@@ -58,6 +58,12 @@ public:
bool supports_z_point_type (char z_type) override;
+
+ void low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf) override;
+
+ void low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf) override;
protected:
void low_arch_setup () override;
@@ -210,8 +216,9 @@ ppc_target::low_cannot_fetch_register (int regno)
return false;
}
-static void
-ppc_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
+void
+ppc_target::low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf)
{
memset (buf, 0, sizeof (long));
@@ -236,9 +243,9 @@ ppc_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
perror_with_name ("Unexpected byte order");
}
-static void
-ppc_supply_ptrace_register (struct regcache *regcache,
- int regno, const char *buf)
+void
+ppc_target::low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf)
{
if (__BYTE_ORDER == __LITTLE_ENDIAN)
{
@@ -403,14 +410,19 @@ static void ppc_fill_gregset (struct regcache *regcache, void *buf)
{
int i;
+ ppc_target *my_ppc_target = (ppc_target *) the_linux_target;
+
for (i = 0; i < 32; i++)
- ppc_collect_ptrace_register (regcache, i, (char *) buf + ppc_regmap[i]);
+ my_ppc_target->low_collect_ptrace_register (regcache, i,
+ (char *) buf + ppc_regmap[i]);
for (i = 64; i < 70; i++)
- ppc_collect_ptrace_register (regcache, i, (char *) buf + ppc_regmap[i]);
+ my_ppc_target->low_collect_ptrace_register (regcache, i,
+ (char *) buf + ppc_regmap[i]);
for (i = 71; i < 73; i++)
- ppc_collect_ptrace_register (regcache, i, (char *) buf + ppc_regmap[i]);
+ my_ppc_target->low_collect_ptrace_register (regcache, i,
+ (char *) buf + ppc_regmap[i]);
}
/* Program Priority Register regset fill function. */
@@ -3418,8 +3430,6 @@ ppc_get_ipa_tdesc_idx (void)
}
struct linux_target_ops the_low_target = {
- ppc_collect_ptrace_register,
- ppc_supply_ptrace_register,
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -68,6 +68,12 @@ public:
bool supports_z_point_type (char z_type) override;
+ void low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf) override;
+
+ void low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf) override;
+
protected:
void low_arch_setup () override;
@@ -190,11 +196,12 @@ s390_target::low_cannot_store_register (int regno)
return false;
}
-static void
-s390_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
+void
+s390_target::low_collect_ptrace_register (regcache *regcache, int regno,
+ char *buf)
{
int size = register_size (regcache->tdesc, regno);
- const struct regs_info *regs_info = the_linux_target->get_regs_info ();
+ const struct regs_info *regs_info = get_regs_info ();
struct usrregs_info *usr = regs_info->usrregs;
int regaddr = usr->regmap[regno];
@@ -236,12 +243,12 @@ s390_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
collect_register (regcache, regno, buf);
}
-static void
-s390_supply_ptrace_register (struct regcache *regcache,
- int regno, const char *buf)
+void
+s390_target::low_supply_ptrace_register (regcache *regcache, int regno,
+ const char *buf)
{
int size = register_size (regcache->tdesc, regno);
- const struct regs_info *regs_info = the_linux_target->get_regs_info ();
+ const struct regs_info *regs_info = get_regs_info ();
struct usrregs_info *usr = regs_info->usrregs;
int regaddr = usr->regmap[regno];
@@ -308,8 +315,8 @@ s390_fill_gregset (struct regcache *regcache, void *buf)
|| usr->regmap[i] > PT_ACR15)
continue;
- s390_collect_ptrace_register (regcache, i,
- (char *) buf + usr->regmap[i]);
+ ((s390_target *) the_linux_target)->low_collect_ptrace_register
+ (regcache, i, (char *) buf + usr->regmap[i]);
}
}
@@ -2832,8 +2839,6 @@ s390_emit_ops (void)
}
struct linux_target_ops the_low_target = {
- s390_collect_ptrace_register,
- s390_supply_ptrace_register,
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -194,8 +194,6 @@ sh_target::low_arch_setup ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -343,7 +343,6 @@ sparc_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, NULL
};
/* The linux target ops object. */
@@ -425,8 +425,6 @@ tic6x_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -226,8 +226,6 @@ tile_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
@@ -137,6 +137,10 @@ protected:
bool low_stopped_by_watchpoint () override;
CORE_ADDR low_stopped_data_address () override;
+
+ /* collect_ptrace_register/supply_ptrace_register are not needed in the
+ native i386 case (no registers smaller than an xfer unit), and are not
+ used in the biarch case (HAVE_LINUX_USRREGS is not defined). */
};
/* The singleton target ops object. */
@@ -2915,11 +2919,6 @@ x86_get_ipa_tdesc_idx (void)
struct linux_target_ops the_low_target =
{
- /* collect_ptrace_register/supply_ptrace_register are not needed in the
- native i386 case (no registers smaller than an xfer unit), and are not
- used in the biarch case (HAVE_LINUX_USRREGS is not defined). */
- NULL,
- NULL,
/* need to fix up i386 siginfo if host is amd64 */
x86_siginfo_fixup,
x86_linux_new_process,
@@ -331,8 +331,6 @@ xtensa_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */