From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 2/5] [gdb/tdep] Fix amd64/i386_stack_frame_destroyed_p
Date: Mon, 13 Feb 2023 15:23:06 +0100 [thread overview]
Message-ID: <20230213142309.24366-3-tdevries@suse.de> (raw)
In-Reply-To: <20230213142309.24366-1-tdevries@suse.de>
The use of compunit_epilogue_unwind_valid in both amd64_stack_frame_destroyed_p
and i386_stack_frame_destroyed_p is problematic, in the sense that the
functions no longer match their documented behaviour.
Fix this by moving the use of compunit_epilogue_unwind_valid to
amd64_epilogue_frame_sniffer and i386_epilogue_frame_sniffer. NFC.
---
gdb/amd64-tdep.c | 19 ++++++++++++-------
gdb/i386-tdep.c | 20 ++++++++++++--------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index d2e683b6fa8..0ec9b23922d 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -2903,9 +2903,6 @@ amd64_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR pc)
{
gdb_byte insn;
- if (compunit_epilogue_unwind_valid (find_pc_compunit_symtab (pc)))
- return 0;
-
if (target_read_memory (pc, &insn, 1))
return 0; /* Can't read memory at pc. */
@@ -2920,11 +2917,19 @@ amd64_epilogue_frame_sniffer (const struct frame_unwind *self,
frame_info_ptr this_frame,
void **this_prologue_cache)
{
- if (frame_relative_level (this_frame) == 0)
- return amd64_stack_frame_destroyed_p (get_frame_arch (this_frame),
- get_frame_pc (this_frame));
- else
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
+ CORE_ADDR pc = get_frame_pc (this_frame);
+
+ if (frame_relative_level (this_frame) != 0)
+ /* 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;
+
+ /* Check whether we're in an epilogue. */
+ return amd64_stack_frame_destroyed_p (gdbarch, pc);
}
static struct amd64_frame_cache *
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 3fe548d8c68..5e797d098e8 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -2219,10 +2219,6 @@ static int
i386_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR pc)
{
gdb_byte insn;
-
- if (compunit_epilogue_unwind_valid (find_pc_compunit_symtab (pc)))
- return 0;
-
if (target_read_memory (pc, &insn, 1))
return 0; /* Can't read memory at pc. */
@@ -2237,11 +2233,19 @@ i386_epilogue_frame_sniffer (const struct frame_unwind *self,
frame_info_ptr this_frame,
void **this_prologue_cache)
{
- if (frame_relative_level (this_frame) == 0)
- return i386_stack_frame_destroyed_p (get_frame_arch (this_frame),
- get_frame_pc (this_frame));
- else
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
+ CORE_ADDR pc = get_frame_pc (this_frame);
+
+ if (frame_relative_level (this_frame) != 0)
+ /* 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;
+
+ /* Check whether we're in an epilogue. */
+ return i386_stack_frame_destroyed_p (gdbarch, pc);
}
static struct i386_frame_cache *
--
2.35.3
next prev parent reply other threads:[~2023-02-13 14:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 14:23 [PATCH v2 0/5] [gdb/symtab] Assume epilogue unwind info is valid unless gcc < 4.5.0 Tom de Vries
2023-02-13 14:23 ` [PATCH v2 1/5] [gdb/symtab] Factor out compunit_epilogue_unwind_valid Tom de Vries
2023-02-14 15:56 ` Tom Tromey
2023-02-14 22:36 ` Tom de Vries
2023-02-20 10:27 ` Tom de Vries
2023-02-13 14:23 ` Tom de Vries [this message]
2023-02-13 14:23 ` [PATCH v2 3/5] [gdb/tdep] Add amd64/i386 epilogue override unwinders Tom de Vries
2023-02-13 14:23 ` [PATCH v2 4/5] [gdb/symtab] Trust epilogue unwind info for unknown producer (-g0 case) Tom de Vries
2023-02-13 14:23 ` [PATCH v2 5/5] [gdb/symtab] Trust epilogue unwind info for unknown or non-gcc producer Tom de Vries
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230213142309.24366-3-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).