FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix arm-netbsd build error: convert from FPA to VFP

Browse source 
The floating point register interface has changed to this:
https://github.com/NetBSD/src/blob/trunk/sys/arch/arm/include/reg.h

It now uses VFP instead of FPA registers. This patch updates
arm-nbsd-nat.c accordingly.

Also implements read_description so that these registers are correctly
printed by "info registers" et al.

Tested by compiling & running on arm-netbsd on qemu.

gdb/ChangeLog:

2020-03-02  Christian Biesinger  <cbiesinger@google.com>

	* arm-nbsd-nat.c (arm_supply_fparegset): Rename to...
	(arm_supply_vfpregset): ...this, and update to use VFP registers.
	(fetch_fp_register): Update.
	(fetch_fp_regs): Update.
	(store_fp_register): Update.
	(store_fp_regs): Update.
	(arm_netbsd_nat_target::read_description): New function.
	(fetch_elfcore_registers): Update.
This commit is contained in:
Christian Biesinger 2020-03-02 11:28:14 -06:00
parent 24ed6739b6
commit 81b86b9702
2 changed files with 79 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gdb/ChangeLog
View file

@ -1,3 +1,14 @@
2020-03-02 Christian Biesinger <cbiesinger@google.com>
* arm-nbsd-nat.c (arm_supply_fparegset): Rename to...
(arm_supply_vfpregset): ...this, and update to use VFP registers.
(fetch_fp_register): Update.
(fetch_fp_regs): Update.
(store_fp_register): Update.
(store_fp_regs): Update.
(arm_netbsd_nat_target::read_description): New function.
(fetch_elfcore_registers): Update.
2020-03-02 Andrew Burgess <andrew.burgess@embecosm.com> 2020-03-02 Andrew Burgess <andrew.burgess@embecosm.com>
* remote.c (remote_target::remote_parse_stop_reply): Don't use the * remote.c (remote_target::remote_parse_stop_reply): Don't use the

121
gdb/arm-nbsd-nat.c
View file

