* infrun.c (adjust_pc_after_break): Do not assume software single-step

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

diff --git a/gdb/ppcnbsd-nat.c b/gdb/ppcnbsd-nat.c
index a200505cef86975fac73a02532d58890db54f491..bbf13cc39a92d5b0cd4456afd2ce392f3dadbb3b 100644 (file)
--- a/gdb/ppcnbsd-nat.c
+++ b/gdb/ppcnbsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for NetBSD/powerpc.
 
-   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    Contributed by Wasabi Systems, Inc.
 
@@ -52,7 +52,7 @@ getregs_supplies (int regnum)
           || regnum == tdep->ppc_cr_regnum
           || regnum == tdep->ppc_xer_regnum
           || regnum == tdep->ppc_ctr_regnum
-         || regnum == PC_REGNUM);
+         || regnum == gdbarch_pc_regnum (current_gdbarch));
 }
 
 /* Like above, but for PT_GETFPREGS.  */
@@ -80,7 +80,7 @@ getfpregs_supplies (int regnum)
 }
 
 static void
-ppcnbsd_fetch_inferior_registers (int regnum)
+ppcnbsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
 {
   if (regnum == -1 || getregs_supplies (regnum))
     {
@@ -90,7 +90,7 @@ ppcnbsd_fetch_inferior_registers (int regnum)
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't get registers"));
 
-      ppc_supply_gregset (&ppcnbsd_gregset, current_regcache,
+      ppc_supply_gregset (&ppcnbsd_gregset, regcache,
                          regnum, &regs, sizeof regs);
     }
 
@@ -102,13 +102,13 @@ ppcnbsd_fetch_inferior_registers (int regnum)
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get FP registers"));
 
-      ppc_supply_fpregset (&ppcnbsd_fpregset, current_regcache,
+      ppc_supply_fpregset (&ppcnbsd_fpregset, regcache,
                           regnum, &fpregs, sizeof fpregs);
     }
 }
 
 static void
-ppcnbsd_store_inferior_registers (int regnum)
+ppcnbsd_store_inferior_registers (struct regcache *regcache, int regnum)
 {
   if (regnum == -1 || getregs_supplies (regnum))
     {
@@ -118,7 +118,7 @@ ppcnbsd_store_inferior_registers (int regnum)
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
-      ppc_collect_gregset (&ppcnbsd_gregset, current_regcache,
+      ppc_collect_gregset (&ppcnbsd_gregset, regcache,
                           regnum, &regs, sizeof regs);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
@@ -134,7 +134,7 @@ ppcnbsd_store_inferior_registers (int regnum)
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get FP registers"));
 
-      ppc_collect_fpregset (&ppcnbsd_fpregset, current_regcache,
+      ppc_collect_fpregset (&ppcnbsd_fpregset, regcache,
                            regnum, &fpregs, sizeof fpregs);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
@@ -169,7 +169,7 @@ ppcnbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
 
   read_memory(cf.sp, (gdb_byte *)&cf, sizeof(cf));
   regcache_raw_supply (regcache, tdep->ppc_lr_regnum, &cf.lr);
-  regcache_raw_supply (regcache, PC_REGNUM, &cf.lr);
+  regcache_raw_supply (regcache, gdbarch_pc_regnum (current_gdbarch), &cf.lr);
 
   return 1;
 }