| Index: src/ic/s390/ic-s390.cc
|
| diff --git a/src/ic/s390/ic-s390.cc b/src/ic/s390/ic-s390.cc
|
| index bd83af1f59ceb3bdb4565e14064669c9b730424d..63094198f89e30ab690f2d28711996e4e44078a2 100644
|
| --- a/src/ic/s390/ic-s390.cc
|
| +++ b/src/ic/s390/ic-s390.cc
|
| @@ -216,272 +216,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 = r6;
|
| - Register address = r7;
|
| - DCHECK(!AreAliased(value, key, receiver, receiver_map, elements_map, elements,
|
| - scratch, address));
|
| -
|
| - if (check_map == kCheckMap) {
|
| - __ LoadP(elements_map, FieldMemOperand(elements, HeapObject::kMapOffset));
|
| - __ CmpP(elements_map,
|
| - Operand(masm->isolate()->factory()->fixed_array_map()));
|
| - __ bne(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;
|
| - // @TODO(joransiu) : Fold AddP into memref of LoadP
|
| - __ AddP(address, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| - __ SmiToPtrArrayOffset(scratch, key);
|
| - __ LoadP(scratch, MemOperand(address, scratch));
|
| - __ CmpP(scratch, Operand(masm->isolate()->factory()->the_hole_value()));
|
| - __ bne(&holecheck_passed1, Label::kNear);
|
| - __ 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.
|
| - __ AddSmiLiteral(scratch, key, Smi::FromInt(1), r0);
|
| - __ StoreP(scratch, FieldMemOperand(receiver, JSArray::kLengthOffset));
|
| - }
|
| - // It's irrelevant whether array is smi-only or not when writing a smi.
|
| - __ AddP(address, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| - __ SmiToPtrArrayOffset(scratch, key);
|
| - __ StoreP(value, MemOperand(address, scratch));
|
| - __ 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.
|
| - __ AddSmiLiteral(scratch, key, Smi::FromInt(1), r0);
|
| - __ StoreP(scratch, FieldMemOperand(receiver, JSArray::kLengthOffset));
|
| - }
|
| - __ AddP(address, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| - __ SmiToPtrArrayOffset(scratch, key);
|
| - __ StoreP(value, MemOperand(address, scratch));
|
| - __ la(address, MemOperand(address, scratch));
|
| - // Update write barrier for the elements array address.
|
| - __ LoadRR(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);
|
| - __ bne(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.
|
| - // @TODO(joransiu) : Fold AddP Operand into LoadlW
|
| - __ AddP(address, elements,
|
| - Operand((FixedDoubleArray::kHeaderSize + Register::kExponentOffset -
|
| - kHeapObjectTag)));
|
| - __ SmiToDoubleArrayOffset(scratch, key);
|
| - __ LoadlW(scratch, MemOperand(address, scratch));
|
| - __ CmpP(scratch, Operand(kHoleNanUpper32));
|
| - __ bne(&fast_double_without_map_check, Label::kNear);
|
| - __ 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.
|
| - __ AddSmiLiteral(scratch, key, Smi::FromInt(1), r0);
|
| - __ StoreP(scratch, FieldMemOperand(receiver, JSArray::kLengthOffset));
|
| - }
|
| - __ Ret();
|
| -
|
| - __ bind(&transition_smi_elements);
|
| - // Transition the array appropriately depending on the value type.
|
| - __ LoadP(scratch, FieldMemOperand(value, HeapObject::kMapOffset));
|
| - __ CompareRoot(scratch, Heap::kHeapNumberMapRootIndex);
|
| - __ bne(&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);
|
| - __ LoadP(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| - __ b(&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);
|
| - __ LoadP(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| - __ b(&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);
|
| - __ LoadP(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| - __ b(&finish_object_store);
|
| -}
|
| -
|
| -void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
|
| - LanguageMode language_mode) {
|
| - // ---------- S t a t e --------------
|
| - // -- r2 : value
|
| - // -- r3 : key
|
| - // -- r4 : 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(r3));
|
| - DCHECK(key.is(r4));
|
| - DCHECK(value.is(r2));
|
| - Register receiver_map = r5;
|
| - Register elements_map = r8;
|
| - Register elements = r9; // Elements array of the receiver.
|
| - // r6 and r7 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.
|
| - __ LoadP(receiver_map, FieldMemOperand(receiver, HeapObject::kMapOffset));
|
| - // Check that the receiver does not require access checks.
|
| - // The generic stub does not perform map checks.
|
| - __ LoadlB(ip, FieldMemOperand(receiver_map, Map::kBitFieldOffset));
|
| - __ AndP(r0, ip, Operand(1 << Map::kIsAccessCheckNeeded));
|
| - __ bne(&slow, Label::kNear);
|
| - // Check if the object is a JS array or not.
|
| - __ LoadlB(r6, FieldMemOperand(receiver_map, Map::kInstanceTypeOffset));
|
| - __ CmpP(r6, Operand(JS_ARRAY_TYPE));
|
| - __ beq(&array);
|
| - // Check that the object is some kind of JSObject.
|
| - __ CmpP(r6, Operand(FIRST_JS_OBJECT_TYPE));
|
| - __ blt(&slow, Label::kNear);
|
| -
|
| - // Object case: Check key against length in the elements array.
|
| - __ LoadP(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| - // Check array bounds. Both the key and the length of FixedArray are smis.
|
| - __ CmpLogicalP(key, FieldMemOperand(elements, FixedArray::kLengthOffset));
|
| - __ blt(&fast_object);
|
| -
|
| - // Slow case, handle jump to runtime.
|
| - __ bind(&slow);
|
| - // Entry registers are intact.
|
| - // r2: value.
|
| - // r3: key.
|
| - // r4: receiver.
|
| - PropertyICCompiler::GenerateRuntimeSetProperty(masm, language_mode);
|
| - // Never returns to here.
|
| -
|
| - __ bind(&maybe_name_key);
|
| - __ LoadP(r6, FieldMemOperand(key, HeapObject::kMapOffset));
|
| - __ LoadlB(r6, FieldMemOperand(r6, Map::kInstanceTypeOffset));
|
| - __ JumpIfNotUniqueNameInstanceType(r6, &slow);
|
| -
|
| - // 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, r7, r8, r9, ip));
|
| - Handle<TypeFeedbackVector> dummy_vector =
|
| - TypeFeedbackVector::DummyVector(masm->isolate());
|
| - int slot_index = dummy_vector->GetIndex(
|
| - FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedStoreICSlot));
|
| - __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
|
| - __ LoadSmiLiteral(slot, Smi::FromInt(slot_index));
|
| -
|
| - masm->isolate()->store_stub_cache()->GenerateProbe(masm, receiver, key, r7,
|
| - r8, r9, ip);
|
| - // 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.
|
| - __ bne(&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.
|
| - __ CmpLogicalP(key, FieldMemOperand(elements, FixedArray::kLengthOffset));
|
| - __ bge(&slow);
|
| - __ LoadP(elements_map, FieldMemOperand(elements, HeapObject::kMapOffset));
|
| - __ CmpP(elements_map, Operand(masm->isolate()->factory()->fixed_array_map()));
|
| - __ bne(&check_if_double_array, Label::kNear);
|
| - __ b(&fast_object_grow);
|
| -
|
| - __ bind(&check_if_double_array);
|
| - __ CmpP(elements_map,
|
| - Operand(masm->isolate()->factory()->fixed_double_array_map()));
|
| - __ bne(&slow);
|
| - __ b(&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);
|
| - __ LoadP(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| -
|
| - // Check the key against the length in the array.
|
| - __ CmpLogicalP(key, FieldMemOperand(receiver, JSArray::kLengthOffset));
|
| - __ bge(&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);
|
|
|
|
|