diff options
| -rw-r--r-- | llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp | 23 | ||||
| -rw-r--r-- | llvm/test/MC/Lanai/ctrl-instructions.s | 13 |
2 files changed, 19 insertions, 17 deletions
diff --git a/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp b/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp index 13f8779d6bd..8742cc9b85a 100644 --- a/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp +++ b/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp @@ -195,23 +195,12 @@ public: return false; // Constant case - if (const MCConstantExpr *ConstExpr = dyn_cast<MCConstantExpr>(Imm.Value)) { - int64_t Value = ConstExpr->getValue(); - // Check if value fits in 25 bits with 2 least significant bits 0. - return isShiftedUInt<23, 2>(static_cast<int32_t>(Value)); - } - - // Symbolic reference expression - if (const LanaiMCExpr *SymbolRefExpr = dyn_cast<LanaiMCExpr>(Imm.Value)) - return SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_None; - - // Binary expression - if (const MCBinaryExpr *BinaryExpr = dyn_cast<MCBinaryExpr>(Imm.Value)) - if (const LanaiMCExpr *SymbolRefExpr = - dyn_cast<LanaiMCExpr>(BinaryExpr->getLHS())) - return SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_None; - - return false; + const MCConstantExpr *MCE = dyn_cast<MCConstantExpr>(Imm.Value); + if (!MCE) + return true; + int64_t Value = MCE->getValue(); + // Check if value fits in 25 bits with 2 least significant bits 0. + return isShiftedUInt<23, 2>(static_cast<int32_t>(Value)); } bool isBrTarget() { return isBrImm() || isToken(); } diff --git a/llvm/test/MC/Lanai/ctrl-instructions.s b/llvm/test/MC/Lanai/ctrl-instructions.s new file mode 100644 index 00000000000..05e7a958227 --- /dev/null +++ b/llvm/test/MC/Lanai/ctrl-instructions.s @@ -0,0 +1,13 @@ +// RUN: llvm-mc -triple lanai-unknown-unknown -show-encoding -o - %s | FileCheck %s + +// CHECK: bt .Ltmp0 ! encoding: [0b1110000A,A,A,A] +// CHECK-NEXT: ! fixup A - offset: 0, value: .Ltmp0, kind: FIXUP_LANAI_25 + bt 1f + nop +1: + +// CHECK: bt foo ! encoding: [0b1110000A,A,A,A] +// CHECK-NEXT: ! fixup A - offset: 0, value: foo, kind: FIXUP_LANAI_25 + bt foo + nop + |
