2007-08-17 Michael Snyder <msnyder@access-company.com>

[deliverable/binutils-gdb.git] / gdb / mipsnbsd-nat.c

diff --git a/gdb/mipsnbsd-nat.c b/gdb/mipsnbsd-nat.c
index 2bea684fbb951fea170af06d9de20ffc9aae787a..44ccb3c7da42c2c9cb0309bb39cf6dd4535d095a 100644 (file)
--- a/gdb/mipsnbsd-nat.c
+++ b/gdb/mipsnbsd-nat.c
@@ -36,11 +36,12 @@
 static int
 getregs_supplies (int regno)
 {
-  return ((regno) >= MIPS_ZERO_REGNUM && (regno) <= PC_REGNUM);
+  return ((regno) >= MIPS_ZERO_REGNUM
+         && (regno) <= gdbarch_pc_regnum (current_gdbarch));
 }
 
 static void
-mipsnbsd_fetch_inferior_registers (int regno)
+mipsnbsd_fetch_inferior_registers (struct regcache *regcache, int regno)
 {
   if (regno == -1 || getregs_supplies (regno))
     {
@@ -50,12 +51,12 @@ mipsnbsd_fetch_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
       
-      mipsnbsd_supply_reg (current_regcache, (char *) &regs, regno);
+      mipsnbsd_supply_reg (regcache, (char *) &regs, regno);
       if (regno != -1)
        return;
     }
 
-  if (regno == -1 || regno >= FP0_REGNUM)
+  if (regno == -1 || regno >= gdbarch_fp0_regnum (current_gdbarch))
     {
       struct fpreg fpregs;
 
@@ -63,12 +64,12 @@ mipsnbsd_fetch_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
-      mipsnbsd_supply_fpreg (current_regcache, (char *) &fpregs, regno);
+      mipsnbsd_supply_fpreg (regcache, (char *) &fpregs, regno);
     }
 }
 
 static void
-mipsnbsd_store_inferior_registers (int regno)
+mipsnbsd_store_inferior_registers (struct regcache *regcache, int regno)
 {
   if (regno == -1 || getregs_supplies (regno))
     {
@@ -78,7 +79,7 @@ mipsnbsd_store_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
-      mipsnbsd_fill_reg (current_regcache, (char *) &regs, regno);
+      mipsnbsd_fill_reg (regcache, (char *) &regs, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), 
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
@@ -88,7 +89,7 @@ mipsnbsd_store_inferior_registers (int regno)
        return;
     }
 
-  if (regno == -1 || regno >= FP0_REGNUM)
+  if (regno == -1 || regno >= gdbarch_fp0_regnum (current_gdbarch))
     {
       struct fpreg fpregs; 
 
@@ -96,7 +97,7 @@ mipsnbsd_store_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
-      mipsnbsd_fill_fpreg (current_regcache, (char *) &fpregs, regno);
+      mipsnbsd_fill_fpreg (regcache, (char *) &fpregs, regno);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)