OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdbserver/linux-low: turn '{collect, supply}_ptrace_register' into methods

Browse Source 
gdbserver/ChangeLog:
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.
This commit is contained in:
Tankut Baris Aktemur 2020-04-02 15:11:28 +02:00
parent ac1bbaca10
commit b35db73327
18 changed files with 133 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
gdbserver/ChangeLog
View File

@ -1,3 +1,60 @@
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

2
gdbserver/linux-aarch64-low.cc
View File

@ -3113,8 +3113,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,

2
gdbserver/linux-arm-low.cc
View File

@ -1105,8 +1105,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,

2
gdbserver/linux-bfin-low.cc
View File

@ -171,8 +171,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 */

2
gdbserver/linux-crisv32-low.cc
View File

@ -468,8 +468,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 */

24
gdbserver/linux-low.cc
View File

@ -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,

15
gdbserver/linux-low.h
View File

@ -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.
@ -682,6 +675,14 @@ protected:
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 ();
};

2
gdbserver/linux-m32r-low.cc
View File

@ -161,8 +161,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 */

2
gdbserver/linux-m68k-low.cc
View File

@ -265,8 +265,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 */

20
gdbserver/linux-mips-low.cc
View File

@ -64,6 +64,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. */
@ -891,9 +897,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;
@ -910,9 +916,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;
@ -980,8 +986,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,

30
gdbserver/linux-ppc-low.cc
View File

@ -56,6 +56,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;
@ -208,8 +214,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));
@ -234,9 +241,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)
{
@ -401,14 +408,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. */
@ -3416,8 +3428,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 */

27
gdbserver/linux-s390-low.cc
View File

@ -63,6 +63,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;
@ -187,11 +193,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];
@ -233,12 +240,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];
@ -305,8 +312,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]);
}
}
@ -2838,8 +2845,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 */

2
gdbserver/linux-sh-low.cc
View File

@ -192,8 +192,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 */

1
gdbserver/linux-sparc-low.cc
View File

@ -341,7 +341,6 @@ sparc_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, NULL
};
/* The linux target ops object. */

2
gdbserver/linux-tic6x-low.cc
View File

@ -423,8 +423,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 */

2
gdbserver/linux-tile-low.cc
View File

@ -224,8 +224,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 */

9
gdbserver/linux-x86-low.cc
View File

@ -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. */
@ -2922,11 +2926,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,

2
gdbserver/linux-xtensa-low.cc
View File

@ -329,8 +329,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 */