*** empty log message ***

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

diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 24c1472a483a7d526400370c4e7962f895aa30a4..a76d0e546ee8f9c45d579cfb9b69d41ed587a037 100644 (file)
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -103,12 +103,12 @@ fetch_inferior_registers (int regno)
 
       deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0;
       memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (1)],
-             &inferior_registers.r_g1, 15 * REGISTER_RAW_SIZE (G0_REGNUM));
+             &inferior_registers.r_g1, 15 * DEPRECATED_REGISTER_RAW_SIZE (G0_REGNUM));
       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)]
        = inferior_registers.r_ps;
       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]
        = inferior_registers.r_pc;
-      *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)]
+      *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)]
        = inferior_registers.r_npc;
       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y;
 
@@ -117,7 +117,7 @@ fetch_inferior_registers (int regno)
       deprecated_register_valid[Y_REGNUM] = 1;
       deprecated_register_valid[PS_REGNUM] = 1;
       deprecated_register_valid[PC_REGNUM] = 1;
-      deprecated_register_valid[NPC_REGNUM] = 1;
+      deprecated_register_valid[DEPRECATED_NPC_REGNUM] = 1;
       /* If we don't set these valid, read_register_bytes() rereads
          all the regs every time it is called!  FIXME.  */
       deprecated_register_valid[WIM_REGNUM] = 1;       /* Not true yet, FIXME */
@@ -149,7 +149,7 @@ fetch_inferior_registers (int regno)
     {
       CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)];
       target_read_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)],
-                         16 * REGISTER_RAW_SIZE (L0_REGNUM));
+                         16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM));
       for (i = L0_REGNUM; i <= I7_REGNUM; i++)
        deprecated_register_valid[i] = 1;
     }
@@ -160,7 +160,7 @@ fetch_inferior_registers (int regno)
       if (deprecated_register_valid[regno])
        printf_unfiltered ("register %d valid and read\n", regno);
       target_read_memory (sp + i - DEPRECATED_REGISTER_BYTE (L0_REGNUM),
-                         &deprecated_registers[i], REGISTER_RAW_SIZE (regno));
+                         &deprecated_registers[i], DEPRECATED_REGISTER_RAW_SIZE (regno));
       deprecated_register_valid[regno] = 1;
     }
 }
@@ -234,7 +234,7 @@ store_inferior_registers (int regno)
            internal_error (__FILE__, __LINE__, "failed internal consistency check");
          target_write_memory (sp,
                               &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)],
-                              16 * REGISTER_RAW_SIZE (L0_REGNUM));
+                              16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM));
        }
       else
        {
@@ -242,7 +242,7 @@ store_inferior_registers (int regno)
            internal_error (__FILE__, __LINE__, "failed internal consistency check");
          target_write_memory (sp + DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (L0_REGNUM),
                               &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)],
-                              REGISTER_RAW_SIZE (regno));
+                              DEPRECATED_REGISTER_RAW_SIZE (regno));
        }
 
     }
@@ -254,14 +254,14 @@ store_inferior_registers (int regno)
 
       memcpy (&inferior_registers.r_g1,
              &deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)],
-             15 * REGISTER_RAW_SIZE (G1_REGNUM));
+             15 * DEPRECATED_REGISTER_RAW_SIZE (G1_REGNUM));
 
       inferior_registers.r_ps =
        *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)];
       inferior_registers.r_pc =
        *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)];
       inferior_registers.r_npc =
-       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)];
+       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)];
       inferior_registers.r_y =
        *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)];
 
@@ -315,10 +315,10 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
 
       /* The globals and output registers.  */
       memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1,
-             15 * REGISTER_RAW_SIZE (G1_REGNUM));
+             15 * DEPRECATED_REGISTER_RAW_SIZE (G1_REGNUM));
       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps;
       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc;
-      *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc;
+      *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (DEPRECATED_NPC_REGNUM)] = gregs->r_npc;
       *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y;
 
       /* My best guess at where to get the locals and input
@@ -332,7 +332,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
        sp = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)];
        if (0 != target_read_memory (sp,
                                     &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)],
-                                    16 * REGISTER_RAW_SIZE (L0_REGNUM)))
+                                    16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)))
          {
            /* fprintf_unfiltered so user can still use gdb */
            fprintf_unfiltered (gdb_stderr,