public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH 1/2] [RISC-V] fix cfi issue in save-restore.
@ 2023-06-02 10:42 Fei Gao
  2023-06-02 10:42 ` [PATCH 2/2] [V3] [RISC-V] support cm.push cm.pop cm.popret in zcmp Fei Gao
  2023-06-03 17:12 ` [PATCH 1/2] [RISC-V] fix cfi issue in save-restore Jeff Law
  0 siblings, 2 replies; 6+ messages in thread
From: Fei Gao @ 2023-06-02 10:42 UTC (permalink / raw)
  To: gcc-patches; +Cc: kito.cheng, palmer, jeffreyalaw, sinan.lin, jiawei, Fei Gao

This patch fixes a cfi issue introduced by
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=60524be1e3929d83e15fceac6e2aa053c8a6fb20

Test code:
char my_getchar();
float getf();
int test_f0()
{
  int s0 = my_getchar();
  float f0 = getf();
  int b = my_getchar();
  return f0+s0+b;
}

cflags: -g -Os -march=rv32imafc -mabi=ilp32f -msave-restore -mcmodel=medlow

before patch:
test_f0:
...
	.cfi_startproc
	call	t0,__riscv_save_1
	.cfi_offset 8, -8
	.cfi_offset 1, -4
	.cfi_def_cfa_offset 16
...
	addi	sp,sp,-16
	.cfi_def_cfa_offset 32

...

	addi	sp,sp,16
	.cfi_def_cfa_offset 0  // issue here
...
	tail	__riscv_restore_1
	.cfi_restore 8
	.cfi_restore 1
	.cfi_def_cfa_offset -16 // issue here
	.cfi_endproc

after patch:
test_f0:
...
	.cfi_startproc
	call	t0,__riscv_save_1
	.cfi_offset 8, -8
	.cfi_offset 1, -4
	.cfi_def_cfa_offset 16
...
	addi	sp,sp,-16
	.cfi_def_cfa_offset 32

...

	addi	sp,sp,16
	.cfi_def_cfa_offset 16  // corrected here
...
	tail	__riscv_restore_1
	.cfi_restore 8
	.cfi_restore 1
	.cfi_def_cfa_offset 0 // corrected here
	.cfi_endproc

gcc/ChangeLog:

        * config/riscv/riscv.cc (riscv_expand_epilogue): fix cfi issue with correct offset.
---
 gcc/config/riscv/riscv.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 85db1e3c86b..469af02bdf7 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -5652,7 +5652,7 @@ riscv_expand_epilogue (int style)
 					   adjust));
 	  rtx dwarf = NULL_RTX;
 	  rtx cfa_adjust_rtx = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
-					     GEN_INT (step2));
+					     GEN_INT (step2 + libcall_size));
 
 	  dwarf = alloc_reg_note (REG_CFA_DEF_CFA, cfa_adjust_rtx, dwarf);
 	  RTX_FRAME_RELATED_P (insn) = 1;
@@ -5689,7 +5689,7 @@ riscv_expand_epilogue (int style)
 
       rtx dwarf = NULL_RTX;
       rtx cfa_adjust_rtx = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
-					 const0_rtx);
+					 GEN_INT (libcall_size ));
       dwarf = alloc_reg_note (REG_CFA_DEF_CFA, cfa_adjust_rtx, dwarf);
       RTX_FRAME_RELATED_P (insn) = 1;
 
-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-06-05  8:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-02 10:42 [PATCH 1/2] [RISC-V] fix cfi issue in save-restore Fei Gao
2023-06-02 10:42 ` [PATCH 2/2] [V3] [RISC-V] support cm.push cm.pop cm.popret in zcmp Fei Gao
2023-06-05  8:31   ` Kito Cheng
2023-06-05  8:41     ` jiawei
2023-06-05  8:44     ` Fei Gao
2023-06-03 17:12 ` [PATCH 1/2] [RISC-V] fix cfi issue in save-restore Jeff Law

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).