Fix regset numbering.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f665a15..f848cfd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-20  Kris Warkentin  <kewarken@qnx.com>
+
+       * nto-tdep.c (fetch_core_registers): Match gdb's idea of
+       regset numbering rather than our own.
+
 2003-05-19  David Carlton  <carlton@bactrian.org>
 
        * config/djgpp/fnchange.lst: Add testsuite/gdb.c++/rtti*.

diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 834daff..94f156e 100644 (file)
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -269,25 +269,20 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
                      int which, CORE_ADDR reg_addr)
 {
   nto_regset_t regset;
-
-  if (which == NTO_REG_GENERAL)
+  
+/* See corelow.c:get_core_registers for values of WHICH.  */
+  if (which == 0)
     {
       memcpy ((char *) &regset, core_reg_sect,
              min (core_reg_size, sizeof (regset)));
       nto_supply_gregset ((char *) &regset);
     }
-  else if (which == NTO_REG_FLOAT)
+  else if (which == 2)
     {
       memcpy ((char *) &regset, core_reg_sect,
              min (core_reg_size, sizeof (regset)));
       nto_supply_fpregset ((char *) &regset);
     }
-  else if (which == NTO_REG_ALT)
-    {
-      memcpy ((char *) &regset, core_reg_sect,
-             min (core_reg_size, sizeof (regset)));
-      nto_supply_altregset ((char *) &regset);
-    }
 }
 
 void