Index: alpha-osf1-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-osf1-tdep.c,v
retrieving revision 1.12
diff -u -3 -p -r1.12 alpha-osf1-tdep.c
--- alpha-osf1-tdep.c	3 Jun 2003 23:49:32 -0000	1.12
+++ alpha-osf1-tdep.c	4 Jun 2003 00:19:41 -0000
@@ -37,7 +37,7 @@ alpha_osf1_skip_sigtramp_frame (struct f
 
   find_pc_partial_function (pc, &name, (CORE_ADDR *) NULL, (CORE_ADDR *) NULL);
   if (PC_IN_SIGTRAMP (pc, name))
-    return frame->frame;
+    return get_frame_base (frame);
   return 0;
 }
 
@@ -50,8 +50,12 @@ alpha_osf1_pc_in_sigtramp (CORE_ADDR pc,
 static CORE_ADDR
 alpha_osf1_sigcontext_addr (struct frame_info *frame)
 {
-  return (read_memory_integer (frame->next ? frame->next->frame
-					   : frame->frame, 8));
+  struct frame_info *next_frame = get_next_frame (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));
 }
 
 /* This is the definition of CALL_DUMMY_ADDRESS.  It's a heuristic that is used