From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1130) id 8E84E38555AB; Tue, 12 Sep 2023 15:10:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E84E38555AB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694531421; bh=4d/75hV1yBw8TO2SOv/KvBXSRdk8DFCb5Hbc3oIUA6A=; h=From:To:Subject:Date:From; b=jGBJVoyk/W/LjPWGimH5YMktsbpaqE015VxGtJPFxwhGI84VQXyASrcezSlZFCvGH RN09Py0ZKnh9oWe/hMlvL+IlbmPLblqJGINIQslLlB2TFzCsC8KDgli98KuTIbKj8R vJT3iTxYTsTB+eiK+v6Ho/z7DdETtCdHh8E4XZik= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Sandiford To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9866] aarch64: Simplify top of frame allocation X-Act-Checkin: gcc X-Git-Author: Richard Sandiford X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 8d5506a8aeb8dd7e8b209a3663b07688478f76b9 X-Git-Newrev: b47766614df3b9df878262efb2ad73aaac108363 Message-Id: <20230912151021.8E84E38555AB@sourceware.org> Date: Tue, 12 Sep 2023 15:10:21 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b47766614df3b9df878262efb2ad73aaac108363 commit r12-9866-gb47766614df3b9df878262efb2ad73aaac108363 Author: Richard Sandiford Date: Tue Sep 12 16:08:53 2023 +0100 aarch64: Simplify top of frame allocation After previous patches, it no longer really makes sense to allocate the top of the frame in terms of varargs_and_saved_regs_size and saved_regs_and_above. gcc/ * config/aarch64/aarch64.cc (aarch64_layout_frame): Simplify the allocation of the top of the frame. Diff: --- gcc/config/aarch64/aarch64.cc | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 97dd077844b4..81935852d5b2 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -8325,23 +8325,16 @@ aarch64_layout_frame (void) frame.saved_regs_size = offset - frame.bytes_below_saved_regs; - poly_int64 varargs_and_saved_regs_size - = frame.saved_regs_size + frame.saved_varargs_size; - - poly_int64 saved_regs_and_above - = aligned_upper_bound (varargs_and_saved_regs_size - + get_frame_size (), - STACK_BOUNDARY / BITS_PER_UNIT); - - frame.bytes_above_hard_fp - = saved_regs_and_above - frame.below_hard_fp_saved_regs_size; + offset += get_frame_size (); + offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); + auto top_of_locals = offset; - /* Both these values are already aligned. */ - gcc_assert (multiple_p (frame.bytes_below_saved_regs, - STACK_BOUNDARY / BITS_PER_UNIT)); - frame.frame_size = saved_regs_and_above + frame.bytes_below_saved_regs; + offset += frame.saved_varargs_size; + gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT)); + frame.frame_size = offset; - frame.bytes_above_locals = frame.saved_varargs_size; + frame.bytes_above_hard_fp = frame.frame_size - frame.bytes_below_hard_fp; + frame.bytes_above_locals = frame.frame_size - top_of_locals; frame.initial_adjust = 0; frame.final_adjust = 0;