diff options
| author | Craig Topper <craig.topper@gmail.com> | 2014-01-05 04:32:42 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2014-01-05 04:32:42 +0000 |
| commit | 2b5dc939482602667228490bb4ff2a3dc0395213 (patch) | |
| tree | aaf31d3f2cac180c848d419348021a2c5bbf5d75 | |
| parent | 527f1326279353c15b61cb51c31eaed1ac2abd58 (diff) | |
| download | llvm-2b5dc939482602667228490bb4ff2a3dc0395213.tar.gz llvm-2b5dc939482602667228490bb4ff2a3dc0395213.tar.bz2 llvm-2b5dc939482602667228490bb4ff2a3dc0395213.tar.xz | |
Use new ForceDisassemble flag on the 2-byte forms of INC/DEC for 32-bit mode and remove disassmbler table emitter hack.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198544 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86InstrArithmetic.td | 5 | ||||
| -rw-r--r-- | utils/TableGen/X86RecognizableInstr.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/Target/X86/X86InstrArithmetic.td b/lib/Target/X86/X86InstrArithmetic.td index fe00b8c787..899d9a1cb6 100644 --- a/lib/Target/X86/X86InstrArithmetic.td +++ b/lib/Target/X86/X86InstrArithmetic.td @@ -497,7 +497,8 @@ def DEC64_32r : I<0xFF, MRM1r, (outs GR32:$dst), (ins GR32:$src1), Requires<[In64BitMode]>; } // isConvertibleToThreeAddress = 1, CodeSize = 2 -let isCodeGenOnly = 1, CodeSize = 2 in { +let isCodeGenOnly = 1, ForceDisassemble = 1, hasSideEffects = 0, + CodeSize = 2 in { def INC32_16r : I<0xFF, MRM0r, (outs GR16:$dst), (ins GR16:$src1), "inc{w}\t$dst", [], IIC_UNARY_REG>, OpSize, Requires<[Not64BitMode]>; @@ -510,7 +511,7 @@ def DEC32_16r : I<0xFF, MRM1r, (outs GR16:$dst), (ins GR16:$src1), def DEC32_32r : I<0xFF, MRM1r, (outs GR32:$dst), (ins GR32:$src1), "dec{l}\t$dst", [], IIC_UNARY_REG>, Requires<[Not64BitMode]>; -} // isCodeGenOnly = 1, CodeSize = 2 +} // isCodeGenOnly = 1, ForceDisassemble = 1, HasSideEffects = 0, CodeSize = 2 } // Constraints = "$src1 = $dst", SchedRW diff --git a/utils/TableGen/X86RecognizableInstr.cpp b/utils/TableGen/X86RecognizableInstr.cpp index 2fac3519d2..fffca0fc96 100644 --- a/utils/TableGen/X86RecognizableInstr.cpp +++ b/utils/TableGen/X86RecognizableInstr.cpp @@ -483,9 +483,7 @@ RecognizableInstr::filter_ret RecognizableInstr::filter() const { assert(Rec->isSubClassOf("X86Inst") && "Can only filter X86 instructions"); - if (Form == X86Local::Pseudo || - (IsCodeGenOnly && !ForceDisassemble && - Name.find("INC32") == Name.npos && Name.find("DEC32") == Name.npos)) + if (Form == X86Local::Pseudo || (IsCodeGenOnly && !ForceDisassemble)) return FILTER_STRONG; |