* alpha-tdep.c (alpha_gdbarch_init): Use set_gdbarch_print_insn ...

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

diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index e82fe0d9786fea221fbbe458187493dfb6963d79..4623e116cfc8bcdadce51e537c5ada3ce4e843c6 100644 (file)
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -36,7 +36,7 @@
 #include "i386-tdep.h"
 
 #include "gnu-nat.h"
-#include "i387-nat.h"
+#include "i387-tdep.h"
 
 #ifdef HAVE_SYS_PROCFS_H
 # include <sys/procfs.h>
@@ -99,7 +99,7 @@ void
 supply_gregset (gdb_gregset_t *gregs)
 {
   int i;
-  for (i = 0; i < NUM_GREGS; i++)
+  for (i = 0; i < I386_NUM_GREGS; i++)
     supply_register (i, REG_ADDR (gregs, i));
 }
 
@@ -124,7 +124,7 @@ gnu_fetch_registers (int regno)
     error ("Can't fetch registers from thread %d: No such thread",
           PIDGET (inferior_ptid));
 
-  if (regno < NUM_GREGS || regno == -1)
+  if (regno < I386_NUM_GREGS || regno == -1)
     {
       thread_state_t state;
 
@@ -143,7 +143,7 @@ gnu_fetch_registers (int regno)
 
          proc_debug (thread, "fetching all register");
 
-         for (i = 0; i < NUM_GREGS; i++)
+         for (i = 0; i < I386_NUM_GREGS; i++)
            supply_register (i, REG_ADDR (state, i));
          thread->fetched_regs = ~0;
        }
@@ -156,7 +156,7 @@ gnu_fetch_registers (int regno)
        }
     }
 
-  if (regno >= NUM_GREGS || regno == -1)
+  if (regno >= I386_NUM_GREGS || regno == -1)
     {
       proc_debug (thread, "fetching floating-point registers");
 
@@ -184,7 +184,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,
@@ -211,7 +211,7 @@ gnu_store_registers (int regno)
     error ("Couldn't store registers into thread %d: No such thread",
           PIDGET (inferior_ptid));
 
-  if (regno < NUM_GREGS || regno == -1)
+  if (regno < I386_NUM_GREGS || regno == -1)
     {
       thread_state_t state;
       thread_state_data_t old_state;
@@ -238,7 +238,7 @@ gnu_store_registers (int regno)
        {
          int check_regno;
 
-         for (check_regno = 0; check_regno < NUM_GREGS; check_regno++)
+         for (check_regno = 0; check_regno < I386_NUM_GREGS; check_regno++)
            if ((thread->fetched_regs & (1 << check_regno))
                && memcpy (REG_ADDR (&old_state, check_regno),
                           REG_ADDR (state, check_regno),
@@ -256,7 +256,7 @@ gnu_store_registers (int regno)
        }
 
 #define fill(state, regno)                                               \
-  memcpy (REG_ADDR(state, regno), &registers[REGISTER_BYTE (regno)],     \
+  memcpy (REG_ADDR(state, regno), &deprecated_registers[REGISTER_BYTE (regno)],     \
           REGISTER_RAW_SIZE (regno))
 
       if (regno == -1)
@@ -265,15 +265,15 @@ gnu_store_registers (int regno)
 
          proc_debug (thread, "storing all registers");
 
-         for (i = 0; i < NUM_GREGS; i++)
-           if (register_valid[i])
+         for (i = 0; i < I386_NUM_GREGS; i++)
+           if (deprecated_register_valid[i])
              fill (state, i);
        }
       else
        {
          proc_debug (thread, "storing register %s", REGISTER_NAME (regno));
 
-         gdb_assert (register_valid[regno]);
+         gdb_assert (deprecated_register_valid[regno]);
          fill (state, regno);
        }
 
@@ -284,7 +284,7 @@ gnu_store_registers (int regno)
 
 #undef fill
 
-  if (regno >= NUM_GREGS || regno == -1)
+  if (regno >= I386_NUM_GREGS || regno == -1)
     {
       proc_debug (thread, "storing floating-point registers");