merge from gcc

[external/binutils.git] / gdb / mips64obsd-tdep.c

diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64obsd-tdep.c
index ccc4d5b..fe66c73 100644 (file)
--- a/gdb/mips64obsd-tdep.c
+++ b/gdb/mips64obsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for OpenBSD/mips64.
 
-   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -79,42 +79,41 @@ mips64obsd_regset_from_core_section (struct gdbarch *gdbarch,
 
 static void
 mips64obsd_sigframe_init (const struct tramp_frame *self,
-                         struct frame_info *next_frame,
+                         struct frame_info *this_frame,
                          struct trad_frame_cache *cache,
                          CORE_ADDR func)
 {
-  struct gdbarch *gdbarch = get_frame_arch (next_frame);
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
   CORE_ADDR sp, sigcontext_addr, addr;
   int regnum;
 
   /* We find the appropriate instance of `struct sigcontext' at a
      fixed offset in the signal frame.  */
-  sp = frame_unwind_register_signed (next_frame,
-                                    MIPS_SP_REGNUM
-                                    + gdbarch_num_regs (current_gdbarch));
+  sp = get_frame_register_signed (this_frame,
+                                 MIPS_SP_REGNUM + gdbarch_num_regs (gdbarch));
   sigcontext_addr = sp + 32;
 
   /* PC.  */
   regnum = mips_regnum (gdbarch)->pc;
   trad_frame_set_reg_addr (cache,
-                          regnum + gdbarch_num_regs (current_gdbarch),
+                          regnum + gdbarch_num_regs (gdbarch),
                            sigcontext_addr + 16);
 
   /* GPRs.  */
   for (regnum = MIPS_AT_REGNUM, addr = sigcontext_addr + 32;
        regnum <= MIPS_RA_REGNUM; regnum++, addr += 8)
     trad_frame_set_reg_addr (cache,
-                            regnum + gdbarch_num_regs (current_gdbarch),
+                            regnum + gdbarch_num_regs (gdbarch),
                             addr);
 
   /* HI and LO.  */
   regnum = mips_regnum (gdbarch)->lo;
   trad_frame_set_reg_addr (cache,
-                          regnum + gdbarch_num_regs (current_gdbarch),
+                          regnum + gdbarch_num_regs (gdbarch),
                           sigcontext_addr + 280);
   regnum = mips_regnum (gdbarch)->hi;
   trad_frame_set_reg_addr (cache,
-                          regnum + gdbarch_num_regs (current_gdbarch),
+                          regnum + gdbarch_num_regs (gdbarch),
                           sigcontext_addr + 288);
 
   /* TODO: Handle the floating-point registers.  */