commit ab5545f31aec6ed4b906bd1bb34a02778e7081e9
author Serguei Katkov <serguei.i.katkov@intel.com> Tue Mar 25 10:51:15 2014 +0700
committer Serguei Katkov <serguei.i.katkov@intel.com> Wed Mar 26 11:59:02 2014 +0700
tree a6b2dee9d35c516b5c9d59ca30d34301a0123654
parent 909f133bc938928a2403baccc983701cb9ebb17f

x86 GenLongRegOrMemOp should be aware about xmm to core reg conversion

GenLongRegOrMemOp function expects arithmetic on core regs but does not
ensure that operand in core reg.

The patch adds the conversion if it is required.

Change-Id: Ibb6928b8cc2c63ede1a20d6ee45d9a64884231b6
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 dcbaad9..1fe0af9 100644
--- a/compiler/dex/quick/x86/int_x86.cc
+++ b/compiler/dex/quick/x86/int_x86.cc
@@ -1091,6 +1091,8 @@
   X86OpCode x86op = GetOpcode(op, rl_dest, rl_src, false);
   if (rl_src.location == kLocPhysReg) {
     // Both operands are in registers.
+    // But we must ensure that rl_src is in pair
+    rl_src = EvalLocWide(rl_src, kCoreReg, true);
     if (rl_dest.reg.GetReg() == rl_src.reg.GetHighReg()) {
       // The registers are the same, so we would clobber it before the use.
       int temp_reg = AllocTemp();