Merge "Fixed x86 compilation of filled-new-array/range." into ics-mr1-plus-art
diff --git a/src/compiler/codegen/GenCommon.cc b/src/compiler/codegen/GenCommon.cc
index c9ba285..2209084 100644
--- a/src/compiler/codegen/GenCommon.cc
+++ b/src/compiler/codegen/GenCommon.cc
@@ -582,7 +582,8 @@
 #if defined(TARGET_ARM)
     int rVal = rLR;  // Using a lot of temps, rLR is known free here
 #elif defined(TARGET_X86)
-    int rVal = rSrc;
+    oatFreeTemp(cUnit, rRET0);
+    int rVal = oatAllocTemp(cUnit);
 #else
     int rVal = oatAllocTemp(cUnit);
 #endif
@@ -609,6 +610,11 @@
     opRegImm(cUnit, kOpSub, rIdx, 1);
     opCmpImmBranch(cUnit, kCondGe, rIdx, 0, target);
 #endif
+#if defined(TARGET_X86)
+    // Restore the target pointer
+    opRegRegImm(cUnit, kOpAdd, rRET0, rDst,
+                -Array::DataOffset(component_size).Int32Value());
+#endif
   } else if (!isRange) {
     // TUNING: interleave
     for (unsigned int i = 0; i < dInsn->vA; i++) {
diff --git a/src/compiler/codegen/x86/X86/Factory.cc b/src/compiler/codegen/x86/X86/Factory.cc
index 3698d2d..6f11709 100644
--- a/src/compiler/codegen/x86/X86/Factory.cc
+++ b/src/compiler/codegen/x86/X86/Factory.cc
@@ -360,64 +360,6 @@
     return res;
 }
 
-/* Load value from base + scaled index. */
-LIR *loadBaseIndexed(CompilationUnit *cUnit, int rBase,
-                               int rIndex, int rDest, int scale, OpSize size)
-{
-  UNIMPLEMENTED(WARNING) << "loadBaseIndexed";
-  newLIR0(cUnit, kX86Bkpt);
-  return NULL;
-#if 0
-  LIR *first = NULL;
-  LIR *res;
-  X86OpCode opcode = kX86Nop;
-  int tReg = oatAllocTemp(cUnit);
-
-  if (FPREG(rDest)) {
-    DCHECK(SINGLEREG(rDest));
-    DCHECK((size == kWord) || (size == kSingle));
-    size = kSingle;
-  } else {
-    if (size == kSingle)
-      size = kWord;
-  }
-
-  if (!scale) {
-    first = newLIR3(cUnit, kX86Addu, tReg , rBase, rIndex);
-  } else {
-    first = opRegRegImm(cUnit, kOpLsl, tReg, rIndex, scale);
-    newLIR3(cUnit, kX86Addu, tReg , rBase, tReg);
-  }
-
-  switch (size) {
-    case kSingle:
-      opcode = kX86Flwc1;
-      break;
-    case kWord:
-      opcode = kX86Lw;
-      break;
-    case kUnsignedHalf:
-      opcode = kX86Lhu;
-      break;
-    case kSignedHalf:
-      opcode = kX86Lh;
-      break;
-    case kUnsignedByte:
-      opcode = kX86Lbu;
-      break;
-    case kSignedByte:
-      opcode = kX86Lb;
-      break;
-    default:
-      LOG(FATAL) << "Bad case in loadBaseIndexed";
-  }
-
-  res = newLIR3(cUnit, opcode, rDest, 0, tReg);
-  oatFreeTemp(cUnit, tReg);
-  return (first) ? first : res;
-#endif
-}
-
 LIR *loadMultiple(CompilationUnit *cUnit, int rBase, int rMask)
 {
   UNIMPLEMENTED(WARNING) << "loadMultiple";
@@ -560,6 +502,13 @@
   return load;
 }
 
+/* Load value from base + scaled index. */
+LIR *loadBaseIndexed(CompilationUnit *cUnit, int rBase,
+                     int rIndex, int rDest, int scale, OpSize size) {
+  return loadBaseIndexedDisp(cUnit, NULL, rBase, rIndex, scale, 0,
+                             rDest, INVALID_REG, size, INVALID_SREG);
+}
+
 LIR *loadBaseDisp(CompilationUnit *cUnit, MIR *mir,
                   int rBase, int displacement,
                   int rDest,