Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-01 12:43:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[RISCV][MC]Add support for Binary MCExpr

Browse Source 
There is an issue: https://github.com/llvm/llvm-project/issues/64612
This issue happens because in RISCVMCCodeEmitter::getImmOpValue it only handles MCExpr kind Target and SymbolRef.
When code with format like .+ comes in, it comes with MCExpr kind Binary, the fixupkind remains fixup_riscv_invalid and reports error.

This patch make MCExpr kind Binary handled with the same way as MCExpr kind SymbolRef,
so code with binary expression can get correct fixupkind and be used to generate more complex relocation.

Differential Revision: https://reviews.llvm.org/D157694
This commit is contained in:
Yunze Zhu 2023-08-25 09:57:20 +08:00
parent 4b7a08f0f8
commit 544535976d
5 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp
View File

@ -442,8 +442,11 @@ unsigned RISCVMCCodeEmitter::getImmOpValue(const MCInst &MI, unsigned OpNo,
RelaxCandidate = true;
break;
}
} else if (Kind == MCExpr::SymbolRef &&
cast<MCSymbolRefExpr>(Expr)->getKind() == MCSymbolRefExpr::VK_None) {
} else if ((Kind == MCExpr::SymbolRef &&
cast<MCSymbolRefExpr>(Expr)->getKind() ==
MCSymbolRefExpr::VK_None) ||
Kind == MCExpr::Binary) {
// FIXME: Sub kind binary exprs have chance of underflow.
if (MIFrm == RISCVII::InstFormatJ) {
FixupKind = RISCV::fixup_riscv_jal;
} else if (MIFrm == RISCVII::InstFormatB) {

31
llvm/test/MC/RISCV/fixups-binary-expression.s Normal file
View File

@ -0,0 +1,31 @@
# RUN: llvm-mc -triple riscv32 -mattr=+c -riscv-no-aliases < %s -show-encoding \
# RUN: | FileCheck -check-prefix=CHECK-FIXUP %s
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \
# RUN: | llvm-objdump -M no-aliases -d - \
# RUN: | FileCheck -check-prefix=CHECK-INSTR %s
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+relax < %s \
# RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s
.LBB0:
.LBB1:
jal zero, .LBB0+16
# CHECK-FIXUP: fixup A - offset: 0, value: .LBB0+16, kind: fixup_riscv_jal
# CHECK-INSTR: jal zero, 0x10
# CHECK-RELOC: R_RISCV_JAL
beq a0, a1, .LBB1+32
# CHECK-FIXUP: fixup A - offset: 0, value: .LBB1+32, kind: fixup_riscv_branch
# CHECK-INSTR: beq a0, a1, 0x20
# CHECK-RELOC: R_RISCV_BRANCH
c.j .+32
# CHECK: fixup A - offset: 0, value: .Ltmp0+32, kind: fixup_riscv_rvc_jump
# CHECK-INSTR: c.j 0x28
# CHECK-RELOC: R_RISCV_RVC_JUMP
c.beqz a0, .-2
# CHECK-FIXUP: fixup A - offset: 0, value: .Ltmp1-2, kind: fixup_riscv_rvc_branch
# CHECK-INSTR: c.beqz a0, 0x8
# CHECK-RELOC: R_RISCV_RVC_BRANCH

2
llvm/test/MC/RISCV/fixups-invalid.s
View File

@ -13,3 +13,5 @@
.equ CONST, .Lbuf_end - .Lbuf
# CHECK: error: operand must be a constant 12-bit integer
li a0, CONST
# CHECK: error: operand must be a constant 12-bit integer
li a0, .Lbuf_end - .Lbuf

5
llvm/test/MC/RISCV/rv32i-aliases-valid.s
View File

@ -113,6 +113,11 @@ li a0, CONST
# CHECK-OBJ-NOALIAS: addi a0, zero, 8
li a0, CONST
# CHECK-ASM: addi a0, zero, .Lbuf_end-.Lbuf
# CHECK-ASM-NOALIAS: addi a0, zero, .Lbuf_end-.Lbuf
# CHECK-OBJ-NOALIAS: addi a0, zero, 8
li a0, .Lbuf_end - .Lbuf
# CHECK-INST: addi a0, zero, 0
# CHECK-ALIAS: li a0, 0
la x10, 0

5
llvm/test/MC/RISCV/rv64i-aliases-valid.s
View File

@ -225,6 +225,11 @@ li a0, CONST
# CHECK-OBJ-NOALIAS: addi a0, zero, 8
li a0, CONST
# CHECK-ASM: addi a0, zero, .Lbuf_end-.Lbuf
# CHECK-ASM-NOALIAS: addi a0, zero, .Lbuf_end-.Lbuf
# CHECK-OBJ-NOALIAS: addi a0, zero, 8
li a0, .Lbuf_end - .Lbuf
# CHECK-INST: addi a0, zero, 0
# CHECK-ALIAS: li a0, 0
la x10, 0