Index: src/ic/arm/ic-arm.cc |
diff --git a/src/ic/arm/ic-arm.cc b/src/ic/arm/ic-arm.cc |
index babf497a5b07e58c6e937454ad9a8402aa571420..55d85b9aa9eee9020883a716622e7d8dd82f8141 100644 |
--- a/src/ic/arm/ic-arm.cc |
+++ b/src/ic/arm/ic-arm.cc |
@@ -219,281 +219,6 @@ void KeyedStoreIC::GenerateSlow(MacroAssembler* masm) { |
__ TailCallRuntime(Runtime::kKeyedStoreIC_Slow); |
} |
-static void KeyedStoreGenerateMegamorphicHelper( |
- MacroAssembler* masm, Label* fast_object, Label* fast_double, Label* slow, |
- KeyedStoreCheckMap check_map, KeyedStoreIncrementLength increment_length, |
- Register value, Register key, Register receiver, Register receiver_map, |
- Register elements_map, Register elements) { |
- Label transition_smi_elements; |
- Label finish_object_store, non_double_value, transition_double_elements; |
- Label fast_double_without_map_check; |
- |
- // Fast case: Do the store, could be either Object or double. |
- __ bind(fast_object); |
- Register scratch = r4; |
- Register address = r5; |
- DCHECK(!AreAliased(value, key, receiver, receiver_map, elements_map, elements, |
- scratch, address)); |
- |
- if (check_map == kCheckMap) { |
- __ ldr(elements_map, FieldMemOperand(elements, HeapObject::kMapOffset)); |
- __ cmp(elements_map, |
- Operand(masm->isolate()->factory()->fixed_array_map())); |
- __ b(ne, fast_double); |
- } |
- |
- // HOLECHECK: guards "A[i] = V" |
- // We have to go to the runtime if the current value is the hole because |
- // there may be a callback on the element |
- Label holecheck_passed1; |
- __ add(address, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag)); |
- __ ldr(scratch, MemOperand::PointerAddressFromSmiKey(address, key, PreIndex)); |
- __ cmp(scratch, Operand(masm->isolate()->factory()->the_hole_value())); |
- __ b(ne, &holecheck_passed1); |
- __ JumpIfDictionaryInPrototypeChain(receiver, elements_map, scratch, slow); |
- |
- __ bind(&holecheck_passed1); |
- |
- // Smi stores don't require further checks. |
- Label non_smi_value; |
- __ JumpIfNotSmi(value, &non_smi_value); |
- |
- if (increment_length == kIncrementLength) { |
- // Add 1 to receiver->length. |
- __ add(scratch, key, Operand(Smi::FromInt(1))); |
- __ str(scratch, FieldMemOperand(receiver, JSArray::kLengthOffset)); |
- } |
- // It's irrelevant whether array is smi-only or not when writing a smi. |
- __ add(address, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag)); |
- __ str(value, MemOperand::PointerAddressFromSmiKey(address, key)); |
- __ Ret(); |
- |
- __ bind(&non_smi_value); |
- // Escape to elements kind transition case. |
- __ CheckFastObjectElements(receiver_map, scratch, &transition_smi_elements); |
- |
- // Fast elements array, store the value to the elements backing store. |
- __ bind(&finish_object_store); |
- if (increment_length == kIncrementLength) { |
- // Add 1 to receiver->length. |
- __ add(scratch, key, Operand(Smi::FromInt(1))); |
- __ str(scratch, FieldMemOperand(receiver, JSArray::kLengthOffset)); |
- } |
- __ add(address, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag)); |
- __ add(address, address, Operand::PointerOffsetFromSmiKey(key)); |
- __ str(value, MemOperand(address)); |
- // Update write barrier for the elements array address. |
- __ mov(scratch, value); // Preserve the value which is returned. |
- __ RecordWrite(elements, address, scratch, kLRHasNotBeenSaved, |
- kDontSaveFPRegs, EMIT_REMEMBERED_SET, OMIT_SMI_CHECK); |
- __ Ret(); |
- |
- __ bind(fast_double); |
- if (check_map == kCheckMap) { |
- // Check for fast double array case. If this fails, call through to the |
- // runtime. |
- __ CompareRoot(elements_map, Heap::kFixedDoubleArrayMapRootIndex); |
- __ b(ne, slow); |
- } |
- |
- // HOLECHECK: guards "A[i] double hole?" |
- // We have to see if the double version of the hole is present. If so |
- // go to the runtime. |
- __ add(address, elements, |
- Operand((FixedDoubleArray::kHeaderSize + sizeof(kHoleNanLower32)) - |
- kHeapObjectTag)); |
- __ ldr(scratch, MemOperand(address, key, LSL, kPointerSizeLog2, PreIndex)); |
- __ cmp(scratch, Operand(kHoleNanUpper32)); |
- __ b(ne, &fast_double_without_map_check); |
- __ JumpIfDictionaryInPrototypeChain(receiver, elements_map, scratch, slow); |
- |
- __ bind(&fast_double_without_map_check); |
- __ StoreNumberToDoubleElements(value, key, elements, scratch, d0, |
- &transition_double_elements); |
- if (increment_length == kIncrementLength) { |
- // Add 1 to receiver->length. |
- __ add(scratch, key, Operand(Smi::FromInt(1))); |
- __ str(scratch, FieldMemOperand(receiver, JSArray::kLengthOffset)); |
- } |
- __ Ret(); |
- |
- __ bind(&transition_smi_elements); |
- // Transition the array appropriately depending on the value type. |
- __ ldr(scratch, FieldMemOperand(value, HeapObject::kMapOffset)); |
- __ CompareRoot(scratch, Heap::kHeapNumberMapRootIndex); |
- __ b(ne, &non_double_value); |
- |
- // Value is a double. Transition FAST_SMI_ELEMENTS -> |
- // FAST_DOUBLE_ELEMENTS and complete the store. |
- __ LoadTransitionedArrayMapConditional( |
- FAST_SMI_ELEMENTS, FAST_DOUBLE_ELEMENTS, receiver_map, scratch, slow); |
- AllocationSiteMode mode = |
- AllocationSite::GetMode(FAST_SMI_ELEMENTS, FAST_DOUBLE_ELEMENTS); |
- ElementsTransitionGenerator::GenerateSmiToDouble(masm, receiver, key, value, |
- receiver_map, mode, slow); |
- __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
- __ jmp(&fast_double_without_map_check); |
- |
- __ bind(&non_double_value); |
- // Value is not a double, FAST_SMI_ELEMENTS -> FAST_ELEMENTS |
- __ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS, FAST_ELEMENTS, |
- receiver_map, scratch, slow); |
- mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS); |
- ElementsTransitionGenerator::GenerateMapChangeElementsTransition( |
- masm, receiver, key, value, receiver_map, mode, slow); |
- __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
- __ jmp(&finish_object_store); |
- |
- __ bind(&transition_double_elements); |
- // Elements are FAST_DOUBLE_ELEMENTS, but value is an Object that's not a |
- // HeapNumber. Make sure that the receiver is a Array with FAST_ELEMENTS and |
- // transition array from FAST_DOUBLE_ELEMENTS to FAST_ELEMENTS |
- __ LoadTransitionedArrayMapConditional(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS, |
- receiver_map, scratch, slow); |
- mode = AllocationSite::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS); |
- ElementsTransitionGenerator::GenerateDoubleToObject( |
- masm, receiver, key, value, receiver_map, mode, slow); |
- __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
- __ jmp(&finish_object_store); |
-} |
- |
- |
-void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, |
- LanguageMode language_mode) { |
- // ---------- S t a t e -------------- |
- // -- r0 : value |
- // -- r1 : key |
- // -- r2 : receiver |
- // -- lr : return address |
- // ----------------------------------- |
- Label slow, fast_object, fast_object_grow; |
- Label fast_double, fast_double_grow; |
- Label array, extra, check_if_double_array, maybe_name_key, miss; |
- |
- // Register usage. |
- Register value = StoreDescriptor::ValueRegister(); |
- Register key = StoreDescriptor::NameRegister(); |
- Register receiver = StoreDescriptor::ReceiverRegister(); |
- DCHECK(receiver.is(r1)); |
- DCHECK(key.is(r2)); |
- DCHECK(value.is(r0)); |
- Register receiver_map = r3; |
- Register elements_map = r6; |
- Register elements = r9; // Elements array of the receiver. |
- // r4 and r5 are used as general scratch registers. |
- |
- // Check that the key is a smi. |
- __ JumpIfNotSmi(key, &maybe_name_key); |
- // Check that the object isn't a smi. |
- __ JumpIfSmi(receiver, &slow); |
- // Get the map of the object. |
- __ ldr(receiver_map, FieldMemOperand(receiver, HeapObject::kMapOffset)); |
- // Check that the receiver does not require access checks. |
- // The generic stub does not perform map checks. |
- __ ldrb(ip, FieldMemOperand(receiver_map, Map::kBitFieldOffset)); |
- __ tst(ip, Operand(1 << Map::kIsAccessCheckNeeded)); |
- __ b(ne, &slow); |
- // Check if the object is a JS array or not. |
- __ ldrb(r4, FieldMemOperand(receiver_map, Map::kInstanceTypeOffset)); |
- __ cmp(r4, Operand(JS_ARRAY_TYPE)); |
- __ b(eq, &array); |
- // Check that the object is some kind of JS object EXCEPT JS Value type. In |
- // the case that the object is a value-wrapper object, we enter the runtime |
- // system to make sure that indexing into string objects works as intended. |
- STATIC_ASSERT(JS_VALUE_TYPE < JS_OBJECT_TYPE); |
- __ cmp(r4, Operand(JS_OBJECT_TYPE)); |
- __ b(lo, &slow); |
- |
- // Object case: Check key against length in the elements array. |
- __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
- // Check array bounds. Both the key and the length of FixedArray are smis. |
- __ ldr(ip, FieldMemOperand(elements, FixedArray::kLengthOffset)); |
- __ cmp(key, Operand(ip)); |
- __ b(lo, &fast_object); |
- |
- // Slow case, handle jump to runtime. |
- __ bind(&slow); |
- // Entry registers are intact. |
- // r0: value. |
- // r1: key. |
- // r2: receiver. |
- PropertyICCompiler::GenerateRuntimeSetProperty(masm, language_mode); |
- // Never returns to here. |
- |
- __ bind(&maybe_name_key); |
- __ ldr(r4, FieldMemOperand(key, HeapObject::kMapOffset)); |
- __ ldrb(r4, FieldMemOperand(r4, Map::kInstanceTypeOffset)); |
- __ JumpIfNotUniqueNameInstanceType(r4, &slow); |
- |
- // We use register r8, because otherwise probing the megamorphic stub cache |
- // would require pushing temporaries on the stack. |
- // TODO(mvstanton): quit using register r8 when |
- // FLAG_enable_embedded_constant_pool is turned on. |
- DCHECK(!FLAG_enable_embedded_constant_pool); |
- Register temporary2 = r8; |
- // The handlers in the stub cache expect a vector and slot. Since we won't |
- // change the IC from any downstream misses, a dummy vector can be used. |
- Register vector = StoreWithVectorDescriptor::VectorRegister(); |
- Register slot = StoreWithVectorDescriptor::SlotRegister(); |
- |
- DCHECK(!AreAliased(vector, slot, r5, temporary2, r6, r9)); |
- Handle<TypeFeedbackVector> dummy_vector = |
- TypeFeedbackVector::DummyVector(masm->isolate()); |
- int slot_index = dummy_vector->GetIndex( |
- FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot)); |
- __ LoadRoot(vector, Heap::kDummyVectorRootIndex); |
- __ mov(slot, Operand(Smi::FromInt(slot_index))); |
- |
- masm->isolate()->store_stub_cache()->GenerateProbe(masm, receiver, key, r5, |
- temporary2, r6, r9); |
- // Cache miss. |
- __ b(&miss); |
- |
- // Extra capacity case: Check if there is extra capacity to |
- // perform the store and update the length. Used for adding one |
- // element to the array by writing to array[array.length]. |
- __ bind(&extra); |
- // Condition code from comparing key and array length is still available. |
- __ b(ne, &slow); // Only support writing to writing to array[array.length]. |
- // Check for room in the elements backing store. |
- // Both the key and the length of FixedArray are smis. |
- __ ldr(ip, FieldMemOperand(elements, FixedArray::kLengthOffset)); |
- __ cmp(key, Operand(ip)); |
- __ b(hs, &slow); |
- __ ldr(elements_map, FieldMemOperand(elements, HeapObject::kMapOffset)); |
- __ cmp(elements_map, Operand(masm->isolate()->factory()->fixed_array_map())); |
- __ b(ne, &check_if_double_array); |
- __ jmp(&fast_object_grow); |
- |
- __ bind(&check_if_double_array); |
- __ cmp(elements_map, |
- Operand(masm->isolate()->factory()->fixed_double_array_map())); |
- __ b(ne, &slow); |
- __ jmp(&fast_double_grow); |
- |
- // Array case: Get the length and the elements array from the JS |
- // array. Check that the array is in fast mode (and writable); if it |
- // is the length is always a smi. |
- __ bind(&array); |
- __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
- |
- // Check the key against the length in the array. |
- __ ldr(ip, FieldMemOperand(receiver, JSArray::kLengthOffset)); |
- __ cmp(key, Operand(ip)); |
- __ b(hs, &extra); |
- |
- KeyedStoreGenerateMegamorphicHelper( |
- masm, &fast_object, &fast_double, &slow, kCheckMap, kDontIncrementLength, |
- value, key, receiver, receiver_map, elements_map, elements); |
- KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow, |
- &fast_double_grow, &slow, kDontCheckMap, |
- kIncrementLength, value, key, receiver, |
- receiver_map, elements_map, elements); |
- |
- __ bind(&miss); |
- GenerateMiss(masm); |
-} |
- |
void StoreIC::GenerateMiss(MacroAssembler* masm) { |
StoreIC_PushArgs(masm); |