aboutsummaryrefslogtreecommitdiff
path: root/llvm/utils/TableGen/X86RecognizableInstr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/utils/TableGen/X86RecognizableInstr.cpp')
-rw-r--r--llvm/utils/TableGen/X86RecognizableInstr.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/llvm/utils/TableGen/X86RecognizableInstr.cpp b/llvm/utils/TableGen/X86RecognizableInstr.cpp
index e4b7c05cfb88..c2ca3791ac36 100644
--- a/llvm/utils/TableGen/X86RecognizableInstr.cpp
+++ b/llvm/utils/TableGen/X86RecognizableInstr.cpp
@@ -125,13 +125,7 @@ RecognizableInstr::RecognizableInstr(DisassemblerTables &tables,
return;
}
- // Special case since there is no attribute class for 64-bit and VEX
- if (Name == "VMASKMOVDQU64") {
- ShouldBeEmitted = false;
- return;
- }
-
- ShouldBeEmitted = true;
+ ShouldBeEmitted = true;
}
void RecognizableInstr::processInstr(DisassemblerTables &tables,
@@ -267,6 +261,11 @@ InstructionContext RecognizableInstr::insnContext() const {
insnContext = IC_VEX_L_OPSIZE;
else if (OpPrefix == X86Local::PD && HasVEX_W)
insnContext = IC_VEX_W_OPSIZE;
+ else if (OpPrefix == X86Local::PD && Is64Bit &&
+ AdSize == X86Local::AdSize32)
+ insnContext = IC_64BIT_VEX_OPSIZE_ADSIZE;
+ else if (OpPrefix == X86Local::PD && Is64Bit)
+ insnContext = IC_64BIT_VEX_OPSIZE;
else if (OpPrefix == X86Local::PD)
insnContext = IC_VEX_OPSIZE;
else if (HasVEX_LPrefix && OpPrefix == X86Local::XS)