2005-02-17 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / gdb / alpha-osf1-tdep.c

diff --git a/gdb/alpha-osf1-tdep.c b/gdb/alpha-osf1-tdep.c
index c1011c5109fd934169f2540ea895559440e55fba..d97f6c15999c5edea3728aa318abed5333d76719 100644 (file)
--- a/gdb/alpha-osf1-tdep.c
+++ b/gdb/alpha-osf1-tdep.c
@@ -35,14 +35,11 @@ alpha_osf1_pc_in_sigtramp (CORE_ADDR pc, char *func_name)
 }
 
 static CORE_ADDR
-alpha_osf1_sigcontext_addr (struct frame_info *frame)
+alpha_osf1_sigcontext_addr (struct frame_info *next_frame)
 {
-  struct frame_info *next_frame = get_next_frame (frame);
+  const struct frame_id next_id = get_frame_id (next_frame);
 
-  if (next_frame != NULL)
-    return (read_memory_integer (get_frame_base (next_frame), 8));
-  else
-    return (read_memory_integer (get_frame_base (frame), 8));
+  return (read_memory_integer (next_id.stack_addr, 8));
 }
 
 static void
@@ -54,13 +51,13 @@ alpha_osf1_init_abi (struct gdbarch_info info,
   /* Hook into the MDEBUG frame unwinder.  */
   alpha_mdebug_init_abi (info, gdbarch);
 
-  set_gdbarch_pc_in_sigtramp (gdbarch, alpha_osf1_pc_in_sigtramp);
   /* The next/step support via procfs on OSF1 is broken when running
      on multi-processor machines. We need to use software single stepping
      instead.  */
   set_gdbarch_software_single_step (gdbarch, alpha_software_single_step);
 
   tdep->sigcontext_addr = alpha_osf1_sigcontext_addr;
+  tdep->pc_in_sigtramp = alpha_osf1_pc_in_sigtramp;
 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;