Remove last traces of discard_all_inferiors

[deliverable/binutils-gdb.git] / gdb / aarch64-fbsd-nat.c

diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c
index cb4130a2844588d29983636fba26765a6ce2b97a..51fd8580027453febd18d1a45538c40decca748f 100644 (file)
--- a/gdb/aarch64-fbsd-nat.c
+++ b/gdb/aarch64-fbsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for FreeBSD/aarch64.
 
-   Copyright (C) 2017-2019 Free Software Foundation, Inc.
+   Copyright (C) 2017-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,18 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "regcache.h"
+#include "target.h"
 
-/* Standard C includes.  */
-#include <machine/reg.h>
-#include <sys/ptrace.h>
 #include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
 
-/* Local non-gdb includes.  */
-#include "aarch64-fbsd-tdep.h"
-#include "aarch64-tdep.h"
 #include "fbsd-nat.h"
+#include "aarch64-tdep.h"
+#include "aarch64-fbsd-tdep.h"
 #include "inf-ptrace.h"
-#include "target.h"
 
 struct aarch64_fbsd_nat_target final : public fbsd_nat_target
 {
@@ -42,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);
 }
@@ -50,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);
 }
@@ -64,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;
 
@@ -76,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;
 
@@ -97,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;
 
@@ -112,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;