2007-10-10 Markus Deuling <deuling@de.ibm.com>

[deliverable/binutils-gdb.git] / gdb / mipsnbsd-tdep.c

diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index bd82af1a0465f8d04099c3c43aef0348cedc5e0b..f4805a63f6e924725e1d4defec6a207cf0be8f88 100644 (file)
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -8,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -144,17 +142,18 @@ mipsnbsd_regset_from_core_section (struct gdbarch *gdbarch,
 void
 mipsnbsd_supply_reg (struct regcache *regcache, const char *regs, int regno)
 {
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
   int i;
 
-  for (i = 0; i <= PC_REGNUM; i++)
+  for (i = 0; i <= gdbarch_pc_regnum (gdbarch); i++)
     {
       if (regno == i || regno == -1)
        {
-         if (gdbarch_cannot_fetch_register (current_gdbarch, i))
+         if (gdbarch_cannot_fetch_register (gdbarch, i))
            regcache_raw_supply (regcache, i, NULL);
          else
             regcache_raw_supply (regcache, i,
-                                regs + (i * mips_isa_regsize (current_gdbarch)));
+                                regs + (i * mips_isa_regsize (gdbarch)));
         }
     }
 }
@@ -162,31 +161,35 @@ mipsnbsd_supply_reg (struct regcache *regcache, const char *regs, int regno)
 void
 mipsnbsd_fill_reg (const struct regcache *regcache, char *regs, int regno)
 {
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
   int i;
 
-  for (i = 0; i <= PC_REGNUM; i++)
+  for (i = 0; i <= gdbarch_pc_regnum (gdbarch); i++)
     if ((regno == i || regno == -1)
-       && ! gdbarch_cannot_store_register (current_gdbarch, i))
+       && ! gdbarch_cannot_store_register (gdbarch, i))
       regcache_raw_collect (regcache, i,
-                           regs + (i * mips_isa_regsize (current_gdbarch)));
+                           regs + (i * mips_isa_regsize (gdbarch)));
 }
 
 void
 mipsnbsd_supply_fpreg (struct regcache *regcache, const char *fpregs, int regno)
 {
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
   int i;
 
-  for (i = FP0_REGNUM;
-       i <= mips_regnum (current_gdbarch)->fp_implementation_revision;
+  for (i = gdbarch_fp0_regnum (gdbarch);
+       i <= mips_regnum (gdbarch)->fp_implementation_revision;
        i++)
     {
       if (regno == i || regno == -1)
        {
-         if (gdbarch_cannot_fetch_register (current_gdbarch, i))
+         if (gdbarch_cannot_fetch_register (gdbarch, i))
            regcache_raw_supply (regcache, i, NULL);
          else
             regcache_raw_supply (regcache, i,
-                                fpregs + ((i - FP0_REGNUM) * mips_isa_regsize (current_gdbarch)));
+                                fpregs 
+                                + ((i - gdbarch_fp0_regnum (gdbarch))
+                                   * mips_isa_regsize (gdbarch)));
        }
     }
 }
@@ -194,14 +197,17 @@ mipsnbsd_supply_fpreg (struct regcache *regcache, const char *fpregs, int regno)
 void
 mipsnbsd_fill_fpreg (const struct regcache *regcache, char *fpregs, int regno)
 {
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
   int i;
 
-  for (i = FP0_REGNUM; i <= mips_regnum (current_gdbarch)->fp_control_status;
+  for (i = gdbarch_fp0_regnum (gdbarch);
+       i <= mips_regnum (gdbarch)->fp_control_status;
        i++)
     if ((regno == i || regno == -1) 
-       && ! gdbarch_cannot_store_register (current_gdbarch, i))
+       && ! gdbarch_cannot_store_register (gdbarch, i))
       regcache_raw_collect (regcache, i,
-                           fpregs + ((i - FP0_REGNUM) * mips_isa_regsize (current_gdbarch)));
+                           fpregs + ((i - gdbarch_fp0_regnum (gdbarch))
+                             * mips_isa_regsize (gdbarch)));
 }
 
 /* Under NetBSD/mips, signal handler invocations can be identified by the
@@ -241,8 +247,9 @@ static LONGEST
 mipsnbsd_sigtramp_offset (struct frame_info *next_frame)
 {
   CORE_ADDR pc = frame_pc_unwind (next_frame);
-  const char *retcode = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
-       ? sigtramp_retcode_mipseb : sigtramp_retcode_mipsel;
+  const char *retcode = gdbarch_byte_order (get_frame_arch (next_frame))
+                       == BFD_ENDIAN_BIG ? sigtramp_retcode_mipseb :
+                       sigtramp_retcode_mipsel;
   unsigned char ret[RETCODE_SIZE], w[4];
   LONGEST off;
   int i;
@@ -283,14 +290,14 @@ mipsnbsd_sigtramp_offset (struct frame_info *next_frame)
                                         NBSD_MIPS_JB_ELEMENT_SIZE)
 
 static int
-mipsnbsd_get_longjmp_target (CORE_ADDR *pc)
+mipsnbsd_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc)
 {
   CORE_ADDR jb_addr;
   char *buf;
 
   buf = alloca (NBSD_MIPS_JB_ELEMENT_SIZE);
 
-  jb_addr = read_register (MIPS_A0_REGNUM);
+  jb_addr = get_frame_register_unsigned (frame, MIPS_A0_REGNUM);
 
   if (target_read_memory (jb_addr + NBSD_MIPS_JB_OFFSET, buf,
                          NBSD_MIPS_JB_ELEMENT_SIZE))