[X86] Don't allow gather/scatter to disassembler if memory operand does not use a...

Fixes PR34998.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316282 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
index 6884f2a80def0ae4c95ea26c0c20dfc171045b98..e781c98b0bc94d16a1ab25526114e642941c6c0a 100644 (file)
--- a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
+++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.cpp
@@ -1723,6 +1723,10 @@ static int readOperands(struct InternalInstruction* insn) {
       if (readModRM(insn))
         return -1;
 
+      // Reject if SIB wasn't used.
+      if (insn->eaBase != EA_BASE_sib && insn->eaBase != EA_BASE_sib64)
+        return -1;
+
       // If sibIndex was set to SIB_INDEX_NONE, index offset is 4.
       if (insn->sibIndex == SIB_INDEX_NONE)
         insn->sibIndex = (SIBIndex)4;

diff --git a/test/MC/Disassembler/X86/gather-novsib.txt b/test/MC/Disassembler/X86/gather-novsib.txt
new file mode 100644 (file)
index 0000000..d14abc1
--- /dev/null
+++ b/test/MC/Disassembler/X86/gather-novsib.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 2>&1 | grep "invalid instruction encoding"
+
+// This corresponds to a gather, but doesn't use a SIB byte.
+0xc4,0xe2,0xe9,0x92,0x08