From 19180f356de3e523223d8f33920f2203934c39a4 Mon Sep 17 00:00:00 2001 From: brobecke Date: Wed, 4 Jun 2003 05:20:55 +0000 Subject: [PATCH] * 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. --- gdb/ChangeLog | 6 ++++++ gdb/alpha-osf1-tdep.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 763c53b0b7..1a9aab7ded 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2003-06-03 J. Brobecker + * 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 + * 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 29b5c08ed5..8cd112df56 100644 --- 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 -- 2.11.0