* i386gnu-nat.c (gnu_store_registers): Use regcache_raw_collect

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

diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index 3fa99a34d884facf47f02e08cd6bf2bed8599d6c..375f0eb9c23bcf4e7e7d086215ec47c31e47bbc6 100644 (file)
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -1,5 +1,6 @@
 /* Low level interface to i386 running the GNU Hurd.
-   Copyright 1992, 1995, 1996, 1998, 2000, 2001
+
+   Copyright 1992, 1995, 1996, 1998, 2000, 2001, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -83,13 +84,13 @@ fetch_fpregs (struct proc *thread)
       int i;
 
       for (i = FP0_REGNUM; i <= FOP_REGNUM; i++)
-       supply_register (i, NULL);
+       regcache_raw_supply (current_regcache, i, NULL);
 
       return;
     }
 
   /* Supply the floating-point registers.  */
-  i387_supply_fsave (state.hw_state);
+  i387_supply_fsave (current_regcache, -1, state.hw_state);
 }
 
 #ifdef HAVE_SYS_PROCFS_H
@@ -100,13 +101,13 @@ supply_gregset (gdb_gregset_t *gregs)
 {
   int i;
   for (i = 0; i < I386_NUM_GREGS; i++)
-    supply_register (i, REG_ADDR (gregs, i));
+    regcache_raw_supply (current_regcache, i, REG_ADDR (gregs, i));
 }
 
 void
 supply_fpregset (gdb_fpregset_t *fpregs)
 {
-  i387_supply_fsave ((char *) fpregs);
+  i387_supply_fsave (current_regcache, -1, fpregs);
 }
 #endif
 
@@ -144,14 +145,15 @@ gnu_fetch_registers (int regno)
          proc_debug (thread, "fetching all register");
 
          for (i = 0; i < I386_NUM_GREGS; i++)
-           supply_register (i, REG_ADDR (state, i));
+           regcache_raw_supply (current_regcache, i, REG_ADDR (state, i));
          thread->fetched_regs = ~0;
        }
       else
        {
          proc_debug (thread, "fetching register %s", REGISTER_NAME (regno));
 
-         supply_register (regno, REG_ADDR (state, regno));
+         regcache_raw_supply (current_regcache, regno,
+                              REG_ADDR (state, regno));
          thread->fetched_regs |= (1 << regno);
        }
     }
@@ -184,7 +186,7 @@ store_fpregs (struct proc *thread, int regno)
     }
 
   /* FIXME: kettenis/2001-07-15: Is this right?  Should we somehow
-     take into account REGISTER_VALID like the old code did?  */
+     take into account DEPRECATED_REGISTER_VALID like the old code did?  */
   i387_fill_fsave (state.hw_state, regno);
 
   err = thread_set_state (thread->port, i386_FLOAT_STATE,
@@ -201,6 +203,7 @@ store_fpregs (struct proc *thread, int regno)
 void
 gnu_store_registers (int regno)
 {
+  struct regcache *regcache = current_regcache;
   struct proc *thread;
 
   /* Make sure we know about new threads.  */
@@ -242,23 +245,20 @@ gnu_store_registers (int regno)
            if ((thread->fetched_regs & (1 << check_regno))
                && memcpy (REG_ADDR (&old_state, check_regno),
                           REG_ADDR (state, check_regno),
-                          REGISTER_RAW_SIZE (check_regno)))
+                          register_size (current_gdbarch, check_regno)))
              /* Register CHECK_REGNO has changed!  Ack!  */
              {
                warning ("Register %s changed after the thread was aborted",
                         REGISTER_NAME (check_regno));
                if (regno >= 0 && regno != check_regno)
                  /* Update GDB's copy of the register.  */
-                 supply_register (check_regno, REG_ADDR (state, check_regno));
+                 regcache_raw_supply (regcache, check_regno,
+                                      REG_ADDR (state, check_regno));
                else
                  warning ("... also writing this register!  Suspicious...");
              }
        }
 
-#define fill(state, regno)                                               \
-  memcpy (REG_ADDR(state, regno), &registers[REGISTER_BYTE (regno)],     \
-          REGISTER_RAW_SIZE (regno))
-
       if (regno == -1)
        {
          int i;
@@ -266,15 +266,15 @@ gnu_store_registers (int regno)
          proc_debug (thread, "storing all registers");
 
          for (i = 0; i < I386_NUM_GREGS; i++)
-           if (register_valid[i])
-             fill (state, i);
+           if (regcache_valid_p (regcache, i))
+             regcache_raw_collect (regcache, i, REG_ADDR (state, i));
        }
       else
        {
          proc_debug (thread, "storing register %s", REGISTER_NAME (regno));
 
-         gdb_assert (register_valid[regno]);
-         fill (state, regno);
+         gdb_assert (regcache_valid_p (regcache, regno));
+         regcache_craw_collect (regcache, regno, REG_ADDR (state, regno));
        }
 
       /* Restore the T bit.  */
@@ -282,8 +282,6 @@ gnu_store_registers (int regno)
       ((struct i386_thread_state *)state)->efl |= trace;
     }
 
-#undef fill
-
   if (regno >= I386_NUM_GREGS || regno == -1)
     {
       proc_debug (thread, "storing floating-point registers");