* go32-nat.c (fetch_register): Use FP_REGNUM_P and FPC_REGNUM_P

macros instead of LAST_FPU_CTRL_REGNUM.
(store_register): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ae67a79..1f28917 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-20  Mark Kettenis  <kettenis@gnu.org>
+
+       * go32-nat.c (fetch_register): Use FP_REGNUM_P and FPC_REGNUM_P
+       macros instead of LAST_FPU_CTRL_REGNUM.
+       (store_register): Likewise.
+
 2002-01-21  Jim Blandy  <jimb@redhat.com>
 
        * infcmd.c (run_command): Check that the `exec' target layer's BFD

diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index ae8205e..307956b 100644 (file)
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -466,7 +466,7 @@ fetch_register (int regno)
 {
   if (regno < FP0_REGNUM)
     supply_register (regno, (char *) &a_tss + regno_mapping[regno].tss_ofs);
-  else if (regno <= LAST_FPU_CTRL_REGNUM)
+  else if (FP_REGNUM_P (regno) || FPC_REGNUM_P (regno))
     i387_supply_register (regno, (char *) &npx);
   else
     internal_error (__FILE__, __LINE__,
@@ -491,8 +491,8 @@ store_register (int regno)
 {
   if (regno < FP0_REGNUM)
     regcache_collect (regno, (void *) &a_tss + regno_mapping[regno].tss_ofs);
-  else if (regno <= LAST_FPU_CTRL_REGNUM)
-    i387_fill_fsave ((char *)&npx, regno);
+  else if (FP_REGNUM_P (regno) || FPC_REGNUM_P (regno))
+    i387_fill_fsave ((char *) &npx, regno);
   else
     internal_error (__FILE__, __LINE__,
                    "Invalid register no. %d in store_register.", regno);