riscv-fbsd-nat: Use fetch_register_set and store_register_set.

This commit is contained in:
John Baldwin
2021-07-13 08:16:12 -07:00
parent 5a680bf9f2
commit e747f4dd8d

View File

@ -38,24 +38,6 @@ struct riscv_fbsd_nat_target final : public fbsd_nat_target
static riscv_fbsd_nat_target the_riscv_fbsd_nat_target;
/* Determine if PT_GETREGS fetches REGNUM. */
static bool
getregs_supplies (int regnum)
{
return ((regnum >= RISCV_RA_REGNUM && regnum <= RISCV_PC_REGNUM)
|| regnum == RISCV_CSR_SSTATUS_REGNUM);
}
/* Determine if PT_GETFPREGS fetches REGNUM. */
static bool
getfpregs_supplies (int regnum)
{
return ((regnum >= RISCV_FIRST_FP_REGNUM && regnum <= RISCV_LAST_FP_REGNUM)
|| regnum == RISCV_CSR_FCSR_REGNUM);
}
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers. */
@ -63,31 +45,12 @@ void
riscv_fbsd_nat_target::fetch_registers (struct regcache *regcache,
int regnum)
{
pid_t pid = get_ptrace_pid (regcache->ptid ());
if (regnum == -1 || regnum == RISCV_ZERO_REGNUM)
regcache->raw_supply_zeroed (RISCV_ZERO_REGNUM);
if (regnum == -1 || getregs_supplies (regnum))
{
struct reg regs;
if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't get registers"));
regcache->supply_regset (&riscv_fbsd_gregset, regnum, &regs,
sizeof (regs));
}
if (regnum == -1 || getfpregs_supplies (regnum))
{
struct fpreg fpregs;
if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't get floating point status"));
regcache->supply_regset (&riscv_fbsd_fpregset, regnum, &fpregs,
sizeof (fpregs));
}
fetch_register_set<struct reg> (regcache, regnum, PT_GETREGS,
&riscv_fbsd_gregset);
fetch_register_set<struct fpreg> (regcache, regnum, PT_GETFPREGS,
&riscv_fbsd_fpregset);
}
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
@ -97,35 +60,10 @@ void
riscv_fbsd_nat_target::store_registers (struct regcache *regcache,
int regnum)
{
pid_t pid = get_ptrace_pid (regcache->ptid ());
if (regnum == -1 || getregs_supplies (regnum))
{
struct reg regs;
if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't get registers"));
regcache->collect_regset (&riscv_fbsd_gregset, regnum, &regs,
sizeof (regs));
if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't write registers"));
}
if (regnum == -1 || getfpregs_supplies (regnum))
{
struct fpreg fpregs;
if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't get floating point status"));
regcache->collect_regset (&riscv_fbsd_fpregset, regnum, &fpregs,
sizeof (fpregs));
if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't write floating point status"));
}
store_register_set<struct reg> (regcache, regnum, PT_GETREGS, PT_SETREGS,
&riscv_fbsd_gregset);
store_register_set<struct fpreg> (regcache, regnum, PT_GETFPREGS,
PT_SETFPREGS, &riscv_fbsd_fpregset);
}
void _initialize_riscv_fbsd_nat ();