diff options
| -rw-r--r-- | llvm/lib/Target/X86/AsmParser/X86Operand.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/MC/X86/x86-32-coverage.s | 7 |
4 files changed, 16 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/AsmParser/X86Operand.h b/llvm/lib/Target/X86/AsmParser/X86Operand.h index a04c2f5c84a..9db1a8483be 100644 --- a/llvm/lib/Target/X86/AsmParser/X86Operand.h +++ b/llvm/lib/Target/X86/AsmParser/X86Operand.h @@ -192,8 +192,10 @@ struct X86Operand : public MCParsedAsmOperand { bool isImmUnsignedi8() const { if (!isImm()) return false; + // If this isn't a constant expr, just assume it fits and let relaxation + // handle it. const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(getImm()); - if (!CE) return false; + if (!CE) return true; return isImmUnsignedi8Value(CE->getValue()); } diff --git a/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp b/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp index 3a5d056888a..10b7e6ff5ee 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp +++ b/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp @@ -291,6 +291,9 @@ void X86ATTInstPrinter::printMemOffset(const MCInst *MI, unsigned Op, void X86ATTInstPrinter::printU8Imm(const MCInst *MI, unsigned Op, raw_ostream &O) { + if (MI->getOperand(Op).isExpr()) + return printOperand(MI, Op, O); + O << markup("<imm:") << '$' << formatImm(MI->getOperand(Op).getImm() & 0xff) << markup(">"); } diff --git a/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp b/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp index 879378fc7a9..4443edb8e34 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp +++ b/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp @@ -253,5 +253,8 @@ void X86IntelInstPrinter::printMemOffset(const MCInst *MI, unsigned Op, void X86IntelInstPrinter::printU8Imm(const MCInst *MI, unsigned Op, raw_ostream &O) { + if (MI->getOperand(Op).isExpr()) + return MI->getOperand(Op).getExpr()->print(O, &MAI); + O << formatImm(MI->getOperand(Op).getImm() & 0xff); } diff --git a/llvm/test/MC/X86/x86-32-coverage.s b/llvm/test/MC/X86/x86-32-coverage.s index 10a1288bd57..357034cfcf8 100644 --- a/llvm/test/MC/X86/x86-32-coverage.s +++ b/llvm/test/MC/X86/x86-32-coverage.s @@ -1,4 +1,5 @@ // RUN: llvm-mc -triple i386-unknown-unknown %s --show-encoding | FileCheck %s +// RUN: llvm-mc -triple i386-unknown-unknown -output-asm-variant=1 %s | FileCheck --check-prefix=INTEL %s // CHECK: flds (%edi) // CHECK: encoding: [0xd9,0x07] @@ -1416,6 +1417,12 @@ // CHECK: encoding: [0xd1,0x0d,0x78,0x56,0x34,0x12] rorl 0x12345678 +// CHECK: rorl $foo, (%ebx) +// INTEL: ror dword ptr [ebx], foo +// CHECK: encoding: [0xc1,0x0b,A] +// CHECK: fixup A - offset: 2, value: foo, kind: FK_Data_1 + rorl $foo, (%ebx) + // CHECK: shll $0, 3735928559(%ebx,%ecx,8) // CHECK: encoding: [0xc1,0xa4,0xcb,0xef,0xbe,0xad,0xde,0x00] sall $0,0xdeadbeef(%ebx,%ecx,8) |
