2003-11-16 Andrew Cagney <cagney@redhat.com>

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

diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c
index 6128a04a450564fd176a22b0007a812f3283dbcc..a4473899cb5b6f12a648872e3fff69765993b883 100644 (file)
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -53,28 +53,32 @@ static void fetch_core_registers (char *, unsigned int, int, CORE_ADDR);
 void
 supply_gregset (gregset_t *gregsetp)
 {
-  register int regi;
-  register greg_t *regp = &(*gregsetp)[0];
-  int gregoff = sizeof (greg_t) - MIPS_REGSIZE;
+  int regi;
+  greg_t *regp = &(*gregsetp)[0];
+  int gregoff = sizeof (greg_t) - mips_regsize (current_gdbarch);
   static char zerobuf[32] = {0};
 
   for (regi = 0; regi <= CTX_RA; regi++)
     supply_register (regi, (char *) (regp + regi) + gregoff);
 
-  supply_register (PC_REGNUM, (char *) (regp + CTX_EPC) + gregoff);
-  supply_register (HI_REGNUM, (char *) (regp + CTX_MDHI) + gregoff);
-  supply_register (LO_REGNUM, (char *) (regp + CTX_MDLO) + gregoff);
-  supply_register (CAUSE_REGNUM, (char *) (regp + CTX_CAUSE) + gregoff);
+  supply_register (mips_regnum (current_gdbarch)->pc,
+                  (char *) (regp + CTX_EPC) + gregoff);
+  supply_register (mips_regnum (current_gdbarch)->hi,
+                  (char *) (regp + CTX_MDHI) + gregoff);
+  supply_register (mips_regnum (current_gdbarch)->lo,
+                  (char *) (regp + CTX_MDLO) + gregoff);
+  supply_register (mips_regnum (current_gdbarch)->cause,
+                  (char *) (regp + CTX_CAUSE) + gregoff);
 
   /* Fill inaccessible registers with zero.  */
-  supply_register (BADVADDR_REGNUM, zerobuf);
+  supply_register (mips_regnum (current_gdbarch)->badvaddr, zerobuf);
 }
 
 void
 fill_gregset (gregset_t *gregsetp, int regno)
 {
   int regi;
-  register greg_t *regp = &(*gregsetp)[0];
+  greg_t *regp = &(*gregsetp)[0];
 
   /* Under Irix6, if GDB is built with N32 ABI and is debugging an O32
      executable, we have to sign extend the registers to 64 bits before
@@ -83,28 +87,29 @@ fill_gregset (gregset_t *gregsetp, int regno)
   for (regi = 0; regi <= CTX_RA; regi++)
     if ((regno == -1) || (regno == regi))
       *(regp + regi) =
-       extract_signed_integer (&deprecated_registers[REGISTER_BYTE (regi)],
-                               REGISTER_RAW_SIZE (regi));
+       extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)],
+                               DEPRECATED_REGISTER_RAW_SIZE (regi));
 
   if ((regno == -1) || (regno == PC_REGNUM))
     *(regp + CTX_EPC) =
-      extract_signed_integer (&deprecated_registers[REGISTER_BYTE (PC_REGNUM)],
-                             REGISTER_RAW_SIZE (PC_REGNUM));
+      extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->pc)],
+                             DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->pc));
 
-  if ((regno == -1) || (regno == CAUSE_REGNUM))
+  if ((regno == -1) || (regno == mips_regnum (current_gdbarch)->cause))
     *(regp + CTX_CAUSE) =
-      extract_signed_integer (&deprecated_registers[REGISTER_BYTE (CAUSE_REGNUM)],
-                             REGISTER_RAW_SIZE (CAUSE_REGNUM));
+      extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->cause)],
+                             DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->cause));
 
-  if ((regno == -1) || (regno == HI_REGNUM))
+  if ((regno == -1)
+      || (regno == mips_regnum (current_gdbarch)->hi))
     *(regp + CTX_MDHI) =
-      extract_signed_integer (&deprecated_registers[REGISTER_BYTE (HI_REGNUM)],
-                             REGISTER_RAW_SIZE (HI_REGNUM));
+      extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->hi)],
+                             DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->hi));
 
-  if ((regno == -1) || (regno == LO_REGNUM))
+  if ((regno == -1) || (regno == mips_regnum (current_gdbarch)->lo))
     *(regp + CTX_MDLO) =
-      extract_signed_integer (&deprecated_registers[REGISTER_BYTE (LO_REGNUM)],
-                             REGISTER_RAW_SIZE (LO_REGNUM));
+      extract_signed_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->lo)],
+                             DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->lo));
 }
 
 /*
@@ -118,7 +123,7 @@ fill_gregset (gregset_t *gregsetp, int regno)
 void
 supply_fpregset (fpregset_t *fpregsetp)
 {
-  register int regi;
+  int regi;
   static char zerobuf[32] = {0};
 
   /* FIXME, this is wrong for the N32 ABI which has 64 bit FP regs. */
@@ -127,10 +132,12 @@ supply_fpregset (fpregset_t *fpregsetp)
     supply_register (FP0_REGNUM + regi,
                     (char *) &fpregsetp->fp_r.fp_regs[regi]);
 
-  supply_register (FCRCS_REGNUM, (char *) &fpregsetp->fp_csr);
+  supply_register (mips_regnum (current_gdbarch)->fp_control_status,
+                  (char *) &fpregsetp->fp_csr);
 
-  /* FIXME: how can we supply FCRIR_REGNUM?  SGI doesn't tell us. */
-  supply_register (FCRIR_REGNUM, zerobuf);
+  /* FIXME: how can we supply FCRIR?  SGI doesn't tell us. */
+  supply_register (mips_regnum (current_gdbarch)->fp_implementation_revision,
+                  zerobuf);
 }
 
 void
