Remove debugging code, fix encoding problem. This fixes the problems

the JIT had last night.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16766 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp
index d92a732dee3bd82435385721b9884e5bcccb3c08..71607b4ad8699048a331b9bb4622a60a250d8378 100644 (file)
--- a/lib/Target/X86/X86ISelSimple.cpp
+++ b/lib/Target/X86/X86ISelSimple.cpp
@@ -2747,7 +2747,6 @@ void X86ISel::emitDivRemOperation(MachineBasicBlock *BB,
       int V = CI->getValue();
 
       if (V == 2 || V == -2) {       // X % 2, X % -2
-        std::cerr << "SREM 2\n";
         static const unsigned SExtOpcode[] = { X86::CBW, X86::CWD, X86::CDQ };
         static const unsigned BaseReg[]    = { X86::AL , X86::AX , X86::EAX };
         static const unsigned SExtReg[]    = { X86::AH , X86::DX , X86::EDX };

diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td
index d0c876fe1aaff0923d9cc55fdbf8b3eff0180bd4..333474134a22b958c72c18ea2b1fe5b35bcfdeed 100644 (file)
--- a/lib/Target/X86/X86InstrInfo.td
+++ b/lib/Target/X86/X86InstrInfo.td
@@ -992,8 +992,8 @@ def SBB32rm  : I<0x1B, MRMSrcMem, (ops R32:$dst, R32:$src1, i32mem:$src2),
 def SBB32ri  : Ii32<0x81, MRM3r, (ops R32:$dst, R32:$src1, i32imm:$src2),
                     "sbb{l} {$src2, $dst|$dst, $src2}">;
 
-def SBB16ri8 : Ii16<0x83, MRM3r, (ops R16:$dst, R16:$src1, i8imm:$src2),
-                    "sbb{w} {$src2, $dst|$dst, $src2}">, OpSize;
+def SBB16ri8 : Ii8<0x83, MRM3r, (ops R16:$dst, R16:$src1, i8imm:$src2),
+                   "sbb{w} {$src2, $dst|$dst, $src2}">, OpSize;
 def SBB32ri8 : Ii8<0x83, MRM3r, (ops R32:$dst, R32:$src1, i8imm:$src2),
                    "sbb{l} {$src2, $dst|$dst, $src2}">;