diff --git a/lib/Target/X86/X86InstrSSE.td b/lib/Target/X86/X86InstrSSE.td
index a1b36747cc5..7cd22b35db7 100644
--- a/lib/Target/X86/X86InstrSSE.td
+++ b/lib/Target/X86/X86InstrSSE.td
@@ -1745,7 +1745,7 @@ def PCMPEQBrr : PDI<0x74, MRMSrcReg,
                     "pcmpeqb {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpeq_b VR128:$src1,
                                        VR128:$src2))]>;
-def PCMPEQBrm : PDI<0x74, MRMSrcReg, 
+def PCMPEQBrm : PDI<0x74, MRMSrcMem, 
                     (ops VR128:$dst, VR128:$src1, i128mem:$src2),
                     "pcmpeqb {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpeq_b VR128:$src1,
@@ -1755,7 +1755,7 @@ def PCMPEQWrr : PDI<0x75, MRMSrcReg,
                     "pcmpeqw {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpeq_w VR128:$src1,
                                        VR128:$src2))]>;
-def PCMPEQWrm : PDI<0x75, MRMSrcReg, 
+def PCMPEQWrm : PDI<0x75, MRMSrcMem, 
                     (ops VR128:$dst, VR128:$src1, i128mem:$src2),
                     "pcmpeqw {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpeq_w VR128:$src1,
@@ -1765,7 +1765,7 @@ def PCMPEQDrr : PDI<0x76, MRMSrcReg,
                     "pcmpeqd {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpeq_d VR128:$src1,
                                        VR128:$src2))]>;
-def PCMPEQDrm : PDI<0x76, MRMSrcReg, 
+def PCMPEQDrm : PDI<0x76, MRMSrcMem, 
                     (ops VR128:$dst, VR128:$src1, i128mem:$src2),
                     "pcmpeqd {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpeq_d VR128:$src1,
@@ -1776,7 +1776,7 @@ def PCMPGTBrr : PDI<0x64, MRMSrcReg,
                     "pcmpgtb {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpgt_b VR128:$src1,
                                        VR128:$src2))]>;
-def PCMPGTBrm : PDI<0x64, MRMSrcReg, 
+def PCMPGTBrm : PDI<0x64, MRMSrcMem, 
                     (ops VR128:$dst, VR128:$src1, i128mem:$src2),
                     "pcmpgtb {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpgt_b VR128:$src1,
@@ -1786,7 +1786,7 @@ def PCMPGTWrr : PDI<0x65, MRMSrcReg,
                     "pcmpgtw {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpgt_w VR128:$src1,
                                        VR128:$src2))]>;
-def PCMPGTWrm : PDI<0x65, MRMSrcReg, 
+def PCMPGTWrm : PDI<0x65, MRMSrcMem, 
                     (ops VR128:$dst, VR128:$src1, i128mem:$src2),
                     "pcmpgtw {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpgt_w VR128:$src1,
@@ -1796,7 +1796,7 @@ def PCMPGTDrr : PDI<0x66, MRMSrcReg,
                     "pcmpgtd {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpgt_d VR128:$src1,
                                        VR128:$src2))]>;
-def PCMPGTDrm : PDI<0x66, MRMSrcReg, 
+def PCMPGTDrm : PDI<0x66, MRMSrcMem, 
                     (ops VR128:$dst, VR128:$src1, i128mem:$src2),
                     "pcmpgtd {$src2, $dst|$dst, $src2}",
                     [(set VR128:$dst, (int_x86_sse2_pcmpgt_d VR128:$src1,
@@ -1823,7 +1823,7 @@ def PACKSSDWrr : PDI<0x6B, MRMSrcReg, (ops VR128:$dst, VR128:$src1,
                  [(set VR128:$dst, (v4i32 (int_x86_sse2_packssdw_128
                                            VR128:$src1,
                                            VR128:$src2)))]>;
-def PACKSSDWrm : PDI<0x6B, MRMSrcReg, (ops VR128:$dst, VR128:$src1,
+def PACKSSDWrm : PDI<0x6B, MRMSrcMem, (ops VR128:$dst, VR128:$src1,
                                        i128mem:$src2),
                  "packssdw {$src2, $dst|$dst, $src2}",
                  [(set VR128:$dst, (v4i32 (int_x86_sse2_packssdw_128
@@ -1835,7 +1835,7 @@ def PACKUSWBrr : PDI<0x67, MRMSrcReg, (ops VR128:$dst, VR128:$src1,
                  [(set VR128:$dst, (v8i16 (int_x86_sse2_packuswb_128
                                            VR128:$src1,
                                            VR128:$src2)))]>;
-def PACKUSWBrm : PDI<0x67, MRMSrcReg, (ops VR128:$dst, VR128:$src1,
+def PACKUSWBrm : PDI<0x67, MRMSrcMem, (ops VR128:$dst, VR128:$src1,
                                        i128mem:$src2),
                      "packuswb {$src2, $dst|$dst, $src2}",
                  [(set VR128:$dst, (v8i16 (int_x86_sse2_packuswb_128