2004-02-17 Elena Zannoni <ezannoni@redhat.com>

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

diff --git a/gdb/mips-nat.c b/gdb/mips-nat.c
index 0ab3fb1dd6be451965a9fd9949bb9cb4009d52c2..626f770f18df86a7ae1cae8736efa3d82e3f7e15 100644 (file)
--- a/gdb/mips-nat.c
+++ b/gdb/mips-nat.c
@@ -55,12 +55,12 @@ static int
 register_ptrace_addr (int regno)
 {
   return (regno < 32 ? GPR_BASE + regno
-         : regno == PC_REGNUM ? PC
-         : regno == CAUSE_REGNUM ? CAUSE
-         : regno == HI_REGNUM ? MMHI
-         : regno == LO_REGNUM ? MMLO
-         : regno == FCRCS_REGNUM ? FPC_CSR
-         : regno == FCRIR_REGNUM ? FPC_EIR
+         : regno == mips_regnum (current_gdbarch)->pc ? PC
+         : regno == mips_regnum (current_gdbarch)->cause ? CAUSE
+         : regno == mips_regnum (current_gdbarch)->hi ? MMHI
+         : regno == mips_regnum (current_gdbarch)->lo ? MMLO
+         : regno == mips_regnum (current_gdbarch)->fp_control_status ? FPC_CSR
+         : regno == mips_regnum (current_gdbarch)->fp_implementation_revision ? FPC_EIR
          : regno >= FP0_REGNUM ? FPR_BASE + (regno - FP0_REGNUM)
          : 0);
 }
@@ -83,7 +83,7 @@ fetch_inferior_registers (int regno)
   for (regno = 1; regno < NUM_REGS; regno++)
     {
       regaddr = register_ptrace_addr (regno);
-      for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
+      for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno); i += sizeof (int))
        {
          *(int *) &buf[i] = ptrace (PT_READ_U, PIDGET (inferior_ptid),
                                     (PTRACE_ARG3_TYPE) regaddr, 0);
@@ -110,8 +110,10 @@ store_inferior_registers (int regno)
   if (regno > 0)
     {
       if (regno == ZERO_REGNUM || regno == PS_REGNUM
-         || regno == BADVADDR_REGNUM || regno == CAUSE_REGNUM
-         || regno == FCRIR_REGNUM || regno == DEPRECATED_FP_REGNUM
+         || regno == mips_regnum (current_gdbarch)->badvaddr
+         || regno == mips_regnum (current_gdbarch)->cause
+         || regno == mips_regnum (current_gdbarch)->fp_implementation_revision
+         || regno == DEPRECATED_FP_REGNUM
          || (regno >= FIRST_EMBED_REGNUM && regno <= LAST_EMBED_REGNUM))
        return;
       regaddr = register_ptrace_addr (regno);