2008-03-25 Pedro Alves <pedro@codesourcery.com>

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

diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index b0c57676d78e07e27c838d2aed80af4f802fabe9..1a2592afad4b55d05eef69c4729dfc21995feaa0 100644 (file)
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -1,6 +1,7 @@
 /* Target-dependent code for NetBSD/mips.
 
-   Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008
+   Free Software Foundation, Inc.
 
    Contributed by Wasabi Systems, Inc.
 
@@ -8,7 +9,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 +18,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 +143,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 <= gdbarch_pc_regnum (current_gdbarch); 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,33 +162,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 <= gdbarch_pc_regnum (current_gdbarch); 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 = gdbarch_fp0_regnum (current_gdbarch);
-       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 - gdbarch_fp0_regnum (current_gdbarch))
-                                   * mips_isa_regsize (current_gdbarch)));
+                                + ((i - gdbarch_fp0_regnum (gdbarch))
+                                   * mips_isa_regsize (gdbarch)));
        }
     }
 }
@@ -196,17 +198,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 = gdbarch_fp0_regnum (current_gdbarch);
-       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 - gdbarch_fp0_regnum
-                                            (current_gdbarch))
-                             * 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
@@ -246,7 +248,7 @@ static LONGEST
 mipsnbsd_sigtramp_offset (struct frame_info *next_frame)
 {
   CORE_ADDR pc = frame_pc_unwind (next_frame);
-  const char *retcode = gdbarch_byte_order (current_gdbarch)
+  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];
@@ -308,17 +310,17 @@ mipsnbsd_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc)
 }
 
 static int
-mipsnbsd_cannot_fetch_register (int regno)
+mipsnbsd_cannot_fetch_register (struct gdbarch *gdbarch, int regno)
 {
   return (regno == MIPS_ZERO_REGNUM
-         || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
+         || regno == mips_regnum (gdbarch)->fp_implementation_revision);
 }
 
 static int
-mipsnbsd_cannot_store_register (int regno)
+mipsnbsd_cannot_store_register (struct gdbarch *gdbarch, int regno)
 {
   return (regno == MIPS_ZERO_REGNUM
-         || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
+         || regno == mips_regnum (gdbarch)->fp_implementation_revision);
 }
 
 /* Shared library support.  */
@@ -339,6 +341,7 @@ mipsnbsd_ilp32_fetch_link_map_offsets (void)
       lmo.r_version_offset = 0;
       lmo.r_version_size = 4;
       lmo.r_map_offset = 4;
+      lmo.r_brk_offset = 8;
       lmo.r_ldsomap_offset = -1;
 
       /* Everything we need is in the first 24 bytes.  */
@@ -366,6 +369,7 @@ mipsnbsd_lp64_fetch_link_map_offsets (void)
       lmo.r_version_offset = 0;
       lmo.r_version_size = 4;
       lmo.r_map_offset = 8;
+      lmo.r_brk_offset = 16;
       lmo.r_ldsomap_offset = -1;
 
       /* Everything we need is in the first 40 bytes.  */