public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Richard Sandiford <rsandifo@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10994] aarch64: Rename hard_fp_offset to bytes_above_hard_fp Date: Tue, 12 Sep 2023 15:21:00 +0000 (GMT) [thread overview] Message-ID: <20230912152100.41CD8385843A@sourceware.org> (raw) https://gcc.gnu.org/g:fa6600b55b49ee14d8288f13719ceea2a75eea60 commit r11-10994-gfa6600b55b49ee14d8288f13719ceea2a75eea60 Author: Richard Sandiford <richard.sandiford@arm.com> Date: Tue Sep 12 16:19:47 2023 +0100 aarch64: Rename hard_fp_offset to bytes_above_hard_fp Similarly to the previous locals_offset patch, hard_fp_offset was described as: /* Offset from the base of the frame (incomming SP) to the hard_frame_pointer. This value is always a multiple of STACK_BOUNDARY. */ poly_int64 hard_fp_offset; which again took an “upside-down” view: higher offsets meant lower addresses. This patch renames the field to bytes_above_hard_fp instead. gcc/ * config/aarch64/aarch64.h (aarch64_frame::hard_fp_offset): Rename to... (aarch64_frame::bytes_above_hard_fp): ...this. * config/aarch64/aarch64.c (aarch64_layout_frame) (aarch64_expand_prologue): Update accordingly. (aarch64_initial_elimination_offset): Likewise. Diff: --- gcc/config/aarch64/aarch64.c | 26 +++++++++++++------------- gcc/config/aarch64/aarch64.h | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index d54f7a89306f..23cb084e5a75 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -7588,7 +7588,7 @@ aarch64_layout_frame (void) + get_frame_size (), STACK_BOUNDARY / BITS_PER_UNIT); - frame.hard_fp_offset + frame.bytes_above_hard_fp = saved_regs_and_above - frame.below_hard_fp_saved_regs_size; /* Both these values are already aligned. */ @@ -7609,13 +7609,13 @@ aarch64_layout_frame (void) else if (frame.wb_candidate1 != INVALID_REGNUM) max_push_offset = 256; - HOST_WIDE_INT const_size, const_below_saved_regs, const_fp_offset; + HOST_WIDE_INT const_size, const_below_saved_regs, const_above_fp; HOST_WIDE_INT const_saved_regs_size; if (known_eq (frame.saved_regs_size, 0)) frame.initial_adjust = frame.frame_size; else if (frame.frame_size.is_constant (&const_size) && const_size < max_push_offset - && known_eq (frame.hard_fp_offset, const_size)) + && known_eq (frame.bytes_above_hard_fp, const_size)) { /* Simple, small frame with no data below the saved registers. @@ -7632,8 +7632,8 @@ aarch64_layout_frame (void) case that it hardly seems worth the effort though. */ && (!saves_below_hard_fp_p || const_below_saved_regs == 0) && !(cfun->calls_alloca - && frame.hard_fp_offset.is_constant (&const_fp_offset) - && const_fp_offset < max_push_offset)) + && frame.bytes_above_hard_fp.is_constant (&const_above_fp) + && const_above_fp < max_push_offset)) { /* Frame with small area below the saved registers: @@ -7651,12 +7651,12 @@ aarch64_layout_frame (void) sub sp, sp, hard_fp_offset + below_hard_fp_saved_regs_size save SVE registers relative to SP sub sp, sp, bytes_below_saved_regs */ - frame.initial_adjust = (frame.hard_fp_offset + frame.initial_adjust = (frame.bytes_above_hard_fp + frame.below_hard_fp_saved_regs_size); frame.final_adjust = frame.bytes_below_saved_regs; } - else if (frame.hard_fp_offset.is_constant (&const_fp_offset) - && const_fp_offset < max_push_offset) + else if (frame.bytes_above_hard_fp.is_constant (&const_above_fp) + && const_above_fp < max_push_offset) { /* Frame with large area below the saved registers, or with SVE saves, but with a small area above: @@ -7666,7 +7666,7 @@ aarch64_layout_frame (void) [sub sp, sp, below_hard_fp_saved_regs_size] [save SVE registers relative to SP] sub sp, sp, bytes_below_saved_regs */ - frame.callee_adjust = const_fp_offset; + frame.callee_adjust = const_above_fp; frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; frame.final_adjust = frame.bytes_below_saved_regs; } @@ -7681,7 +7681,7 @@ aarch64_layout_frame (void) [sub sp, sp, below_hard_fp_saved_regs_size] [save SVE registers relative to SP] sub sp, sp, bytes_below_saved_regs */ - frame.initial_adjust = frame.hard_fp_offset; + frame.initial_adjust = frame.bytes_above_hard_fp; frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; frame.final_adjust = frame.bytes_below_saved_regs; } @@ -8981,7 +8981,7 @@ aarch64_expand_prologue (void) { /* The offset of the frame chain record (if any) from the current SP. */ poly_int64 chain_offset = (initial_adjust + callee_adjust - - frame.hard_fp_offset); + - frame.bytes_above_hard_fp); gcc_assert (known_ge (chain_offset, 0)); if (callee_adjust == 0) @@ -11755,10 +11755,10 @@ aarch64_initial_elimination_offset (unsigned from, unsigned to) if (to == HARD_FRAME_POINTER_REGNUM) { if (from == ARG_POINTER_REGNUM) - return frame.hard_fp_offset; + return frame.bytes_above_hard_fp; if (from == FRAME_POINTER_REGNUM) - return frame.hard_fp_offset - frame.bytes_above_locals; + return frame.bytes_above_hard_fp - frame.bytes_above_locals; } if (to == STACK_POINTER_REGNUM) diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h index 3c5e3dd429dc..9291cfd3ec8b 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -856,10 +856,10 @@ struct GTY (()) aarch64_frame STACK_BOUNDARY. */ poly_int64 bytes_above_locals; - /* Offset from the base of the frame (incomming SP) to the - hard_frame_pointer. This value is always a multiple of + /* The number of bytes between the hard_frame_pointer and the top of + the frame (the incomming SP). This value is always a multiple of STACK_BOUNDARY. */ - poly_int64 hard_fp_offset; + poly_int64 bytes_above_hard_fp; /* The size of the frame. This value is the offset from base of the frame (incomming SP) to the stack_pointer. This value is always
reply other threads:[~2023-09-12 15:21 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230912152100.41CD8385843A@sourceware.org \ --to=rsandifo@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /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: linkBe 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).