*** empty log message ***

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

diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index faaa836237f49147edbcc25792ec4b355664f23c..afd8f5dc2f5a406b8c84b8b23d25a89fdc2b7dd4 100644 (file)
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -28,6 +28,7 @@
 #include "gdb_string.h"
 #include "gdb_assert.h"
 #include "frame.h"
+#include "regcache.h"
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
@@ -124,13 +125,13 @@ 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, MIPS_UNUSED_REGNUM, zerobuf);
-  for (regi = FIRST_EMBED_REGNUM; regi < LAST_EMBED_REGNUM; regi++)
+  for (regi = MIPS_FIRST_EMBED_REGNUM; regi < MIPS_LAST_EMBED_REGNUM; regi++)
     regcache_raw_supply (current_regcache, regi, zerobuf);
 }
 
@@ -152,7 +153,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 +174,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;
@@ -221,15 +222,13 @@ fill_fpregset (elf_fpregset_t *fpregsetp, int regno)
 
   if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32))
     {
-      from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + regno - FP0_REGNUM);
-      memcpy (to, from, register_size (current_gdbarch, regno - FP0_REGNUM));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   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, register_size (current_gdbarch, regno));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   else if (regno == -1)
     {
@@ -402,14 +401,14 @@ 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, MIPS_UNUSED_REGNUM, zerobuf);
-  for (regi = FIRST_EMBED_REGNUM; regi < LAST_EMBED_REGNUM; regi++)
+  for (regi = MIPS_FIRST_EMBED_REGNUM; regi < MIPS_LAST_EMBED_REGNUM; regi++)
     regcache_raw_supply (current_regcache, regi, zerobuf);
 }
 
@@ -431,7 +430,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 +451,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;
@@ -500,15 +499,13 @@ mips64_fill_fpregset (mips64_elf_fpregset_t *fpregsetp, int regno)
 
   if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32))
     {
-      from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + regno - FP0_REGNUM);
-      memcpy (to, from, register_size (current_gdbarch, regno - FP0_REGNUM));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   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, register_size (current_gdbarch, regno));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   else if (regno == -1)
     {
@@ -1168,10 +1165,6 @@ 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);
 }
 
 void