merge from gcc

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

diff --git a/gdb/hppab-nat.c b/gdb/hppab-nat.c
index dc3e6b6fb9c390d9a05b274534065001c427873f..416db66a2bcd399e7ea7841ff677889841dbfca4 100644 (file)
--- a/gdb/hppab-nat.c
+++ b/gdb/hppab-nat.c
@@ -54,9 +54,9 @@
 static void
 fetch_register (int regno)
 {
-  register unsigned int regaddr;
+  unsigned int regaddr;
   char buf[MAX_REGISTER_SIZE];
-  register int i;
+  int i;
 
   /* Offset of registers within the u area.  */
   unsigned int offset;
@@ -64,7 +64,7 @@ fetch_register (int regno)
   offset = U_REGS_OFFSET;
 
   regaddr = register_addr (regno, offset);
-  for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
+  for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno); i += sizeof (int))
     {
       errno = 0;
       *(int *) &buf[i] = ptrace (PT_RUREGS, PIDGET (inferior_ptid),
@@ -104,9 +104,9 @@ fetch_inferior_registers (int regno)
 void
 store_inferior_registers (int regno)
 {
-  register unsigned int regaddr;
+  unsigned int regaddr;
   char buf[80];
-  register int i;
+  int i;
   unsigned int offset = U_REGS_OFFSET;
   int scratch;
 
@@ -118,7 +118,7 @@ store_inferior_registers (int regno)
       errno = 0;
       if (regno == PCOQ_HEAD_REGNUM || regno == PCOQ_TAIL_REGNUM)
        {
-         scratch = *(int *) &deprecated_registers[REGISTER_BYTE (regno)] | 0x3;
+         scratch = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)] | 0x3;
          ptrace (PT_WUREGS, PIDGET (inferior_ptid), (PTRACE_ARG3_TYPE) regaddr,
                  scratch);
          if (errno != 0)
@@ -130,12 +130,12 @@ store_inferior_registers (int regno)
            }
        }
       else
-       for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
+       for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno); i += sizeof (int))
          {
            errno = 0;
            ptrace (PT_WUREGS, PIDGET (inferior_ptid),
                    (PTRACE_ARG3_TYPE) regaddr,
-                   *(int *) &deprecated_registers[REGISTER_BYTE (regno) + i]);
+                   *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno) + i]);
            if (errno != 0)
              {
                /* Warning, not error, in case we are attached; sometimes the