Skip to content

Commit 29e4fcc

Browse files
committed
[riscv] Fix the disassembler's handling of C.LUI when imm=0
According to the RISC-V spec: "C.LUI is valid only when rd≠{x0,x2}, and when the immediate is not equal to zero. The code points with imm=0 are reserved". This change makes the disassembler consider code points with imm=0 as illegal. It introduces a test which exercises every C.LUI opcode including the illegal ones but excluding those assigned to C.ADDI16SP). Output for +c, +c +Zcmop, and +c +no-rvc-hints is checked.
1 parent 4277255 commit 29e4fcc

File tree

2 files changed

+2076
-0
lines changed

2 files changed

+2076
-0
lines changed

llvm/lib/Target/RISCV/Disassembler/RISCVDisassembler.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@ static DecodeStatus decodeCLUIImmOperand(MCInst &Inst, uint32_t Imm,
453453
int64_t Address,
454454
const MCDisassembler *Decoder) {
455455
assert(isUInt<6>(Imm) && "Invalid immediate");
456+
if (Imm == 0) {
457+
return MCDisassembler::Fail;
458+
}
456459
if (Imm > 31) {
457460
Imm = (SignExtend64<6>(Imm) & 0xfffff);
458461
}

0 commit comments

Comments
 (0)