+2020-04-02 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+
+ Turn the 'collect_ptrace_register' and 'supply_ptrace_register'
+ linux target ops into methods of linux_process_target.
+
+ * linux-low.h (struct linux_target_ops): Remove the ops.
+ (class linux_process_target) <low_collect_ptrace_register>
+ <low_store_ptrace_register>: Declare.
+ * linux-low.cc (linux_process_target::low_collect_ptrace_register)
+ (linux_process_target::low_supply_ptrace_register): Define.
+
+ Update the callers below.
+
+ (linux_process_target::fetch_register)
+ (linux_process_target::store_register)
+
+ * linux-x86-low.cc (the_low_target): Remove the op fields.
+ * linux-aarch64-low.cc (the_low_target): Ditto.
+ * linux-arm-low.cc (the_low_target): Ditto.
+ * linux-bfin-low.cc (the_low_target): Ditto.
+ * linux-crisv32-low.cc (the_low_target): Ditto.
+ * linux-m32r-low.cc (the_low_target): Ditto.
+ * linux-m68k-low.cc (the_low_target): Ditto.
+ * linux-sh-low.cc (the_low_target): Ditto.
+ * linux-sparc-low.cc (the_low_target): Ditto.
+ * linux-tic6x-low.cc (the_low_target): Ditto.
+ * linux-tile-low.cc (the_low_target): Ditto.
+ * linux-xtensa-low.cc (the_low_target): Ditto.
+ * linux-mips-low.cc (class mips_target)
+ <low_collect_ptrace_register>
+ <low_supply_ptrace_register>: Declare.
+ (mips_collect_ptrace_register): Turn into ...
+ (mips_target::low_collect_ptrace_register): ...this.
+ (mips_supply_ptrace_register): Turn into...
+ (mips_target::low_supply_ptrace_register): ...this.
+ (the_low_target): Remove the op fields.
+ * linux-ppc-low.cc (class ppc_target)
+ <low_collect_ptrace_register>
+ <low_supply_ptrace_register>: Declare.
+ (ppc_collect_ptrace_register): Turn into ...
+ (ppc_target::low_collect_ptrace_register): ...this.
+ (ppc_supply_ptrace_register): Turn into ...
+ (ppc_target::low_supply_ptrace_register): ...this.
+ (ppc_fill_gregset): Update for the calls to
+ low_collect_ptrace_register.
+ (the_low_target): Remove the op fields.
+ * linux-s390-low.cc (class s390_target)
+ <low_collect_ptrace_register>
+ <low_supply_ptrace_register>: Declare.
+ (s390_collect_ptrace_register): Turn into ...
+ (s390_target::low_collect_ptrace_register): ...this.
+ (s390_supply_ptrace_register): Turn into ...
+ (s390_target::low_supply_ptrace_register): ...this.
+ (s390_fill_gregset): Update for the calls to
+ low_collect_ptrace_register.
+ (the_low_target): Remove the op fields.
+
2020-04-02 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn the 'stopped_by_watchpoint' and 'stopped_data_address' linux
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,
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
arm_new_process,
arm_delete_process,
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
}
}
- 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
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))
}
#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,
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.
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. */
virtual int low_decr_pc_after_break ();
};
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
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. */
/* 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;
/* 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;
}
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,
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;
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));
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)
{
{
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. */
}
struct linux_target_ops the_low_target = {
- ppc_collect_ptrace_register,
- ppc_supply_ptrace_register,
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
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;
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];
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];
|| 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]);
}
}
}
struct linux_target_ops the_low_target = {
- s390_collect_ptrace_register,
- s390_supply_ptrace_register,
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
}
struct linux_target_ops the_low_target = {
- NULL, NULL
};
/* The linux target ops object. */
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
struct linux_target_ops the_low_target =
{
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
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. */
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,
}
struct linux_target_ops the_low_target = {
- NULL, /* collect_ptrace_register */
- NULL, /* supply_ptrace_register */
NULL, /* siginfo_fixup */
NULL, /* new_process */
NULL, /* delete_process */
projects / binutils-gdb.git / commitdiff