@ -26,10 +26,12 @@
#include "target.h" #include "target.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <sys/sysctl.h>
#include <machine/reg.h> #include <machine/reg.h>
#include <machine/frame.h> #include <machine/frame.h>
#include "arm-tdep.h" #include "arm-tdep.h"
#include "aarch32-tdep.h"
#include "inf-ptrace.h" #include "inf-ptrace.h"
class arm_netbsd_nat_target final : public inf_ptrace_target class arm_netbsd_nat_target final : public inf_ptrace_target
@ -38,6 +40,7 @@ public:
/* Add our register access methods. */ /* Add our register access methods. */
void fetch_registers (struct regcache *, int) override; void fetch_registers (struct regcache *, int) override;
void store_registers (struct regcache *, int) override; void store_registers (struct regcache *, int) override;
const struct target_desc *read_description () override;
}; };
static arm_netbsd_nat_target the_arm_netbsd_nat_target; static arm_netbsd_nat_target the_arm_netbsd_nat_target;
@ -65,15 +68,17 @@ arm_supply_gregset (struct regcache *regcache, struct reg *gregset)
} }
static void static void
arm_supply_fparegset (struct regcache *regcache, struct fpreg *fparegset) arm_supply_vfpregset (struct regcache *regcache, struct fpreg *fpregset)
{ {
int regno; struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
if (tdep->vfp_register_count == 0)
return;
for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++) struct vfpreg &vfp = fpregset->fpr_vfp;
regcache->raw_supply (regno, for (int regno = 0; regno <= tdep->vfp_register_count; regno++)
(char *) &fparegset->fpr[regno - ARM_F0_REGNUM]); regcache->raw_supply (regno + ARM_D0_REGNUM, (char *) &vfp.vfp_regs[regno]);
regcache->raw_supply (ARM_FPS_REGNUM, (char *) &fparegset->fpr_fpsr); regcache->raw_supply (ARM_FPSCR_REGNUM, (char *) &vfp.vfp_fpscr);
} }
static void static void
@ -147,10 +152,10 @@ static void
fetch_fp_register (struct regcache *regcache, int regno) fetch_fp_register (struct regcache *regcache, int regno)
{ {
struct fpreg inferior_fp_registers; struct fpreg inferior_fp_registers;
int ret; int ret = ptrace (PT_GETFPREGS, regcache->ptid ().pid (),
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
ret = ptrace (PT_GETFPREGS, regcache->ptid ().pid (), struct vfpreg &vfp = inferior_fp_registers.fpr_vfp;
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
if (ret < 0) if (ret < 0)
{ {
@ -158,18 +163,17 @@ fetch_fp_register (struct regcache *regcache, int regno)
return; return;
} }
switch (regno) struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
if (regno == ARM_FPSCR_REGNUM && tdep->vfp_register_count != 0)
regcache->raw_supply (ARM_FPSCR_REGNUM, (char *) &vfp.vfp_fpscr);
else if (regno >= ARM_D0_REGNUM
&& regno <= ARM_D0_REGNUM + tdep->vfp_register_count)
{ {
case ARM_FPS_REGNUM: regcache->raw_supply (regno,
regcache->raw_supply (ARM_FPS_REGNUM, (char *) &vfp.vfp_regs[regno - ARM_D0_REGNUM]);
(char *) &inferior_fp_registers.fpr_fpsr);
break;
default:
regcache->raw_supply
(regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
break;
} }
else
warning (_("Invalid register number."));
} }
static void static void
@ -188,7 +192,7 @@ fetch_fp_regs (struct regcache *regcache)
return; return;
} }
arm_supply_fparegset (regcache, &inferior_fp_registers); arm_supply_vfpregset (regcache, &inferior_fp_registers);
} }
void void
@ -327,10 +331,9 @@ static void
store_fp_register (const struct regcache *regcache, int regno) store_fp_register (const struct regcache *regcache, int regno)
{ {
struct fpreg inferior_fp_registers; struct fpreg inferior_fp_registers;
int ret; int ret = ptrace (PT_GETFPREGS, regcache->ptid ().pid (),
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
ret = ptrace (PT_GETFPREGS, regcache->ptid ().pid (), struct vfpreg &vfp = inferior_fp_registers.fpr_vfp;
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
if (ret < 0) if (ret < 0)
{ {
@ -338,18 +341,17 @@ store_fp_register (const struct regcache *regcache, int regno)
return; return;
} }
switch (regno) struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
if (regno == ARM_FPSCR_REGNUM && tdep->vfp_register_count != 0)
regcache->raw_collect (ARM_FPSCR_REGNUM, (char *) &vfp.vfp_fpscr);
else if (regno >= ARM_D0_REGNUM
&& regno <= ARM_D0_REGNUM + tdep->vfp_register_count)
{ {
case ARM_FPS_REGNUM: regcache->raw_collect (regno,
regcache->raw_collect (ARM_FPS_REGNUM, (char *) &vfp.vfp_regs[regno - ARM_D0_REGNUM]);
(char *) &inferior_fp_registers.fpr_fpsr);
break;
default:
regcache->raw_collect
(regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
break;
} }
else
warning (_("Invalid register number."));
ret = ptrace (PT_SETFPREGS, regcache->ptid ().pid (), ret = ptrace (PT_SETFPREGS, regcache->ptid ().pid (),
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
@ -361,20 +363,20 @@ store_fp_register (const struct regcache *regcache, int regno)
static void static void
store_fp_regs (const struct regcache *regcache) store_fp_regs (const struct regcache *regcache)
{ {
struct fpreg inferior_fp_registers; struct gdbarch_tdep *tdep = gdbarch_tdep (regcache->arch ());
int ret; if (tdep->vfp_register_count == 0)
int regno; return;
struct fpreg fpregs;
for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++) for (int regno = 0; regno <= tdep->vfp_register_count; regno++)
regcache->raw_collect regcache->raw_collect
(regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]); (regno + ARM_D0_REGNUM, (char *) &fpregs.fpr_vfp.vfp_regs[regno]);
regcache->raw_collect (ARM_FPS_REGNUM, regcache->raw_collect (ARM_FPSCR_REGNUM,
(char *) &inferior_fp_registers.fpr_fpsr); (char *) &fpregs.fpr_vfp.vfp_fpscr);
ret = ptrace (PT_SETFPREGS, regcache->ptid ().pid (), int ret = ptrace (PT_SETFPREGS, regcache->ptid ().pid (),
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); (PTRACE_TYPE_ARG3) &fpregs, 0);
if (ret < 0) if (ret < 0)
warning (_("unable to store floating-point registers")); warning (_("unable to store floating-point registers"));
@ -397,6 +399,23 @@ arm_netbsd_nat_target::store_registers (struct regcache *regcache, int regno)
} }
} }
const struct target_desc *
arm_netbsd_nat_target::read_description ()
{
int flag;
size_t len = sizeof (flag);
if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) != 0
|| !flag)
return arm_read_description (ARM_FP_TYPE_NONE);
len = sizeof(flag);
if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0 && flag)
return aarch32_read_description ();
return arm_read_description (ARM_FP_TYPE_VFPV3);
}
static void static void
fetch_elfcore_registers (struct regcache *regcache, fetch_elfcore_registers (struct regcache *regcache,
gdb_byte *core_reg_sect, unsigned core_reg_size, gdb_byte *core_reg_sect, unsigned core_reg_size,
@ -420,15 +439,11 @@ fetch_elfcore_registers (struct regcache *regcache,
break; break;
case 2: case 2:
if (core_reg_size != sizeof (struct fpreg)) /* cbiesinger/2020-02-12 -- as far as I can tell, ARM/NetBSD does
warning (_("wrong size of FPA register set in core file")); not write any floating point registers into the core file (tested
else with NetBSD 9.1_RC1). When it does, this block will need to read them,
{ and the arm-netbsd gdbarch will need a core_read_description function
/* The memcpy may be unnecessary, but we can't really be sure to return the right description for them. */
of the alignment of the data in the core file. */
memcpy (&fparegset, core_reg_sect, sizeof (fparegset));
arm_supply_fparegset (regcache, &fparegset);
}
break; break;
default: default: