59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
|
|
From 4b8f3f194e68d0d411eaa6692699d8e5e2b4217d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Richard Sandiford <richard.sandiford@arm.com>
|
||
|
|
Date: Tue, 12 Sep 2023 16:05:09 +0100
|
||
|
|
Subject: [PATCH 095/157] [Backport][SME] aarch64: Simplify top of frame
|
||
|
|
allocation
|
||
|
|
|
||
|
|
Reference: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=bc9dcdde80915d7585a21daa2b69f4adf4a1e3c1
|
||
|
|
|
||
|
|
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.
|
||
|
|
---
|
||
|
|
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 df8a83b04..3329aa364 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64.cc
|
||
|
|
+++ b/gcc/config/aarch64/aarch64.cc
|
||
|
|
@@ -8925,23 +8925,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;
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|