diff options
author | John Baldwin <jhb@FreeBSD.org> | 2019-07-15 17:21:36 -0700 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2019-07-15 17:21:36 -0700 |
commit | 206e6c58a769f9ec63827b8ca3952b0cd8c828ba (patch) | |
tree | a100f807ade8ea17e7c9a0a9cf1d4a881bb58ef6 | |
parent | cbde90f25ec66b359c90514a50bbf25d122bb7e3 (diff) | |
download | gdb-206e6c58a769f9ec63827b8ca3952b0cd8c828ba.zip gdb-206e6c58a769f9ec63827b8ca3952b0cd8c828ba.tar.gz gdb-206e6c58a769f9ec63827b8ca3952b0cd8c828ba.tar.bz2 |
Fix build for aarch64, arm, and riscv FreeBSD native targets.
Remove unused gdbarch argument to helper functions originally
copied from mips-fbsd-nat.c. Include regcache.h previously
included from defs.h via gdbarch.h.
gdb/ChangeLog:
* aarch64-fbsd-nat.c: Include regcache.h.
(getregs_supplies, getfpregs_supplies): Remove unused gdbarch
argument.
(aarch64_fbsd_nat_target::fetch_registers)
(aarch64_fbsd_nat_target::store_registers): Remove gdbarch
variable.
* arm-fbsd-nat.c, riscv-fbsd-nat.c: Likewise.
-rw-r--r-- | gdb/ChangeLog | 10 | ||||
-rw-r--r-- | gdb/aarch64-fbsd-nat.c | 15 | ||||
-rw-r--r-- | gdb/arm-fbsd-nat.c | 14 | ||||
-rw-r--r-- | gdb/riscv-fbsd-nat.c | 15 |
4 files changed, 30 insertions, 24 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5e086ca..a46a1f5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2019-07-16 John Baldwin <jhb@FreeBSD.org> + * aarch64-fbsd-nat.c: Include regcache.h. + (getregs_supplies, getfpregs_supplies): Remove unused gdbarch + argument. + (aarch64_fbsd_nat_target::fetch_registers) + (aarch64_fbsd_nat_target::store_registers): Remove gdbarch + variable. + * arm-fbsd-nat.c, riscv-fbsd-nat.c: Likewise. + +2019-07-16 John Baldwin <jhb@FreeBSD.org> + * fbsd-nat.c: Include gdbarch.h. 2019-07-15 Tom Tromey <tromey@adacore.com> diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c index bb187a6..3c3931f 100644 --- a/gdb/aarch64-fbsd-nat.c +++ b/gdb/aarch64-fbsd-nat.c @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "regcache.h" #include "target.h" #include <sys/types.h> @@ -40,7 +41,7 @@ static aarch64_fbsd_nat_target the_aarch64_fbsd_nat_target; /* Determine if PT_GETREGS fetches REGNUM. */ static bool -getregs_supplies (struct gdbarch *gdbarch, int regnum) +getregs_supplies (int regnum) { return (regnum >= AARCH64_X0_REGNUM && regnum <= AARCH64_CPSR_REGNUM); } @@ -48,7 +49,7 @@ getregs_supplies (struct gdbarch *gdbarch, int regnum) /* Determine if PT_GETFPREGS fetches REGNUM. */ static bool -getfpregs_supplies (struct gdbarch *gdbarch, int regnum) +getfpregs_supplies (int regnum) { return (regnum >= AARCH64_V0_REGNUM && regnum <= AARCH64_FPCR_REGNUM); } @@ -62,8 +63,7 @@ aarch64_fbsd_nat_target::fetch_registers (struct regcache *regcache, { pid_t pid = get_ptrace_pid (regcache->ptid ()); - struct gdbarch *gdbarch = regcache->arch (); - if (regnum == -1 || getregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; @@ -74,7 +74,7 @@ aarch64_fbsd_nat_target::fetch_registers (struct regcache *regcache, sizeof (regs)); } - if (regnum == -1 || getfpregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getfpregs_supplies (regnum)) { struct fpreg fpregs; @@ -95,8 +95,7 @@ aarch64_fbsd_nat_target::store_registers (struct regcache *regcache, { pid_t pid = get_ptrace_pid (regcache->ptid ()); - struct gdbarch *gdbarch = regcache->arch (); - if (regnum == -1 || getregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; @@ -110,7 +109,7 @@ aarch64_fbsd_nat_target::store_registers (struct regcache *regcache, perror_with_name (_("Couldn't write registers")); } - if (regnum == -1 || getfpregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getfpregs_supplies (regnum)) { struct fpreg fpregs; diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c index f85ecc1..e6c7d3c 100644 --- a/gdb/arm-fbsd-nat.c +++ b/gdb/arm-fbsd-nat.c @@ -41,7 +41,7 @@ static arm_fbsd_nat_target the_arm_fbsd_nat_target; /* Determine if PT_GETREGS fetches REGNUM. */ static bool -getregs_supplies (struct gdbarch *gdbarch, int regnum) +getregs_supplies (int regnum) { return ((regnum >= ARM_A1_REGNUM && regnum <= ARM_PC_REGNUM) || regnum == ARM_PS_REGNUM); @@ -51,7 +51,7 @@ getregs_supplies (struct gdbarch *gdbarch, int regnum) /* Determine if PT_GETVFPREGS fetches REGNUM. */ static bool -getvfpregs_supplies (struct gdbarch *gdbarch, int regnum) +getvfpregs_supplies (int regnum) { return ((regnum >= ARM_D0_REGNUM && regnum <= ARM_D31_REGNUM) || regnum == ARM_FPSCR_REGNUM); @@ -66,8 +66,7 @@ arm_fbsd_nat_target::fetch_registers (struct regcache *regcache, int regnum) { pid_t pid = get_ptrace_pid (regcache->ptid ()); - struct gdbarch *gdbarch = regcache->arch (); - if (regnum == -1 || getregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; @@ -79,7 +78,7 @@ arm_fbsd_nat_target::fetch_registers (struct regcache *regcache, int regnum) } #ifdef PT_GETVFPREGS - if (regnum == -1 || getvfpregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getvfpregs_supplies (regnum)) { struct vfpreg vfpregs; @@ -100,8 +99,7 @@ arm_fbsd_nat_target::store_registers (struct regcache *regcache, int regnum) { pid_t pid = get_ptrace_pid (regcache->ptid ()); - struct gdbarch *gdbarch = regcache->arch (); - if (regnum == -1 || getregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; @@ -116,7 +114,7 @@ arm_fbsd_nat_target::store_registers (struct regcache *regcache, int regnum) } #ifdef PT_GETVFPREGS - if (regnum == -1 || getvfpregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getvfpregs_supplies (regnum)) { struct vfpreg vfpregs; diff --git a/gdb/riscv-fbsd-nat.c b/gdb/riscv-fbsd-nat.c index f485084..24381e0 100644 --- a/gdb/riscv-fbsd-nat.c +++ b/gdb/riscv-fbsd-nat.c @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "regcache.h" #include "target.h" #include <sys/types.h> @@ -40,7 +41,7 @@ static riscv_fbsd_nat_target the_riscv_fbsd_nat_target; /* Determine if PT_GETREGS fetches REGNUM. */ static bool -getregs_supplies (struct gdbarch *gdbarch, int regnum) +getregs_supplies (int regnum) { return ((regnum >= RISCV_RA_REGNUM && regnum <= RISCV_PC_REGNUM) || regnum == RISCV_CSR_SSTATUS_REGNUM); @@ -49,7 +50,7 @@ getregs_supplies (struct gdbarch *gdbarch, int regnum) /* Determine if PT_GETFPREGS fetches REGNUM. */ static bool -getfpregs_supplies (struct gdbarch *gdbarch, int regnum) +getfpregs_supplies (int regnum) { return ((regnum >= RISCV_FIRST_FP_REGNUM && regnum <= RISCV_LAST_FP_REGNUM) || regnum == RISCV_CSR_FCSR_REGNUM); @@ -64,10 +65,9 @@ riscv_fbsd_nat_target::fetch_registers (struct regcache *regcache, { pid_t pid = get_ptrace_pid (regcache->ptid ()); - struct gdbarch *gdbarch = regcache->arch (); if (regnum == -1 || regnum == RISCV_ZERO_REGNUM) regcache->raw_supply_zeroed (RISCV_ZERO_REGNUM); - if (regnum == -1 || getregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; @@ -78,7 +78,7 @@ riscv_fbsd_nat_target::fetch_registers (struct regcache *regcache, sizeof (regs)); } - if (regnum == -1 || getfpregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getfpregs_supplies (regnum)) { struct fpreg fpregs; @@ -99,8 +99,7 @@ riscv_fbsd_nat_target::store_registers (struct regcache *regcache, { pid_t pid = get_ptrace_pid (regcache->ptid ()); - struct gdbarch *gdbarch = regcache->arch (); - if (regnum == -1 || getregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; @@ -114,7 +113,7 @@ riscv_fbsd_nat_target::store_registers (struct regcache *regcache, perror_with_name (_("Couldn't write registers")); } - if (regnum == -1 || getfpregs_supplies (gdbarch, regnum)) + if (regnum == -1 || getfpregs_supplies (regnum)) { struct fpreg fpregs; |