*** empty log message ***

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

diff --git a/gdb/mipsv4-nat.c b/gdb/mipsv4-nat.c
index 645ad4d722605b808e39756d8d77481886c6be5e..bd48c6ebd0946f2158c043f2bf413180cda6c8a6 100644 (file)
--- a/gdb/mipsv4-nat.c
+++ b/gdb/mipsv4-nat.c
@@ -63,13 +63,13 @@ supply_gregset (gregset_t *gregsetp)
                       (char *) (regp + CXT_CAUSE));
 
   /* Fill inaccessible registers with zero.  */
-  regcache_raw_supply (current_regcache, PS_REGNUM, zerobuf);
+  regcache_raw_supply (current_regcache, MIPS_PS_REGNUM, zerobuf);
   regcache_raw_supply (current_regcache,
                       mips_regnum (current_gdbarch)->badvaddr,
                       zerobuf);
   regcache_raw_supply (current_regcache, DEPRECATED_FP_REGNUM, zerobuf);
-  regcache_raw_supply (current_regcache, UNUSED_REGNUM, zerobuf);
-  for (regi = FIRST_EMBED_REGNUM; regi <= LAST_EMBED_REGNUM; regi++)
+  regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf);
+  for (regi = MIPS_FIRST_EMBED_REGNUM; regi <= MIPS_LAST_EMBED_REGNUM; regi++)
     regcache_raw_supply (current_regcache, regi, zerobuf);
 }
 
@@ -139,7 +139,7 @@ fill_fpregset (fpregset_t *fpregsetp, int regno)
        {
          from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)];
          to = (char *) &(fpregsetp->fp_r.fp_regs[regi - mips_regnum (current_gdbarch)->fp0]);
-         memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regi));
+         memcpy (to, from, register_size (current_gdbarch, regi));
        }
     }
 
@@ -161,7 +161,7 @@ get_longjmp_target (CORE_ADDR *pc)
   CORE_ADDR jb_addr;
 
   buf = alloca (TARGET_PTR_BIT / TARGET_CHAR_BIT);
-  jb_addr = read_register (A0_REGNUM);
+  jb_addr = read_register (MIPS_A0_REGNUM);
 
   if (target_read_memory (jb_addr + _JB_PC * JB_ELEMENT_SIZE, buf,
                          TARGET_PTR_BIT / TARGET_CHAR_BIT))