diff options
author | Craig Topper <craig.topper@gmail.com> | 2011-12-30 06:23:39 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2011-12-30 06:23:39 +0000 |
commit | 06f554d06ab0f9390d04bcbaabb76f572d940249 (patch) | |
tree | 57e6926f50790b141be81683d379a4429a7e64ae /lib | |
parent | e6a3a2990e3f783c906e9db58e55439cb06f9fa5 (diff) | |
download | llvm-06f554d06ab0f9390d04bcbaabb76f572d940249.tar.gz llvm-06f554d06ab0f9390d04bcbaabb76f572d940249.tar.bz2 llvm-06f554d06ab0f9390d04bcbaabb76f572d940249.tar.xz |
Add disassembler support for VPERMIL2PD and VPERMIL2PS.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147368 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Target/X86/Disassembler/X86DisassemblerDecoder.c | 10 | ||||
-rw-r--r-- | lib/Target/X86/X86InstrXOP.td | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c index 1a24807339..c915df0049 100644 --- a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c +++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c @@ -1472,6 +1472,7 @@ static int readVVVV(struct InternalInstruction* insn) { static int readOperands(struct InternalInstruction* insn) { int index; int hasVVVV, needVVVV; + int sawRegImm = 0; dbgprintf(insn, "readOperands()"); @@ -1500,11 +1501,20 @@ static int readOperands(struct InternalInstruction* insn) { dbgprintf(insn, "We currently don't hande code-offset encodings"); return -1; case ENCODING_IB: + if (sawRegImm) { + // saw a register immediate so don't read again and instead split the previous immediate + // FIXME: This is a hack + insn->immediates[insn->numImmediatesConsumed++] = insn->immediates[insn->numImmediatesConsumed - 1] & 0xf; + break; + } if (readImmediate(insn, 1)) return -1; if (insn->spec->operands[index].type == TYPE_IMM3 && insn->immediates[insn->numImmediatesConsumed - 1] > 7) return -1; + if (insn->spec->operands[index].type == TYPE_XMM128 || + insn->spec->operands[index].type == TYPE_XMM256) + sawRegImm = 1; break; case ENCODING_IW: if (readImmediate(insn, 2)) diff --git a/lib/Target/X86/X86InstrXOP.td b/lib/Target/X86/X86InstrXOP.td index 9ab5a50bd4..aef2c3ac88 100644 --- a/lib/Target/X86/X86InstrXOP.td +++ b/lib/Target/X86/X86InstrXOP.td @@ -237,7 +237,5 @@ multiclass xop5op<bits<8> opc, string OpcodeStr> { []>; } -let isAsmParserOnly = 1 in { - defm VPERMIL2PD : xop5op<0x49, "vpermil2pd">; - defm VPERMIL2PS : xop5op<0x48, "vpermil2ps">; -} +defm VPERMIL2PD : xop5op<0x49, "vpermil2pd">; +defm VPERMIL2PS : xop5op<0x48, "vpermil2ps">; |