summaryrefslogtreecommitdiffstats
path: root/llvm/utils/TableGen/X86DisassemblerTables.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2011-09-11 20:23:20 +0000
committerCraig Topper <craig.topper@gmail.com>2011-09-11 20:23:20 +0000
commita948cb9058aaf3502ee22aab8c564bfc16a00460 (patch)
treef73d967e51d648c30d314b91dc652f4afe41c249 /llvm/utils/TableGen/X86DisassemblerTables.cpp
parentac17552138a828acabe148246f66247af8656524 (diff)
downloadbcm5719-llvm-a948cb9058aaf3502ee22aab8c564bfc16a00460.tar.gz
bcm5719-llvm-a948cb9058aaf3502ee22aab8c564bfc16a00460.zip
Fix disassembling of PAUSE instruction. Fixes PR10900. Also fixed NOP disassembling to ignore OpSize and REX.W.
llvm-svn: 139484
Diffstat (limited to 'llvm/utils/TableGen/X86DisassemblerTables.cpp')
-rw-r--r--llvm/utils/TableGen/X86DisassemblerTables.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/utils/TableGen/X86DisassemblerTables.cpp b/llvm/utils/TableGen/X86DisassemblerTables.cpp
index e0cbb18a4b8..aed27279a51 100644
--- a/llvm/utils/TableGen/X86DisassemblerTables.cpp
+++ b/llvm/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;
OpenPOWER on IntegriCloud