From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id C01C73858CDA for ; Fri, 20 Jan 2023 10:25:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C01C73858CDA 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 EABA15C870; Fri, 20 Jan 2023 10:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674210344; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SwaJMm8tVyYHWyECjcQ03popAxJjQ+ljEJPul/15kSg=; b=Rb0TYL0ys0cOs2cx5H4FEAZbU9vBb42MHW6OUFbiK30iYUI9P/WrryiOaUUc7pkv+Z4rwT fv0jlTCTFHGCS1KymApui61I1glOH/knMLVRtlhRqH5FZ8hGlojCvvdJotGsIFcfsw+uy0 odPCb1MM7+KnkJ2nnv9HLxutWrBP49M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674210344; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SwaJMm8tVyYHWyECjcQ03popAxJjQ+ljEJPul/15kSg=; b=AN7dTnH+rC544eKd6VTLqPGBmUyvG6wFZOLGMkJ0b/L/Sbq7773b/VVWo+OB3ZwAn/W2Kt FyBo5Pki3KJ9qYDw== 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 D112B1390C; Fri, 20 Jan 2023 10:25:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0q72MShsymPBUgAAMHmgww (envelope-from ); Fri, 20 Jan 2023 10:25:44 +0000 Message-ID: Date: Fri, 20 Jan 2023 11:25:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH 3/4] [gdb/tdep, aarch64] Fix frame address of last insn in leaf function Content-Language: en-US To: gdb-patches@sourceware.org Cc: Bruno Larsen , Andrew Burgess , Luis Machado References: <20230119104618.15503-1-tdevries@suse.de> <20230119104618.15503-4-tdevries@suse.de> From: Tom de Vries In-Reply-To: <20230119104618.15503-4-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,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: On 1/19/23 11:46, Tom de Vries via Gdb-patches wrote: > diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c > index b576d3b9d99..06349353716 100644 > --- a/gdb/aarch64-tdep.c > +++ b/gdb/aarch64-tdep.c > @@ -996,7 +996,11 @@ aarch64_make_prologue_cache_1 (frame_info_ptr this_frame, > if (unwound_fp == 0) > return; > > - cache->prev_sp = unwound_fp + cache->framesize; > + if (cache->framereg == AARCH64_SP_REGNUM > + && get_frame_register_unsigned (this_frame, AARCH64_FP_REGNUM) == unwound_fp) > + cache->prev_sp = unwound_fp; > + else > + cache->prev_sp = unwound_fp + cache->framesize; > > /* Calculate actual addresses of saved registers using offsets > determined by aarch64_analyze_prologue. */ I came across the aarch64 version of stack_frame_destroyed_p, and realized I can do the fix like this: ... @@ -999,7 +1001,10 @@ aarch64_make_prologue_cache_1 (frame_info_ptr this_frame, if (unwound_fp == 0) return; - cache->prev_sp = unwound_fp + cache->framesize; + cache->prev_sp = unwound_fp; + if (!aarch64_stack_frame_destroyed_p (get_frame_arch (this_frame), + cache->prev_pc)) + cache->prev_sp += cache->framesize; /* Calculate actual addresses of saved registers using offsets determined by aarch64_analyze_prologue. */ ... This fixes both the leaf and non-leaf case. Thanks, - Tom