Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 77d5524aa9aa63fcaae95214b74eb7a493393632..468fa77753a9e9b1ea74b6724f870259ee72aded 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -361,7 +361,7 @@ void FullCodeGenerator::EmitBackEdgeBookkeeping(IterationStatement* stmt, |
ASSERT(back_edge_target->is_bound()); |
int distance = masm_->SizeOfCodeGeneratedSince(back_edge_target); |
weight = Min(kMaxBackEdgeWeight, |
- Max(1, distance / kCodeSizeMultiplier)); |
+ Max(1, distance / kBackEdgeDistanceUnit)); |
} |
EmitProfilingCounterDecrement(weight); |
__ b(pl, &ok); |
@@ -404,7 +404,7 @@ void FullCodeGenerator::EmitReturnSequence() { |
} else if (FLAG_weighted_back_edges) { |
int distance = masm_->pc_offset(); |
weight = Min(kMaxBackEdgeWeight, |
- Max(1, distance / kCodeSizeMultiplier)); |
+ Max(1, distance / kBackEdgeDistanceUnit)); |
} |
EmitProfilingCounterDecrement(weight); |
Label ok; |
@@ -1836,14 +1836,13 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
if (!result_saved) { |
__ push(r0); |
- __ Push(Smi::FromInt(expr->literal_index())); |
result_saved = true; |
} |
VisitForAccumulatorValue(subexpr); |
if (IsFastObjectElementsKind(constant_elements_kind)) { |
int offset = FixedArray::kHeaderSize + (i * kPointerSize); |
- __ ldr(r6, MemOperand(sp, kPointerSize)); // Copy of array literal. |
+ __ ldr(r6, MemOperand(sp)); // Copy of array literal. |
__ ldr(r1, FieldMemOperand(r6, JSObject::kElementsOffset)); |
__ str(result_register(), FieldMemOperand(r1, offset)); |
// Update the write barrier for the array store. |
@@ -1851,7 +1850,10 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
kLRHasBeenSaved, kDontSaveFPRegs, |
EMIT_REMEMBERED_SET, INLINE_SMI_CHECK); |
} else { |
+ __ ldr(r1, MemOperand(sp)); // Copy of array literal. |
+ __ ldr(r2, FieldMemOperand(r1, JSObject::kMapOffset)); |
__ mov(r3, Operand(Smi::FromInt(i))); |
+ __ mov(r4, Operand(Smi::FromInt(expr->literal_index()))); |
StoreArrayLiteralElementStub stub; |
__ CallStub(&stub); |
} |
@@ -1860,7 +1862,6 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
} |
if (result_saved) { |
- __ pop(); // literal index |
context()->PlugTOS(); |
} else { |
context()->Plug(r0); |