diff options
Diffstat (limited to 'gdb/amd64-tdep.c')
| -rw-r--r-- | gdb/amd64-tdep.c | 58 |
1 files changed, 51 insertions, 7 deletions
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 75ab1b2..0ae09dc 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -2913,9 +2913,9 @@ amd64_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR pc) } static int -amd64_epilogue_frame_sniffer (const struct frame_unwind *self, - frame_info_ptr this_frame, - void **this_prologue_cache) +amd64_epilogue_frame_sniffer_1 (const struct frame_unwind *self, + frame_info_ptr this_frame, + void **this_prologue_cache, bool override_p) { struct gdbarch *gdbarch = get_frame_arch (this_frame); CORE_ADDR pc = get_frame_pc (this_frame); @@ -2924,14 +2924,45 @@ amd64_epilogue_frame_sniffer (const struct frame_unwind *self, /* We're not in the inner frame, so assume we're not in an epilogue. */ return 0; - if (compunit_epilogue_unwind_valid (find_pc_compunit_symtab (pc))) - /* Don't override the symtab unwinders. */ - return 0; + bool unwind_valid_p + = compunit_epilogue_unwind_valid (find_pc_compunit_symtab (pc)); + if (override_p) + { + if (unwind_valid_p) + /* Don't override the symtab unwinders, skip + "amd64 epilogue override". */ + return 0; + } + else + { + if (!unwind_valid_p) + /* "amd64 epilogue override" unwinder already ran, skip + "amd64 epilogue". */ + return 0; + } /* Check whether we're in an epilogue. */ return amd64_stack_frame_destroyed_p (gdbarch, pc); } +static int +amd64_epilogue_override_frame_sniffer (const struct frame_unwind *self, + frame_info_ptr this_frame, + void **this_prologue_cache) +{ + return amd64_epilogue_frame_sniffer_1 (self, this_frame, this_prologue_cache, + true); +} + +static int +amd64_epilogue_frame_sniffer (const struct frame_unwind *self, + frame_info_ptr this_frame, + void **this_prologue_cache) +{ + return amd64_epilogue_frame_sniffer_1 (self, this_frame, this_prologue_cache, + false); +} + static struct amd64_frame_cache * amd64_epilogue_frame_cache (frame_info_ptr this_frame, void **this_cache) { @@ -3000,6 +3031,17 @@ amd64_epilogue_frame_this_id (frame_info_ptr this_frame, (*this_id) = frame_id_build (cache->base + 16, cache->pc); } +static const struct frame_unwind amd64_epilogue_override_frame_unwind = +{ + "amd64 epilogue override", + NORMAL_FRAME, + amd64_epilogue_frame_unwind_stop_reason, + amd64_epilogue_frame_this_id, + amd64_frame_prev_register, + NULL, + amd64_epilogue_override_frame_sniffer +}; + static const struct frame_unwind amd64_epilogue_frame_unwind = { "amd64 epilogue", @@ -3257,7 +3299,9 @@ amd64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch, /* Hook the function epilogue frame unwinder. This unwinder is appended to the list first, so that it supercedes the other unwinders in function epilogues. */ - frame_unwind_prepend_unwinder (gdbarch, &amd64_epilogue_frame_unwind); + frame_unwind_prepend_unwinder (gdbarch, &amd64_epilogue_override_frame_unwind); + + frame_unwind_append_unwinder (gdbarch, &amd64_epilogue_frame_unwind); /* Hook the prologue-based frame unwinders. */ frame_unwind_append_unwinder (gdbarch, &amd64_sigtramp_frame_unwind); |