2004-10-30 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / gdb / mips-linux-tdep.c

diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index 77db3de57de5cbc481f3ced8adf75c2138ddacd7..60c62ca4fa9d30d103fc1676e68f814a431004b9 100644 (file)
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -76,7 +76,7 @@ mips_linux_get_longjmp_target (CORE_ADDR *pc)
   CORE_ADDR jb_addr;
   char buf[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
                          + MIPS_LINUX_JB_PC * MIPS_LINUX_JB_ELEMENT_SIZE,
@@ -96,7 +96,7 @@ static void
 supply_32bit_reg (int regnum, const void *addr)
 {
   char buf[MAX_REGISTER_SIZE];
-  store_signed_integer (buf, DEPRECATED_REGISTER_RAW_SIZE (regnum),
+  store_signed_integer (buf, register_size (current_gdbarch, regnum),
                         extract_signed_integer (addr, 4));
   regcache_raw_supply (current_regcache, regnum, buf);
 }
@@ -124,12 +124,12 @@ supply_gregset (elf_gregset_t *gregsetp)
                    (char *)(regp + EF_CP0_EPC));
   supply_32bit_reg (mips_regnum (current_gdbarch)->badvaddr,
                    (char *)(regp + EF_CP0_BADVADDR));
-  supply_32bit_reg (PS_REGNUM, (char *)(regp + EF_CP0_STATUS));
+  supply_32bit_reg (MIPS_PS_REGNUM, (char *)(regp + EF_CP0_STATUS));
   supply_32bit_reg (mips_regnum (current_gdbarch)->cause,
                    (char *)(regp + EF_CP0_CAUSE));
 
   /* Fill inaccessible registers with zero.  */
-  regcache_raw_supply (current_regcache, UNUSED_REGNUM, zerobuf);
+  regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf);
   for (regi = FIRST_EMBED_REGNUM; regi < LAST_EMBED_REGNUM; regi++)
     regcache_raw_supply (current_regcache, regi, zerobuf);
 }
@@ -152,7 +152,7 @@ fill_gregset (elf_gregset_t *gregsetp, int regno)
       fill_gregset (gregsetp, mips_regnum (current_gdbarch)->hi);
       fill_gregset (gregsetp, mips_regnum (current_gdbarch)->pc);
       fill_gregset (gregsetp, mips_regnum (current_gdbarch)->badvaddr);
-      fill_gregset (gregsetp, PS_REGNUM);
+      fill_gregset (gregsetp, MIPS_PS_REGNUM);
       fill_gregset (gregsetp, mips_regnum (current_gdbarch)->cause);
 
       return;
@@ -173,7 +173,7 @@ fill_gregset (elf_gregset_t *gregsetp, int regno)
     regaddr = EF_CP0_EPC;
   else if (regno == mips_regnum (current_gdbarch)->badvaddr)
     regaddr = EF_CP0_BADVADDR;
-  else if (regno == PS_REGNUM)
+  else if (regno == MIPS_PS_REGNUM)
     regaddr = EF_CP0_STATUS;
   else if (regno == mips_regnum (current_gdbarch)->cause)
     regaddr = EF_CP0_CAUSE;
@@ -223,13 +223,13 @@ fill_fpregset (elf_fpregset_t *fpregsetp, int regno)
     {
       from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + regno - FP0_REGNUM);
-      memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regno - FP0_REGNUM));
+      memcpy (to, from, register_size (current_gdbarch, regno - FP0_REGNUM));
     }
   else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
     {
       from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + 32);
-      memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regno));
+      memcpy (to, from, register_size (current_gdbarch, regno));
     }
   else if (regno == -1)
     {
@@ -367,7 +367,7 @@ mips64_linux_get_longjmp_target (CORE_ADDR *pc)
   void *buf = alloca (TARGET_PTR_BIT / TARGET_CHAR_BIT);
   int element_size = TARGET_PTR_BIT == 32 ? 4 : 8;
 
-  jb_addr = read_register (A0_REGNUM);
+  jb_addr = read_register (MIPS_A0_REGNUM);
 
   if (target_read_memory (jb_addr + MIPS64_LINUX_JB_PC * element_size,
                          buf, TARGET_PTR_BIT / TARGET_CHAR_BIT))
@@ -402,13 +402,13 @@ mips64_supply_gregset (mips64_elf_gregset_t *gregsetp)
                       (char *)(regp + MIPS64_EF_CP0_EPC));
   regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->badvaddr,
                       (char *)(regp + MIPS64_EF_CP0_BADVADDR));
