* mips-tdep.c (mips_insn16_frame_cache, mips_insn32_frame_sniffer):

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

diff --git a/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
index 6031286ffd9499085e9448b340e8b053afa63796..d55708d7ff5ac201feb420c47ac6e207a145fb2f 100644 (file)
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -1,6 +1,7 @@
 /* Target-dependent code for NetBSD/mips.
 
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+
    Contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
@@ -17,8 +18,8 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -312,10 +313,13 @@ mipsnbsd_cannot_store_register (int regno)
          || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
 }
 
-/* NetBSD/mips uses a slightly different link_map structure from the
+/* Shared library support.  */
+
+/* NetBSD/mips uses a slightly different `struct link_map' than the
    other NetBSD platforms.  */
+
 static struct link_map_offsets *
-mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets (void)
+mipsnbsd_ilp32_fetch_link_map_offsets (void)
 {
   static struct link_map_offsets lmo;
   static struct link_map_offsets *lmp = NULL;
@@ -324,31 +328,30 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets (void)
     {
       lmp = &lmo;
 
-      lmo.r_debug_size = 16;
-
+      lmo.r_version_offset = 0;
+      lmo.r_version_size = 4;
       lmo.r_map_offset = 4;
-      lmo.r_map_size   = 4;
+      lmo.r_ldsomap_offset = -1;
 
+      /* Everything we need is in the first 24 bytes.  */
       lmo.link_map_size = 24;
-
       lmo.l_addr_offset = 4;
-      lmo.l_addr_size   = 4;
-
+      lmo.l_addr_size = 4;
       lmo.l_name_offset = 8;
-      lmo.l_name_size   = 4;
-
+      lmo.l_name_size = 4;
+      lmo.l_ld_offset = 12;
+      lmo.l_ld_size = 4;
       lmo.l_next_offset = 16;
-      lmo.l_next_size   = 4;
-
+      lmo.l_next_size = 4;
       lmo.l_prev_offset = 20;
-      lmo.l_prev_size   = 4;
+      lmo.l_prev_size = 4;
     }
 
   return lmp;
 }
 
 static struct link_map_offsets *
-mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets (void)
+mipsnbsd_lp64_fetch_link_map_offsets (void)
 {
   static struct link_map_offsets lmo;
   static struct link_map_offsets *lmp = NULL;
@@ -357,28 +360,28 @@ mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets (void)
     {
       lmp = &lmo;
 
-      lmo.r_debug_size = 32;
-
-      lmo.r_map_offset = 8;  
-      lmo.r_map_size   = 8;
+      lmo.r_version_offset = 0;
+      lmo.r_version_size = 4;
+      lmo.r_map_offset = 8;
+      lmo.r_ldsomap_offset = -1;
 
+      /* Everything we need is in the first 40 bytes.  */
       lmo.link_map_size = 48;
-
       lmo.l_addr_offset = 0;
-      lmo.l_addr_size   = 8;
-
+      lmo.l_addr_size = 8;
       lmo.l_name_offset = 16; 
-      lmo.l_name_size   = 8;
-
+      lmo.l_name_size = 8;
+      lmo.l_ld_offset = 24;
+      lmo.l_ld_size = 8;
       lmo.l_next_offset = 32;
-      lmo.l_next_size   = 8;
-
+      lmo.l_next_size = 8;
       lmo.l_prev_offset = 40;
-      lmo.l_prev_size   = 8;
+      lmo.l_prev_size = 8;
     }
 
   return lmp;
 }
+\f
 
 static void
 mipsnbsd_init_abi (struct gdbarch_info info,
@@ -394,10 +397,11 @@ mipsnbsd_init_abi (struct gdbarch_info info,
 
   set_gdbarch_software_single_step (gdbarch, mips_software_single_step);
 
-  set_solib_svr4_fetch_link_map_offsets (gdbarch,
-                                        gdbarch_ptr_bit (gdbarch) == 32 ?
-                            mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets :
-                           mipsnbsd_lp64_solib_svr4_fetch_link_map_offsets);
+  /* NetBSD/mips has SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, (gdbarch_ptr_bit (gdbarch) == 32 ?
+              mipsnbsd_ilp32_fetch_link_map_offsets :
+              mipsnbsd_lp64_fetch_link_map_offsets));
 }
 \f