From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 26E9438493EA for ; Mon, 13 Feb 2023 14:23:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 26E9438493EA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5F63E1F381; Mon, 13 Feb 2023 14:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1676298189; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ykc3BzkngoFAOfC7F+BbefprU8uz+vksTy8xNPsfz6s=; b=BPCF1RSYqUjVbUVtNJ+kK4Ef75zCg6+21JJF0pryRUHMfVjIepQqP6A5tZFWYDFTDWwcD8 RuCmjVLbt8S9LTrS00RHPJRqX7Iq6Cl4+rWvpKfykhKetWsKWqpr3h+aYkG5TZ0GNtot8I rIUBrpGUw7/AWf+g7O9DtKr9Hk7RcAw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1676298189; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ykc3BzkngoFAOfC7F+BbefprU8uz+vksTy8xNPsfz6s=; b=9TUdxvRgtcW8GjiQE1P60VBBkZrhwGmKq49TDx3z/fhpDHFSF6ZqAC9m4I5HIOz6dNXUwI YNIpBbADTi4ncHAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 49893138E6; Mon, 13 Feb 2023 14:23:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YLD3EM1H6mOwfgAAMHmgww (envelope-from ); Mon, 13 Feb 2023 14:23:09 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 2/5] [gdb/tdep] Fix amd64/i386_stack_frame_destroyed_p Date: Mon, 13 Feb 2023 15:23:06 +0100 Message-Id: <20230213142309.24366-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230213142309.24366-1-tdevries@suse.de> References: <20230213142309.24366-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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