| Index: src/mips64/code-stubs-mips64.cc
|
| diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
|
| index 49647a42069474f7b959f24c732cbe5198aad776..e9ce21f2cec0c0ab5c39a4dfc494ee0c1d0f6851 100644
|
| --- a/src/mips64/code-stubs-mips64.cc
|
| +++ b/src/mips64/code-stubs-mips64.cc
|
| @@ -4833,11 +4833,50 @@ 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(); // a4
|
| + DCHECK(VectorStoreICDescriptor::ValueRegister().is(a0)); // a0
|
| + Register feedback = a5;
|
| + Register receiver_map = a6;
|
| + Register scratch1 = a7;
|
| +
|
| + __ SmiScale(scratch1, slot, kPointerSizeLog2);
|
| + __ Daddu(feedback, vector, Operand(scratch1));
|
| + __ ld(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);
|
| + __ ld(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset));
|
| + __ Branch(¬_array, ne, scratch1, Heap::kFixedArrayMapRootIndex);
|
| +
|
| + Register scratch2 = t0;
|
| + HandleArrayCases(masm, feedback, receiver_map, scratch1, scratch2, true,
|
| + &miss);
|
| +
|
| + __ bind(¬_array);
|
| + __ Branch(&miss, ne, feedback, Heap::kmegamorphic_symbolRootIndex);
|
| + 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.
|
| }
|
|
|
|
|
| @@ -4851,12 +4890,129 @@ 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;
|
| +
|
| + __ ld(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.
|
| + __ SmiScale(too_far, too_far, kPointerSizeLog2);
|
| + __ Daddu(too_far, feedback, Operand(too_far));
|
| + __ Daddu(too_far, too_far, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| + __ Daddu(pointer_reg, feedback,
|
| + Operand(FixedArray::OffsetOfElementAt(0) - kHeapObjectTag));
|
| +
|
| + __ bind(&next_loop);
|
| + __ ld(cached_map, MemOperand(pointer_reg));
|
| + __ ld(cached_map, FieldMemOperand(cached_map, WeakCell::kValueOffset));
|
| + __ Branch(&prepare_next, ne, receiver_map, Operand(cached_map));
|
| + // Is it a transitioning store?
|
| + __ ld(too_far, MemOperand(pointer_reg, kPointerSize));
|
| + __ LoadRoot(at, Heap::kUndefinedValueRootIndex);
|
| + __ Branch(&transition_call, ne, too_far, Operand(at));
|
| +
|
| + __ ld(pointer_reg, MemOperand(pointer_reg, kPointerSize * 2));
|
| + __ Daddu(t9, pointer_reg, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ Jump(t9);
|
| +
|
| + __ bind(&transition_call);
|
| + __ ld(too_far, FieldMemOperand(too_far, WeakCell::kValueOffset));
|
| + __ JumpIfSmi(too_far, miss);
|
| +
|
| + __ ld(receiver_map, MemOperand(pointer_reg, kPointerSize * 2));
|
| + // Load the map into the correct register.
|
| + DCHECK(feedback.is(VectorStoreTransitionDescriptor::MapRegister()));
|
| + __ Move(feedback, too_far);
|
| + __ Daddu(t9, receiver_map, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ Jump(t9);
|
| +
|
| + __ bind(&prepare_next);
|
| + __ Daddu(pointer_reg, pointer_reg, Operand(kPointerSize * 3));
|
| + __ Branch(&next_loop, lt, pointer_reg, Operand(too_far));
|
| +
|
| + // We exhausted our array of map handler pairs.
|
| + __ Branch(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(); // a4
|
| + DCHECK(VectorStoreICDescriptor::ValueRegister().is(a0)); // a0
|
| + Register feedback = a5;
|
| + Register receiver_map = a6;
|
| + Register scratch1 = a7;
|
| +
|
| + __ SmiScale(scratch1, slot, kPointerSizeLog2);
|
| + __ Daddu(feedback, vector, Operand(scratch1));
|
| + __ ld(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?
|
| + __ ld(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset));
|
| + __ Branch(¬_array, ne, scratch1, Heap::kFixedArrayMapRootIndex);
|
| +
|
| + // We have a polymorphic element handler.
|
| + Label try_poly_name;
|
| +
|
| + Register scratch2 = t0;
|
| +
|
| + HandlePolymorphicStoreCase(masm, feedback, receiver_map, scratch1, scratch2,
|
| + &miss);
|
| +
|
| + __ bind(¬_array);
|
| + // Is it generic?
|
| + __ Branch(&try_poly_name, ne, feedback, Heap::kmegamorphic_symbolRootIndex);
|
| + 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.
|
| + __ SmiScale(scratch1, slot, kPointerSizeLog2);
|
| + __ Daddu(feedback, vector, Operand(scratch1));
|
| + __ ld(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.
|
| }
|
|
|
|
|
|
|