@@ -145,14 +152,15 @@ fill_fpregset (fpregset_t *fpregsetp, int regno)
     {
       if ((regno == -1) || (regno == regi))
        {
-         from = (char *) &deprecated_registers[REGISTER_BYTE (regi)];
+         from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)];
          to = (char *) &(fpregsetp->fp_r.fp_regs[regi - FP0_REGNUM]);
-         memcpy (to, from, REGISTER_RAW_SIZE (regi));
+         memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regi));
        }
     }
 
-  if ((regno == -1) || (regno == FCRCS_REGNUM))
-    fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[REGISTER_BYTE (FCRCS_REGNUM)];
+  if ((regno == -1)
+      || (regno == mips_regnum (current_gdbarch)->fp_control_status))
+    fpregsetp->fp_csr = *(unsigned *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->fp_control_status)];
 }
 
 
@@ -174,7 +182,7 @@ get_longjmp_target (CORE_ADDR *pc)
                          TARGET_PTR_BIT / TARGET_CHAR_BIT))
     return 0;
 
-  *pc = extract_address (buf, TARGET_PTR_BIT / TARGET_CHAR_BIT);
+  *pc = extract_unsigned_integer (buf, TARGET_PTR_BIT / TARGET_CHAR_BIT);
 
   return 1;
 }
@@ -200,8 +208,8 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
     {
       memcpy ((char *) deprecated_registers, core_reg_sect, core_reg_size);
     }
-  else if (MIPS_REGSIZE == 4 &&
-          core_reg_size == (2 * MIPS_REGSIZE) * NUM_REGS)
+  else if (mips_regsize (current_gdbarch) == 4 &&
+          core_reg_size == (2 * mips_regsize (current_gdbarch)) * NUM_REGS)
     {
       /* This is a core file from a N32 executable, 64 bits are saved
          for all registers.  */
@@ -219,7 +227,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
              *dstp++ = *srcp++;
              *dstp++ = *srcp++;
              *dstp++ = *srcp++;
-             if (REGISTER_RAW_SIZE (regno) == 4)
+             if (DEPRECATED_REGISTER_RAW_SIZE (regno) == 4)
                {
                  /* copying 4 bytes from eight bytes?
                     I don't see how this can be right...  */