From f870b49bafa1e37c9fa7b42e7904d1fa57825c57 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 10 Apr 2003 13:15:50 +0000 Subject: [PATCH] * i386-cygwin-tdep.c (i386_cygwin_frame_chain): New function. (i386_cygwin_init_abi): Set i386_cygwin_frame_chain as new frame_chain function. * Makefile.in: Add dependencies due to above change. --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 2 +- gdb/i386-cygwin-tdep.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 01f2f335f21..642634f3d22 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2003-04-10 Corinna Vinschen + + * i386-cygwin-tdep.c (i386_cygwin_frame_chain): New function. + (i386_cygwin_init_abi): Set i386_cygwin_frame_chain as new + frame_chain function. + * Makefile.in: Add dependencies due to above change. + 2003-04-10 Corinna Vinschen * blockframe.c (legacy_frame_chain_valid): Move call to diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 21255fe9142..4a13551c8e5 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1798,7 +1798,7 @@ i386gnu-tdep.o: i386gnu-tdep.c $(defs_h) $(i386_tdep_h) $(osabi_h) i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \ $(regcache_h) $(target_h) $(i386_tdep_h) $(osabi_h) i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(gdb_string_h) \ - $(i386_tdep_h) $(osabi_h) + $(i386_tdep_h) $(osabi_h) $(gdbcore_h) $(frame_h) $(dummy_frame_h) i386nbsd-tdep.o: i386nbsd-tdep.c $(defs_h) $(gdbtypes_h) $(gdbcore_h) \ $(regcache_h) $(arch_utils_h) $(i386_tdep_h) $(i387_tdep_h) \ $(nbsd_tdep_h) $(solib_svr4_h) $(osabi_h) diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c index b07911b3b33..5911ec9b91a 100644 --- a/gdb/i386-cygwin-tdep.c +++ b/gdb/i386-cygwin-tdep.c @@ -20,8 +20,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "defs.h" #include "gdb_string.h" +#include "gdbcore.h" #include "i386-tdep.h" #include "osabi.h" +#include "frame.h" +#include "dummy-frame.h" + +static int +i386_cygwin_frame_chain_valid (CORE_ADDR chain, struct frame_info *thisframe) +{ + /* In the context where this is used, we get the saved PC before we've + successfully unwound far enough to be sure what we've got (it may + be a signal handler caller). If we're dealing with a signal + handler caller, this will return valid, which is fine. If not, + it'll make the correct test. */ + return ((get_frame_type (thisframe) == SIGTRAMP_FRAME) || chain != 0); +} +/* Return the chain-pointer for FRAME. In the case of the i386, the + frame's nominal address is the address of a 4-byte word containing + the calling frame's address. */ +static CORE_ADDR +i386_cygwin_frame_chain (struct frame_info *frame) +{ + if (pc_in_dummy_frame (get_frame_pc (frame))) + return get_frame_base (frame); + + if (get_frame_type (frame) == SIGTRAMP_FRAME + || i386_frameless_signal_p (frame)) + return get_frame_base (frame); + + return read_memory_unsigned_integer (get_frame_base (frame), 4); +} static void i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) @@ -29,6 +58,8 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); tdep->struct_return = reg_struct_return; + set_gdbarch_deprecated_frame_chain (gdbarch, i386_cygwin_frame_chain); + set_gdbarch_deprecated_frame_chain_valid (gdbarch, i386_cygwin_frame_chain_valid); } static enum gdb_osabi -- 2.30.2