summaryrefslogtreecommitdiff
path: root/src/compiler/codegen/GenCommon.cc
diff options
context:
space:
mode:
author jeffhao <jeffhao@google.com> 2012-05-18 11:51:26 -0700
committer jeffhao <jeffhao@google.com> 2012-05-18 11:58:56 -0700
commit5772babbe824494ef9fe90a1b07a926d124bb7c7 (patch)
tree49daf01f5589f33af0c880ef9ecf1e77a59fc265 /src/compiler/codegen/GenCommon.cc
parent6523cf6eccc0730a3ed58565ee9f1d4bc2f69ed8 (diff)
Fixed x86 compilation of filled-new-array/range.
Implemented loadBaseIndexed and found a way to implemented filled-new-array/range using only 4 temps instead of 5 by regenerating the target pointer value after the loop. Change-Id: Ibb694600e6852ba3c4939c5878625655809c60fd
Diffstat (limited to 'src/compiler/codegen/GenCommon.cc')
-rw-r--r--src/compiler/codegen/GenCommon.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/codegen/GenCommon.cc b/src/compiler/codegen/GenCommon.cc
index c9ba285c5f..2209084934 100644
--- a/src/compiler/codegen/GenCommon.cc
+++ b/src/compiler/codegen/GenCommon.cc
@@ -582,7 +582,8 @@ void genFilledNewArray(CompilationUnit* cUnit, MIR* mir, bool isRange)
#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 @@ void genFilledNewArray(CompilationUnit* cUnit, MIR* mir, bool isRange)
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++) {