Index: src/mips/code-stubs-mips.cc |
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc |
index ead4bc2ec49dd072dbdca86a5ecdab7dd753fa2f..11b14be6671a47c84e0356a20bf4722407d10fd6 100644 |
--- a/src/mips/code-stubs-mips.cc |
+++ b/src/mips/code-stubs-mips.cc |
@@ -4771,11 +4771,52 @@ void VectorStoreICStub::GenerateForTrampoline(MacroAssembler* masm) { |
void VectorStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) { |
- Label miss; |
+ Register receiver = VectorStoreICDescriptor::ReceiverRegister(); // a1 |
+ Register key = VectorStoreICDescriptor::NameRegister(); // a2 |
+ Register vector = VectorStoreICDescriptor::VectorRegister(); // a3 |
+ Register slot = VectorStoreICDescriptor::SlotRegister(); // t0 |
+ DCHECK(VectorStoreICDescriptor::ValueRegister().is(a0)); // a0 |
+ Register feedback = t1; |
+ Register receiver_map = t2; |
+ Register scratch1 = t5; |
+ |
+ __ sll(scratch1, slot, kPointerSizeLog2 - kSmiTagSize); |
+ __ Addu(feedback, vector, Operand(scratch1)); |
+ __ lw(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize)); |
+ |
+ // Try to quickly handle the monomorphic case without knowing for sure |
+ // if we have a weak cell in feedback. We do know it's safe to look |
+ // at WeakCell::kValueOffset. |
+ Label try_array, load_smi_map, compare_map; |
+ Label not_array, miss; |
+ HandleMonomorphicCase(masm, receiver, receiver_map, feedback, vector, slot, |
+ scratch1, &compare_map, &load_smi_map, &try_array); |
+ |
+ // Is it a fixed array? |
+ __ bind(&try_array); |
+ __ lw(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset)); |
+ __ LoadRoot(at, Heap::kFixedArrayMapRootIndex); |
+ __ Branch(¬_array, ne, scratch1, Operand(at)); |
+ |
+ Register scratch2 = t4; |
+ HandleArrayCases(masm, feedback, receiver_map, scratch1, scratch2, true, |
+ &miss); |
+ |
+ __ bind(¬_array); |
+ __ LoadRoot(at, Heap::kmegamorphic_symbolRootIndex); |
+ __ Branch(&miss, ne, feedback, Operand(at)); |
+ Code::Flags code_flags = Code::RemoveTypeAndHolderFromFlags( |
+ Code::ComputeHandlerFlags(Code::STORE_IC)); |
+ masm->isolate()->stub_cache()->GenerateProbe( |
+ masm, Code::STORE_IC, code_flags, receiver, key, feedback, receiver_map, |
+ scratch1, scratch2); |
- // TODO(mvstanton): Implement. |
__ bind(&miss); |
StoreIC::GenerateMiss(masm); |
+ |
+ __ bind(&load_smi_map); |
+ __ Branch(USE_DELAY_SLOT, &compare_map); |
+ __ LoadRoot(receiver_map, Heap::kHeapNumberMapRootIndex); // In delay slot. |
} |
@@ -4789,12 +4830,132 @@ void VectorKeyedStoreICStub::GenerateForTrampoline(MacroAssembler* masm) { |
} |
+static void HandlePolymorphicStoreCase(MacroAssembler* masm, Register feedback, |
+ Register receiver_map, Register scratch1, |
+ Register scratch2, Label* miss) { |
+ // feedback initially contains the feedback array |
+ Label next_loop, prepare_next; |
+ Label start_polymorphic; |
+ Label transition_call; |
+ |
+ Register cached_map = scratch1; |
+ Register too_far = scratch2; |
+ Register pointer_reg = feedback; |
+ __ lw(too_far, FieldMemOperand(feedback, FixedArray::kLengthOffset)); |
+ |
+ // +-----+------+------+-----+-----+-----+ ... ----+ |
+ // | map | len | wm0 | wt0 | h0 | wm1 | hN | |
+ // +-----+------+------+-----+-----+ ----+ ... ----+ |
+ // 0 1 2 len-1 |
+ // ^ ^ |
+ // | | |
+ // pointer_reg too_far |
+ // aka feedback scratch2 |
+ // also need receiver_map |
+ // use cached_map (scratch1) to look in the weak map values. |
+ __ sll(scratch1, too_far, kPointerSizeLog2 - kSmiTagSize); |
+ __ Addu(too_far, feedback, Operand(scratch1)); |
+ __ Addu(too_far, too_far, Operand(FixedArray::kHeaderSize - kHeapObjectTag)); |
+ __ Addu(pointer_reg, feedback, |
+ Operand(FixedArray::OffsetOfElementAt(0) - kHeapObjectTag)); |
+ |
+ __ bind(&next_loop); |
+ __ lw(cached_map, MemOperand(pointer_reg)); |
+ __ lw(cached_map, FieldMemOperand(cached_map, WeakCell::kValueOffset)); |
+ __ Branch(&prepare_next, ne, receiver_map, Operand(cached_map)); |
+ // Is it a transitioning store? |
+ __ lw(too_far, MemOperand(pointer_reg, kPointerSize)); |
+ __ LoadRoot(at, Heap::kUndefinedValueRootIndex); |
+ __ Branch(&transition_call, ne, too_far, Operand(at)); |
+ __ lw(pointer_reg, MemOperand(pointer_reg, kPointerSize * 2)); |
+ __ Addu(t9, pointer_reg, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ __ Jump(t9); |
+ |
+ __ bind(&transition_call); |
+ __ lw(too_far, FieldMemOperand(too_far, WeakCell::kValueOffset)); |
+ __ JumpIfSmi(too_far, miss); |
+ |
+ __ lw(receiver_map, MemOperand(pointer_reg, kPointerSize * 2)); |
+ |
+ // Load the map into the correct register. |
+ DCHECK(feedback.is(VectorStoreTransitionDescriptor::MapRegister())); |
+ __ mov(feedback, too_far); |
+ |
+ __ Addu(t9, receiver_map, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ __ Jump(t9); |
+ |
+ __ bind(&prepare_next); |
+ __ Addu(pointer_reg, pointer_reg, Operand(kPointerSize * 3)); |
+ __ Branch(&next_loop, lt, pointer_reg, Operand(too_far)); |
+ |
+ // We exhausted our array of map handler pairs. |
+ __ jmp(miss); |
+} |
+ |
+ |
void VectorKeyedStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) { |
- Label miss; |
+ Register receiver = VectorStoreICDescriptor::ReceiverRegister(); // a1 |
+ Register key = VectorStoreICDescriptor::NameRegister(); // a2 |
+ Register vector = VectorStoreICDescriptor::VectorRegister(); // a3 |
+ Register slot = VectorStoreICDescriptor::SlotRegister(); // t0 |
+ DCHECK(VectorStoreICDescriptor::ValueRegister().is(a0)); // a0 |
+ Register feedback = t1; |
+ Register receiver_map = t2; |
+ Register scratch1 = t5; |
+ |
+ __ sll(scratch1, slot, kPointerSizeLog2 - kSmiTagSize); |
+ __ Addu(feedback, vector, Operand(scratch1)); |
+ __ lw(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize)); |
+ |
+ // Try to quickly handle the monomorphic case without knowing for sure |
+ // if we have a weak cell in feedback. We do know it's safe to look |
+ // at WeakCell::kValueOffset. |
+ Label try_array, load_smi_map, compare_map; |
+ Label not_array, miss; |
+ HandleMonomorphicCase(masm, receiver, receiver_map, feedback, vector, slot, |
+ scratch1, &compare_map, &load_smi_map, &try_array); |
+ |
+ __ bind(&try_array); |
+ // Is it a fixed array? |
+ __ lw(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset)); |
+ __ LoadRoot(at, Heap::kFixedArrayMapRootIndex); |
+ __ Branch(¬_array, ne, scratch1, Operand(at)); |
+ |
+ // We have a polymorphic element handler. |
+ Label polymorphic, try_poly_name; |
+ __ bind(&polymorphic); |
+ |
+ Register scratch2 = t4; |
+ |
+ HandlePolymorphicStoreCase(masm, feedback, receiver_map, scratch1, scratch2, |
+ &miss); |
+ |
+ __ bind(¬_array); |
+ // Is it generic? |
+ __ LoadRoot(at, Heap::kmegamorphic_symbolRootIndex); |
+ __ Branch(&try_poly_name, ne, feedback, Operand(at)); |
+ Handle<Code> megamorphic_stub = |
+ KeyedStoreIC::ChooseMegamorphicStub(masm->isolate(), GetExtraICState()); |
+ __ Jump(megamorphic_stub, RelocInfo::CODE_TARGET); |
+ |
+ __ bind(&try_poly_name); |
+ // We might have a name in feedback, and a fixed array in the next slot. |
+ __ Branch(&miss, ne, key, Operand(feedback)); |
+ // If the name comparison succeeded, we know we have a fixed array with |
+ // at least one map/handler pair. |
+ __ sll(scratch1, slot, kPointerSizeLog2 - kSmiTagSize); |
+ __ Addu(feedback, vector, Operand(scratch1)); |
+ __ lw(feedback, |
+ FieldMemOperand(feedback, FixedArray::kHeaderSize + kPointerSize)); |
+ HandleArrayCases(masm, feedback, receiver_map, scratch1, scratch2, false, |
+ &miss); |
- // TODO(mvstanton): Implement. |
__ bind(&miss); |
KeyedStoreIC::GenerateMiss(masm); |
+ |
+ __ bind(&load_smi_map); |
+ __ Branch(USE_DELAY_SLOT, &compare_map); |
+ __ LoadRoot(receiver_map, Heap::kHeapNumberMapRootIndex); // In delay slot. |
} |