commit 0498223110174a055c743219c6cd82bee90d6034
author Serguei Katkov <serguei.i.katkov@intel.com> Fri Jun 20 18:17:16 2014 +0700
committer Serguei Katkov <serguei.i.katkov@intel.com> Sat Jun 21 03:10:21 2014 +0700
tree d4f1143de74ec010d6adc8798a543241efe0d6c4
parent 2d2d6bb1ff8692efdddf104dabfb4a2d39877ff6

x86_64: Fix comp-long

If result and source are the same VR then implementation does
a wrong thing clearing dest in the beginning.

Change-Id: I66d97a828aa38121676561858119ccd44aaa4d50
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>

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 b905312..48fcd2c 100644
--- a/compiler/dex/quick/x86/int_x86.cc
+++ b/compiler/dex/quick/x86/int_x86.cc
@@ -35,14 +35,18 @@
     rl_src1 = LoadValueWide(rl_src1, kCoreReg);
     rl_src2 = LoadValueWide(rl_src2, kCoreReg);
     RegLocation rl_result = EvalLoc(rl_dest, kCoreReg, true);
-    OpRegReg(kOpXor, rl_result.reg, rl_result.reg);  // result = 0
-    OpRegReg(kOpCmp, rl_src1.reg, rl_src2.reg);
-    NewLIR2(kX86Set8R, rl_result.reg.GetReg(), kX86CondNe);  // result = (src1 != src2) ? 1 : result
+    RegStorage rl_result_wide = RegStorage::Solo64(rl_result.reg.GetRegNum());
     RegStorage temp_reg = AllocTemp();
-    OpRegReg(kOpNeg, temp_reg, rl_result.reg);
-    OpRegReg(kOpCmp, rl_src1.reg, rl_src2.reg);
-    // result = (src1 < src2) ? -result : result
-    OpCondRegReg(kOpCmov, kCondLt, rl_result.reg, temp_reg);
+    OpRegReg(kOpXor, temp_reg, temp_reg);  // temp = 0
+    OpRegRegReg(kOpSub, rl_result_wide, rl_src1.reg, rl_src2.reg);
+    NewLIR2(kX86Set8R, temp_reg.GetReg(), kX86CondG);  // temp = (src1 > src2) ? 1 : temp
+
+    NewLIR2(kX86Rol64RI, rl_result_wide.GetReg(), 1);
+    OpRegImm(kOpAnd, rl_result.reg, 1);
+    OpRegReg(kOpNeg, rl_result.reg, rl_result.reg);
+    // result = (src1 < src2) ? -1 : 0;
+    OpRegReg(kOpAdd, rl_result.reg, temp_reg);
+
     StoreValue(rl_dest, rl_result);
     FreeTemp(temp_reg);
     return;