daily update

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

diff --git a/gdb/m68kbsd-tdep.c b/gdb/m68kbsd-tdep.c
index 69fdf80306195eed201ae42cc458798b306d3e9e..f0478e6d3f56eb231ac089723643779d47405115 100644 (file)
--- a/gdb/m68kbsd-tdep.c
+++ b/gdb/m68kbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Motorola 68000 BSD's.
 
-   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -136,24 +136,24 @@ m68kbsd_regset_from_core_section (struct gdbarch *gdbarch,
 
 static void
 m68kobsd_sigtramp_cache_init (const struct tramp_frame *self,
-                             struct frame_info *next_frame,
+                             struct frame_info *this_frame,
                              struct trad_frame_cache *this_cache,
                              CORE_ADDR func)
 {
   CORE_ADDR addr, base, pc;
   int regnum;
 
-  base = frame_unwind_register_unsigned (next_frame, M68K_SP_REGNUM);
+  base = get_frame_register_unsigned (this_frame, M68K_SP_REGNUM);
 
   /* The 'addql #4,%sp' instruction at offset 8 adjusts the stack
      pointer.  Adjust the frame base accordingly.  */
-  pc = frame_unwind_register_unsigned (next_frame, M68K_PC_REGNUM);
+  pc = get_frame_register_unsigned (this_frame, M68K_PC_REGNUM);
   if ((pc - func) > 8)
     base -= 4;
 
   /* Get frame pointer, stack pointer, program counter and processor
      state from `struct sigcontext'.  */
-  addr = get_frame_memory_unsigned (next_frame, base + 8, 4);
+  addr = get_frame_memory_unsigned (this_frame, base + 8, 4);
   trad_frame_set_reg_addr (this_cache, M68K_FP_REGNUM, addr + 8);
   trad_frame_set_reg_addr (this_cache, M68K_SP_REGNUM, addr + 12);
   trad_frame_set_reg_addr (this_cache, M68K_PC_REGNUM, addr + 20);
@@ -161,7 +161,7 @@ m68kobsd_sigtramp_cache_init (const struct tramp_frame *self,
 
   /* The sc_ap member of `struct sigcontext' points to additional
      hardware state.  Here we find the missing registers.  */
-  addr = get_frame_memory_unsigned (next_frame, addr + 16, 4) + 4;
+  addr = get_frame_memory_unsigned (this_frame, addr + 16, 4) + 4;
   for (regnum = M68K_D0_REGNUM; regnum < M68K_FP_REGNUM; regnum++, addr += 4)
     trad_frame_set_reg_addr (this_cache, regnum, addr);