From 9556729128e3c4f54b05f9416eea970010ac17ec Mon Sep 17 00:00:00 2001
From: Evan Cheng <evan.cheng@apple.com>
Date: Fri, 14 Dec 2007 20:08:14 +0000
Subject: [PATCH] Actually, MOVPQIto64mr is a dup of MOVPQI2QImr, MOV64toPQIrm
 is a dup of MOVQI2PQIrm.

llvm-svn: 45041
---
 llvm/lib/Target/X86/X86InstrX86-64.td   | 9 ---------
 llvm/lib/Target/X86/X86RegisterInfo.cpp | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/llvm/lib/Target/X86/X86InstrX86-64.td b/llvm/lib/Target/X86/X86InstrX86-64.td
index 6668178c9991..91df425242c5 100644
--- a/llvm/lib/Target/X86/X86InstrX86-64.td
+++ b/llvm/lib/Target/X86/X86InstrX86-64.td
@@ -1256,19 +1256,10 @@ def MOV64toPQIrr : RPDI<0x6E, MRMSrcReg, (outs VR128:$dst), (ins GR64:$src),
                         "mov{d|q}\t{$src, $dst|$dst, $src}",
                         [(set VR128:$dst,
                           (v2i64 (scalar_to_vector GR64:$src)))]>;
-def MOV64toPQIrm : I<0x7E, MRMSrcMem, (outs VR128:$dst), (ins i64mem:$src),
-                     "movq\t{$src, $dst|$dst, $src}",
-                     [(set VR128:$dst,
-                          (v2i64 (scalar_to_vector (loadi64 addr:$src))))]>, XS;
-
 def MOVPQIto64rr  : RPDI<0x7E, MRMDestReg, (outs GR64:$dst), (ins VR128:$src),
                          "mov{d|q}\t{$src, $dst|$dst, $src}",
                          [(set GR64:$dst, (vector_extract (v2i64 VR128:$src),
                                            (iPTR 0)))]>;
-def MOVPQIto64mr  : PDI<0xD6, MRMDestMem, (outs), (ins i64mem:$dst, VR128:$src),
-                        "movq\t{$src, $dst|$dst, $src}",
-                        [(store (i64 (vector_extract (v2i64 VR128:$src),
-                                      (iPTR 0))), addr:$dst)]>;
 
 def MOV64toSDrr : RPDI<0x6E, MRMSrcReg, (outs FR64:$dst), (ins GR64:$src),
                        "mov{d|q}\t{$src, $dst|$dst, $src}",
diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp
index 1321630a3c7b..883cd9ce3489 100644
--- a/llvm/lib/Target/X86/X86RegisterInfo.cpp
+++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp
@@ -280,7 +280,7 @@ X86RegisterInfo::X86RegisterInfo(X86TargetMachine &tm,
     { X86::MOVAPDrr,    X86::MOVAPDmr, 0 },
     { X86::MOVAPSrr,    X86::MOVAPSmr, 0 },
     { X86::MOVPDI2DIrr, X86::MOVPDI2DImr, 0 },
-    { X86::MOVPQIto64rr,X86::MOVPQIto64mr, 0 },
+    { X86::MOVPQIto64rr,X86::MOVPQI2QImr, 0 },
     { X86::MOVPS2SSrr,  X86::MOVPS2SSmr, 0 },
     { X86::MOVSDrr,     X86::MOVSDmr, 0 },
     { X86::MOVSDto64rr, X86::MOVSDto64mr, 0 },
@@ -387,7 +387,7 @@ X86RegisterInfo::X86RegisterInfo(X86TargetMachine &tm,
     { X86::MOV32rr,         X86::MOV32rm },
     { X86::MOV32to32_,      X86::MOV32_rm },
     { X86::MOV64rr,         X86::MOV64rm },
-    { X86::MOV64toPQIrr,    X86::MOV64toPQIrm },
+    { X86::MOV64toPQIrr,    X86::MOVQI2PQIrm },
     { X86::MOV64toSDrr,     X86::MOV64toSDrm },
     { X86::MOV8rr,          X86::MOV8rm },
     { X86::MOVAPDrr,        X86::MOVAPDrm },