diff options
| author | Craig Topper <craig.topper@gmail.com> | 2011-09-11 20:23:20 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2011-09-11 20:23:20 +0000 |
| commit | 842f58f9be82e1a0d2751e7982ef3641829acf87 (patch) | |
| tree | b3aa02188d472094eb217e0919796311f773e0b8 /utils | |
| parent | e4481d8ce5aa333b0dc43f307bc8fb47c694e3e2 (diff) | |
| download | llvm-842f58f9be82e1a0d2751e7982ef3641829acf87.tar.gz llvm-842f58f9be82e1a0d2751e7982ef3641829acf87.tar.bz2 llvm-842f58f9be82e1a0d2751e7982ef3641829acf87.tar.xz | |
Fix disassembling of PAUSE instruction. Fixes PR10900. Also fixed NOP disassembling to ignore OpSize and REX.W.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139484 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/TableGen/X86DisassemblerTables.cpp | 6 | ||||
| -rw-r--r-- | utils/TableGen/X86RecognizableInstr.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/utils/TableGen/X86DisassemblerTables.cpp b/utils/TableGen/X86DisassemblerTables.cpp index e0cbb18a4b..aed27279a5 100644 --- a/utils/TableGen/X86DisassemblerTables.cpp +++ b/utils/TableGen/X86DisassemblerTables.cpp @@ -613,8 +613,10 @@ void DisassemblerTables::setTableFields(ModRMDecision &decision, if(newInfo.filtered) continue; // filtered instructions get lowest priority - if(previousInfo.name == "NOOP") - continue; // special case for XCHG32ar and NOOP + if(previousInfo.name == "NOOP" && (newInfo.name == "XCHG16ar" || + newInfo.name == "XCHG32ar" || + newInfo.name == "XCHG64ar")) + continue; // special case for XCHG*ar and NOOP if (outranks(previousInfo.insnContext, newInfo.insnContext)) continue; diff --git a/utils/TableGen/X86RecognizableInstr.cpp b/utils/TableGen/X86RecognizableInstr.cpp index 5f8fe6ee4c..f43a93938b 100644 --- a/utils/TableGen/X86RecognizableInstr.cpp +++ b/utils/TableGen/X86RecognizableInstr.cpp @@ -325,7 +325,7 @@ InstructionContext RecognizableInstr::insnContext() const { insnContext = IC_OPSIZE; else if (Prefix == X86Local::XD) insnContext = IC_XD; - else if (Prefix == X86Local::XS) + else if (Prefix == X86Local::XS || Prefix == X86Local::REP) insnContext = IC_XS; else insnContext = IC; @@ -882,6 +882,7 @@ void RecognizableInstr::emitDecodePath(DisassemblerTables &tables) const { } opcodeToSet = 0xd8 + (Prefix - X86Local::D8); break; + case X86Local::REP: default: opcodeType = ONEBYTE; switch (Opcode) { |