commit 60280e50c1ef4a7ef286670975a81f8384138f42
author Bill Buzbee <buzbee@android.com> Wed May 07 15:09:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 07 15:09:51 2014 +0000
tree 4703e9056f1b63a967e09a8331d9c3ecd1cca9e9
parent f23a719218ffaa37a85482e40509e62275554774
parent 99380ed2f0f108a3110a3243e57e9863e74095cb

Merge "ART: Ensure X86 OpRegCopyWide preserves src"

compiler/dex/quick/x86/int_x86.cc

diff --git a/compiler/dex/quick/x86/int_x86.cc b/compiler/dex/quick/x86/int_x86.cc
index b71a2ce..315d580 100644
--- a/compiler/dex/quick/x86/int_x86.cc
+++ b/compiler/dex/quick/x86/int_x86.cc
@@ -142,8 +142,10 @@
     } else {
       if (src_fp) {
         NewLIR2(kX86MovdrxRR, r_dest.GetLowReg(), r_src.GetReg());
-        NewLIR2(kX86PsrlqRI, r_src.GetReg(), 32);
-        NewLIR2(kX86MovdrxRR, r_dest.GetHighReg(), r_src.GetReg());
+        RegStorage temp_reg = AllocTempDouble();
+        NewLIR2(kX86MovsdRR, temp_reg.GetReg(), r_src.GetReg());
+        NewLIR2(kX86PsrlqRI, temp_reg.GetReg(), 32);
+        NewLIR2(kX86MovdrxRR, r_dest.GetHighReg(), temp_reg.GetReg());
       } else {
         DCHECK(r_dest.IsPair());
         DCHECK(r_src.IsPair());