From d65f787a5f885fae7ca5919b1bccdc56a7d3a0d4 Mon Sep 17 00:00:00 2001 From: Ahmed Bougacha Date: Wed, 3 Dec 2014 02:03:26 +0000 Subject: [PATCH] [X86][MC] Intel syntax: accept implicit memory operand sizes larger than 80. The X86AsmParser intel handling was refactored in r216481, making it try each different memory operand size to see which one matches. Operand sizes larger than 80 ("[xyz]mmword ptr") were forgotten, which led to an "invalid operand" error for code such as: movdqa [rax], xmm0 llvm-svn: 223187 --- llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 2 +- llvm/test/MC/X86/intel-syntax-unsized-memory.s | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 llvm/test/MC/X86/intel-syntax-unsized-memory.s diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp index 8ef2a55..65ceb62 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -2626,7 +2626,7 @@ bool X86AsmParser::MatchAndEmitIntelInstruction(SMLoc IDLoc, unsigned &Opcode, SmallVector Match; uint64_t ErrorInfoMissingFeature = 0; if (UnsizedMemOp && UnsizedMemOp->isMemUnsized()) { - static const unsigned MopSizes[] = {8, 16, 32, 64, 80}; + static const unsigned MopSizes[] = {8, 16, 32, 64, 80, 128, 256, 512}; for (unsigned Size : MopSizes) { UnsizedMemOp->Mem.Size = Size; uint64_t ErrorInfoIgnore; diff --git a/llvm/test/MC/X86/intel-syntax-unsized-memory.s b/llvm/test/MC/X86/intel-syntax-unsized-memory.s new file mode 100644 index 0000000..3467f8f --- /dev/null +++ b/llvm/test/MC/X86/intel-syntax-unsized-memory.s @@ -0,0 +1,26 @@ +// RUN: llvm-mc -triple x86_64-unknown-unknown -x86-asm-syntax=intel -mcpu=knl %s | FileCheck %s + +// Check that we deduce unsized memory operands in the general, unambiguous, case. +// We can't deduce xword memory operands, because there is no instruction +// unambiguously accessing 80-bit memory. + +// CHECK: movb %al, (%rax) +mov [rax], al + +// CHECK: movw %ax, (%rax) +mov [rax], ax + +// CHECK: movl %eax, (%rax) +mov [rax], eax + +// CHECK: movq %rax, (%rax) +mov [rax], rax + +// CHECK: movdqa %xmm0, (%rax) +movdqa [rax], xmm0 + +// CHECK: vmovdqa %ymm0, (%rax) +vmovdqa [rax], ymm0 + +// CHECK: vaddps (%rax), %zmm1, %zmm1 +vaddps zmm1, zmm1, [rax] -- 2.7.4