diff options
Diffstat (limited to 'gdb/i386-interix-tdep.c')
| -rw-r--r-- | gdb/i386-interix-tdep.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gdb/i386-interix-tdep.c b/gdb/i386-interix-tdep.c index ff310ec..7dce6b0 100644 --- a/gdb/i386-interix-tdep.c +++ b/gdb/i386-interix-tdep.c @@ -131,16 +131,16 @@ i386_interix_frame_chain_valid (CORE_ADDR chain, struct frame_info *thisframe) 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 (thisframe->signal_handler_caller + return ((get_frame_type (thisframe) == SIGTRAMP_FRAME) || (chain != 0 && !inside_entry_file (read_memory_integer (thisframe->frame + 4, 4)))); } -/* We want to find the previous frame, which on Interix is tricky when signals - are involved; set frame->frame appropriately, and also get the pc - and tweak signal_handler_caller; this replaces a boatload of nested - macros, as well. */ +/* We want to find the previous frame, which on Interix is tricky when + signals are involved; set frame->frame appropriately, and also get + the pc and tweak tye frame's type; this replaces a boatload of + nested macros, as well. */ static void i386_interix_back_one_frame (int fromleaf, struct frame_info *frame) { @@ -169,7 +169,7 @@ i386_interix_back_one_frame (int fromleaf, struct frame_info *frame) NullApi or something else? */ ra = SAVED_PC_AFTER_CALL (frame); if (ra >= null_start && ra < null_end) - frame->signal_handler_caller = 1; + deprecated_set_frame_type (frame, SIGTRAMP_FRAME); /* There might also be an indirect call to the mini-frame, putting one more return address on the stack. (XP only, I think?) This can't (reasonably) return the address of the @@ -177,12 +177,12 @@ i386_interix_back_one_frame (int fromleaf, struct frame_info *frame) is safe. */ ra = read_memory_unsigned_integer (read_register (SP_REGNUM) + 4, 4); if (ra >= null_start && ra < null_end) - frame->signal_handler_caller = 1; + deprecated_set_frame_type (frame, SIGTRAMP_FRAME); } return; } - if (!frame->next->signal_handler_caller) + if (!(get_frame_type (frame->next) == SIGTRAMP_FRAME)) { frame->pc = read_memory_integer (frame->next->frame + 4, 4); return; @@ -316,7 +316,7 @@ i386_interix_frame_saved_pc (struct frame_info *fi) /* Assume that we've already unwound enough to have the caller's address if we're dealing with a signal handler caller (And if that fails, return 0). */ - if (fi->signal_handler_caller) + if ((get_frame_type (fi) == SIGTRAMP_FRAME)) return fi->next ? fi->next->pc : 0; else return read_memory_integer (fi->frame + 4, 4); |