* solib-svr4.c (LM_ADDR_CHECK): Relax prelink recognition heuristic.

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

diff --git a/gdb/shnbsd-nat.c b/gdb/shnbsd-nat.c
index 8139ed9caf60ef5585e4aafc65e8ffc48771c7c8..3236bb7b1cfbc1bbc0c98d3b2a2da3000cb6560c 100644 (file)
--- a/gdb/shnbsd-nat.c
+++ b/gdb/shnbsd-nat.c
@@ -31,16 +31,18 @@
 #include "sh-tdep.h"
 #include "shnbsd-tdep.h"
 #include "inf-ptrace.h"
+#include "regcache.h"
+
 
 /* Determine if PT_GETREGS fetches this register. */
 #define GETREGS_SUPPLIES(regno) \
   (((regno) >= R0_REGNUM && (regno) <= (R0_REGNUM + 15)) \
-|| (regno) == PC_REGNUM || (regno) == PR_REGNUM \
+|| (regno) == gdbarch_pc_regnum (current_gdbarch) || (regno) == PR_REGNUM \
 || (regno) == MACH_REGNUM || (regno) == MACL_REGNUM \
 || (regno) == SR_REGNUM)
 
 static void
-shnbsd_fetch_inferior_registers (int regno)
+shnbsd_fetch_inferior_registers (struct regcache *regcache, int regno)
 {
   if (regno == -1 || GETREGS_SUPPLIES (regno))
     {
@@ -50,7 +52,7 @@ shnbsd_fetch_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
-      shnbsd_supply_reg ((char *) &inferior_registers, regno);
+      shnbsd_supply_reg (regcache, (char *) &inferior_registers, regno);
 
       if (regno != -1)
        return;
@@ -58,7 +60,7 @@ shnbsd_fetch_inferior_registers (int regno)
 }
 
 static void
-shnbsd_store_inferior_registers (int regno)
+shnbsd_store_inferior_registers (struct regcache *regcache, int regno)
 {
   if (regno == -1 || GETREGS_SUPPLIES (regno))
     {
@@ -68,7 +70,7 @@ shnbsd_store_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
-      shnbsd_fill_reg ((char *) &inferior_registers, regno);
+      shnbsd_fill_reg (regcache, (char *) &inferior_registers, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)