2007-06-13 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 dfdc01d8b9833ee6b67a12fb0f1f9d0a49354320..5ec52fa75ce7d31e8d3bf45ad591626ab834043e 100644 (file)
--- a/gdb/mipsnbsd-tdep.c
+++ b/gdb/mipsnbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for NetBSD/mips.
 
-   Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
    Contributed by Wasabi Systems, Inc.
 
@@ -142,7 +142,7 @@ mipsnbsd_regset_from_core_section (struct gdbarch *gdbarch,
    ptrace register structure used by NetBSD/mips.  */
 
 void
-mipsnbsd_supply_reg (char *regs, int regno)
+mipsnbsd_supply_reg (struct regcache *regcache, const char *regs, int regno)
 {
   int i;
 
@@ -150,28 +150,29 @@ mipsnbsd_supply_reg (char *regs, int regno)
     {
       if (regno == i || regno == -1)
        {
-         if (CANNOT_FETCH_REGISTER (i))
-           regcache_raw_supply (current_regcache, i, NULL);
+         if (gdbarch_cannot_fetch_register (current_gdbarch, i))
+           regcache_raw_supply (regcache, i, NULL);
          else
-            regcache_raw_supply (current_regcache, i,
+            regcache_raw_supply (regcache, i,
                                 regs + (i * mips_isa_regsize (current_gdbarch)));
         }
     }
 }
 
 void
-mipsnbsd_fill_reg (char *regs, int regno)
+mipsnbsd_fill_reg (const struct regcache *regcache, char *regs, int regno)
 {
   int i;
 
   for (i = 0; i <= PC_REGNUM; i++)
-    if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i))
-      regcache_raw_collect (current_regcache, i,
+    if ((regno == i || regno == -1)
+       && ! gdbarch_cannot_store_register (current_gdbarch, i))
+      regcache_raw_collect (regcache, i,
                            regs + (i * mips_isa_regsize (current_gdbarch)));
 }
 
 void
-mipsnbsd_supply_fpreg (char *fpregs, int regno)
+mipsnbsd_supply_fpreg (struct regcache *regcache, const char *fpregs, int regno)
 {
   int i;
 
@@ -181,24 +182,25 @@ mipsnbsd_supply_fpreg (char *fpregs, int regno)
     {
       if (regno == i || regno == -1)
        {
-         if (CANNOT_FETCH_REGISTER (i))
-           regcache_raw_supply (current_regcache, i, NULL);
+         if (gdbarch_cannot_fetch_register (current_gdbarch, i))
+           regcache_raw_supply (regcache, i, NULL);
          else
-            regcache_raw_supply (current_regcache, i,
+            regcache_raw_supply (regcache, i,
                                 fpregs + ((i - FP0_REGNUM) * mips_isa_regsize (current_gdbarch)));
        }
     }
 }
 
 void
-mipsnbsd_fill_fpreg (char *fpregs, int regno)
+mipsnbsd_fill_fpreg (const struct regcache *regcache, char *fpregs, int regno)
 {
   int i;
 
   for (i = FP0_REGNUM; i <= mips_regnum (current_gdbarch)->fp_control_status;
        i++)
-    if ((regno == i || regno == -1) && ! CANNOT_STORE_REGISTER (i))
-      regcache_raw_collect (current_regcache, i,
+    if ((regno == i || regno == -1) 
+       && ! gdbarch_cannot_store_register (current_gdbarch, i))
+      regcache_raw_collect (regcache, i,
                            fpregs + ((i - FP0_REGNUM) * mips_isa_regsize (current_gdbarch)));
 }
 
@@ -239,8 +241,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 (current_gdbarch)
+                       == BFD_ENDIAN_BIG ? sigtramp_retcode_mipseb :
+                       sigtramp_retcode_mipsel;
   unsigned char ret[RETCODE_SIZE], w[4];
   LONGEST off;
   int i;
@@ -336,13 +339,10 @@ mipsnbsd_ilp32_fetch_link_map_offsets (void)
       /* 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_name_offset = 8;
-      lmo.l_name_size = 4;
+      lmo.l_ld_offset = 12;
       lmo.l_next_offset = 16;
-      lmo.l_next_size = 4;
       lmo.l_prev_offset = 20;
-      lmo.l_prev_size = 4;
     }
 
   return lmp;
@@ -366,13 +366,10 @@ mipsnbsd_lp64_fetch_link_map_offsets (void)
       /* 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_name_offset = 16; 
-      lmo.l_name_size = 8;
+      lmo.l_ld_offset = 24;
       lmo.l_next_offset = 32;
-      lmo.l_next_size = 8;
       lmo.l_prev_offset = 40;
-      lmo.l_prev_size = 8;
     }
 
   return lmp;