*** empty log message ***

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

diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 5fbf33435085a454b1308ddc501e7c9e2863bbe4..dd52cf178cf01411ed6c4d904d211cdcb7c56d09 100644 (file)
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -28,7 +28,7 @@
 #include "xcoffsolib.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "libbfd.h"            /* For bfd_cache_lookup (FIXME) */
+#include "libbfd.h"            /* For bfd_default_set_arch_mach (FIXME) */
 #include "bfd.h"
 #include "gdb-stabs.h"
 #include "regcache.h"
@@ -586,11 +586,12 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
 
   if (ARCH64 ())
     {
-      for (regi = 0; regi < 32; regi++)
-        supply_register (regi, (char *) &regs->r64.gpr[regi]);
+      for (regi = 0; regi < ppc_num_gprs; regi++)
+        supply_register (tdep->ppc_gp0_regnum + regi,
+                         (char *) &regs->r64.gpr[regi]);
 
       if (tdep->ppc_fp0_regnum >= 0)
-        for (regi = 0; regi < 32; regi++)
+        for (regi = 0; regi < ppc_num_fprs; regi++)
           supply_register (tdep->ppc_fp0_regnum + regi,
                            (char *) &regs->r64.fpr[regi]);
 
@@ -605,11 +606,12 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
     }
   else
     {
-      for (regi = 0; regi < 32; regi++)
-        supply_register (regi, (char *) &regs->r32.gpr[regi]);
+      for (regi = 0; regi < ppc_num_gprs; regi++)
+        supply_register (tdep->ppc_gp0_regnum + regi,
+                         (char *) &regs->r32.gpr[regi]);
 
       if (tdep->ppc_fp0_regnum >= 0)
-        for (regi = 0; regi < 32; regi++)
+        for (regi = 0; regi < ppc_num_fprs; regi++)
           supply_register (tdep->ppc_fp0_regnum + regi,
                            (char *) &regs->r32.fpr[regi]);