* alpha-osf1-tdep.c (alpha_osf1_sigcontext_addr): Change

        parameter name to make it clear that we already have a next
        frame.  Return the sigcontext from that next frame instead
        of the frame following it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abed469..9acf55d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-01  Joel Brobecker  <brobecker@gnat.com>
+
+       * alpha-osf1-tdep.c (alpha_osf1_sigcontext_addr): Change
+       parameter name to make it clear that we already have a next
+       frame.  Return the sigcontext from that next frame instead
+       of the frame following it.
+
 2004-12-13  Randolph Chung  <tausq@debian.org>
 
        * Makefile.in (pa64solib_h, somsolib_h): Delete.

diff --git a/gdb/alpha-osf1-tdep.c b/gdb/alpha-osf1-tdep.c
index b5879ad..d97f6c1 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