-  regcache_raw_supply (current_regcache, PS_REGNUM,
+  regcache_raw_supply (current_regcache, MIPS_PS_REGNUM,
                       (char *)(regp + MIPS64_EF_CP0_STATUS));
   regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->cause,
                       (char *)(regp + MIPS64_EF_CP0_CAUSE));
 
   /* Fill inaccessible registers with zero.  */
-  regcache_raw_supply (current_regcache, UNUSED_REGNUM, zerobuf);
+  regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf);
   for (regi = FIRST_EMBED_REGNUM; regi < LAST_EMBED_REGNUM; regi++)
     regcache_raw_supply (current_regcache, regi, zerobuf);
 }
@@ -431,7 +431,7 @@ mips64_fill_gregset (mips64_elf_gregset_t *gregsetp, int regno)
       mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->hi);
       mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->pc);
       mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->badvaddr);
-      mips64_fill_gregset (gregsetp, PS_REGNUM);
+      mips64_fill_gregset (gregsetp, MIPS_PS_REGNUM);
       mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->cause);
 
       return;
@@ -452,7 +452,7 @@ mips64_fill_gregset (mips64_elf_gregset_t *gregsetp, int regno)
     regaddr = MIPS64_EF_CP0_EPC;
   else if (regno == mips_regnum (current_gdbarch)->badvaddr)
     regaddr = MIPS64_EF_CP0_BADVADDR;
-  else if (regno == PS_REGNUM)
+  else if (regno == MIPS_PS_REGNUM)
     regaddr = MIPS64_EF_CP0_STATUS;
   else if (regno == mips_regnum (current_gdbarch)->cause)
     regaddr = MIPS64_EF_CP0_CAUSE;
@@ -502,13 +502,13 @@ mips64_fill_fpregset (mips64_elf_fpregset_t *fpregsetp, int regno)
     {
       from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + regno - FP0_REGNUM);
-      memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regno - FP0_REGNUM));
+      memcpy (to, from, register_size (current_gdbarch, regno - FP0_REGNUM));
     }
   else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
     {
       from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + 32);
-      memcpy (to, from, DEPRECATED_REGISTER_RAW_SIZE (regno));
+      memcpy (to, from, register_size (current_gdbarch, regno));
     }
   else if (regno == -1)
     {
@@ -975,7 +975,7 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self,
 #endif
 
   for (ireg = 1; ireg < 32; ireg++)
-    trad_frame_set_reg_addr (this_cache, ireg + ZERO_REGNUM + NUM_REGS,
+    trad_frame_set_reg_addr (this_cache, ireg + MIPS_ZERO_REGNUM + NUM_REGS,
                             sigcontext_base + SIGCONTEXT_REGS
                             + ireg * SIGCONTEXT_REG_SIZE);
 
@@ -1097,7 +1097,7 @@ mips_linux_n32n64_sigframe_init (const struct tramp_frame *self,
 #endif
 
   for (ireg = 1; ireg < 32; ireg++)
-    trad_frame_set_reg_addr (this_cache, ireg + ZERO_REGNUM + NUM_REGS,
+    trad_frame_set_reg_addr (this_cache, ireg + MIPS_ZERO_REGNUM + NUM_REGS,
                             sigcontext_base + N64_SIGCONTEXT_REGS
                             + ireg * N64_SIGCONTEXT_REG_SIZE);
 
@@ -1167,6 +1167,8 @@ mips_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   set_gdbarch_skip_solib_resolver (gdbarch, mips_linux_skip_resolver);
 
+  set_gdbarch_software_single_step (gdbarch, mips_software_single_step);
+
   /* This overrides the MIPS16 stub support from mips-tdep.  But no
      one uses MIPS16 on GNU/Linux yet, so this isn't much of a loss.  */
   set_gdbarch_in_solib_call_trampoline (gdbarch, mips_linux_in_dynsym_stub);