From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id 74DD83858D32; Sat, 3 Jun 2023 17:12:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74DD83858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685812324; bh=0hEFTRS1369zx5UHsJdW1rbAD1MiteeCQtixm+Pc524=; h=From:To:Subject:Date:From; b=V8aCqvd0yw7A+1T24Qyq+wGDI0zwwNx0KT89obigNzCfkMvn4+XIgLiJx/rqd6OdD CiNFuZRoRtzVIEmfnYNsUXK5uARiiSr7BEZfkWNCtvFowKMirROshUdpEGmy6qB9lx IBhS+eLxLbPSjPlMwfKwDDbhKsNAlSjDdFFdzAbg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jeff Law To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-1523] [RISC-V] fix cfi issue in save-restore. X-Act-Checkin: gcc X-Git-Author: Fei Gao X-Git-Refname: refs/heads/master X-Git-Oldrev: e1d2493f5912c340b50f49e4c2d928870faa172b X-Git-Newrev: 5681872057f0b725ec8a7c8a1eec8fee205ad673 Message-Id: <20230603171204.74DD83858D32@sourceware.org> Date: Sat, 3 Jun 2023 17:12:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5681872057f0b725ec8a7c8a1eec8fee205ad673 commit r14-1523-g5681872057f0b725ec8a7c8a1eec8fee205ad673 Author: Fei Gao Date: Sat Jun 3 11:11:18 2023 -0600 [RISC-V] fix cfi issue in save-restore. 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. Diff: --- 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..caa7858b864 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;