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

        references to struct frame_info fields by calls to the equivalent
        accessors. Necessary now that frame_info is opaque.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 763c53b..1a9aab7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2003-06-03  J. Brobecker  <brobecker@gnat.com>
 
+       * alpha-osf1-tdep.c (alpha_osf1_sigcontext_addr): Replace
+       references to struct frame_info fields by calls to the equivalent
+       accessors. Necessary now that frame_info is opaque.
+
+2003-06-03  J. Brobecker  <brobecker@gnat.com>
+
        * alpha-osf1-tdep.c (alpha_osf1_skip_sigtramp_frame): Delete.
        (alpha_osf1_init_abi): Do not set skip_sigtramp_frame in tdep
        structure, field no longer exists.

diff --git a/gdb/alpha-osf1-tdep.c b/gdb/alpha-osf1-tdep.c
index 29b5c08..8cd112d 100644 (file)
--- a/gdb/alpha-osf1-tdep.c
+++ b/gdb/alpha-osf1-tdep.c
@@ -37,8 +37,12 @@ alpha_osf1_pc_in_sigtramp (CORE_ADDR pc, char *func_name)
 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