From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: gcc-patches@gcc.gnu.org
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: [PATCH] PR target/89828 Inernal compiler error on -fno-omit-frame-pointer
Date: Thu, 5 Jan 2023 22:05:53 +0900 [thread overview]
Message-ID: <20230105130553.3434596-1-ysato@users.sourceforge.jp> (raw)
The problem was caused by an erroneous note about creating a stack frame,
which caused the cur_cfa reg to fail to assert with a value other than
the frame pointer.
This fix will generate notes that correctly update cur_cfa.
gcc/config/rx/
* rx.cc (add_pop_cfi_notes): Release the frame pointer if it is used.
(rx_expand_prologue): Redesigned stack pointer and frame pointer update process.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
gcc/config/rx/rx.cc | 50 +++++++++++++++------------------------------
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/gcc/config/rx/rx.cc b/gcc/config/rx/rx.cc
index 412a3a354b0..8c246d42cd8 100644
--- a/gcc/config/rx/rx.cc
+++ b/gcc/config/rx/rx.cc
@@ -1647,16 +1647,20 @@ mark_frame_related (rtx insn)
static void
add_pop_cfi_notes (rtx_insn *insn, unsigned int high, unsigned int low)
{
- rtx t = plus_constant (Pmode, stack_pointer_rtx,
- (high - low + 1) * UNITS_PER_WORD);
+ rtx src = stack_pointer_rtx;
+ rtx t;
+ for (unsigned int i = low; i <= high; i++)
+ {
+ add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (word_mode, i));
+ if (i == FRAME_POINTER_REGNUM)
+ src = frame_pointer_rtx;
+ }
+ t = plus_constant (Pmode, src, (high - low + 1) * UNITS_PER_WORD);
t = gen_rtx_SET (stack_pointer_rtx, t);
add_reg_note (insn, REG_CFA_ADJUST_CFA, t);
RTX_FRAME_RELATED_P (insn) = 1;
- for (unsigned int i = low; i <= high; i++)
- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (word_mode, i));
}
-
static bool
ok_for_max_constant (HOST_WIDE_INT val)
{
@@ -1815,37 +1819,17 @@ rx_expand_prologue (void)
}
}
- /* If needed, set up the frame pointer. */
- if (frame_pointer_needed)
- gen_safe_add (frame_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) frame_size), true);
-
- /* Allocate space for the outgoing args.
- If the stack frame has not already been set up then handle this as well. */
- if (stack_size)
+ if (stack_size || frame_size)
{
- if (frame_size)
- {
- if (frame_pointer_needed)
- gen_safe_add (stack_pointer_rtx, frame_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) stack_size), true);
- else
- gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) (frame_size + stack_size)),
- true);
- }
- else
- gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) stack_size), true);
+ gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
+ GEN_INT (- (HOST_WIDE_INT) (stack_size + frame_size)),
+ true);
}
- else if (frame_size)
+ if (frame_pointer_needed)
{
- if (! frame_pointer_needed)
- gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) frame_size), true);
- else
- gen_safe_add (stack_pointer_rtx, frame_pointer_rtx, NULL_RTX,
- false /* False because the epilogue will use the FP not the SP. */);
+ gen_safe_add (frame_pointer_rtx, stack_pointer_rtx,
+ GEN_INT ((HOST_WIDE_INT) stack_size),
+ true);
}
}
--
2.30.2
next reply other threads:[~2023-01-05 13:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-05 13:05 Yoshinori Sato [this message]
2023-03-11 16:59 ` Jeff Law
2023-03-15 7:51 ` [PATCH v2] " Yoshinori Sato
2023-03-15 22:07 ` Jeff Law
2023-03-19 16:48 ` Jeff Law
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=20230105130553.3434596-1-ysato@users.sourceforge.jp \
--to=ysato@users.sourceforge.jp \
--cc=gcc-patches@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: link
Be 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).