Index: src/mips/code-stubs-mips.cc |
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc |
index 16461ec7d7f6726efeddad9587ceab9bc5f36d18..fe17226d9e10c76d8c6599f82ccc50667dd38f5d 100644 |
--- a/src/mips/code-stubs-mips.cc |
+++ b/src/mips/code-stubs-mips.cc |
@@ -5351,7 +5351,8 @@ void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) { |
void StringCharCodeAtGenerator::GenerateSlow( |
- MacroAssembler* masm, const RuntimeCallHelper& call_helper) { |
+ MacroAssembler* masm, |
+ const RuntimeCallHelper& call_helper) { |
__ Abort("Unexpected fallthrough to CharCodeAt slow case"); |
// Index is not a smi. |
@@ -5437,7 +5438,8 @@ void StringCharFromCodeGenerator::GenerateFast(MacroAssembler* masm) { |
void StringCharFromCodeGenerator::GenerateSlow( |
- MacroAssembler* masm, const RuntimeCallHelper& call_helper) { |
+ MacroAssembler* masm, |
+ const RuntimeCallHelper& call_helper) { |
__ Abort("Unexpected fallthrough to CharFromCode slow case"); |
__ bind(&slow_case_); |
@@ -5463,7 +5465,8 @@ void StringCharAtGenerator::GenerateFast(MacroAssembler* masm) { |
void StringCharAtGenerator::GenerateSlow( |
- MacroAssembler* masm, const RuntimeCallHelper& call_helper) { |
+ MacroAssembler* masm, |
+ const RuntimeCallHelper& call_helper) { |
char_code_at_generator_.GenerateSlow(masm, call_helper); |
char_from_code_generator_.GenerateSlow(masm, call_helper); |
} |
@@ -7021,86 +7024,6 @@ void StringDictionaryLookupStub::GenerateNegativeLookup(MacroAssembler* masm, |
} |
-// TODO(kmillikin): Eliminate this function when the stub cache is fully |
-// handlified. |
-MaybeObject* StringDictionaryLookupStub::TryGenerateNegativeLookup( |
- MacroAssembler* masm, |
- Label* miss, |
- Label* done, |
- Register receiver, |
- Register properties, |
- String* name, |
- Register scratch0) { |
-// If names of slots in range from 1 to kProbes - 1 for the hash value are |
- // not equal to the name and kProbes-th slot is not used (its name is the |
- // undefined value), it guarantees the hash table doesn't contain the |
- // property. It's true even if some slots represent deleted properties |
- // (their names are the null value). |
- for (int i = 0; i < kInlinedProbes; i++) { |
- // scratch0 points to properties hash. |
- // Compute the masked index: (hash + i + i * i) & mask. |
- Register index = scratch0; |
- // Capacity is smi 2^n. |
- __ lw(index, FieldMemOperand(properties, kCapacityOffset)); |
- __ Subu(index, index, Operand(1)); |
- __ And(index, index, Operand( |
- Smi::FromInt(name->Hash() + StringDictionary::GetProbeOffset(i)))); |
- |
- // Scale the index by multiplying by the entry size. |
- ASSERT(StringDictionary::kEntrySize == 3); |
- // index *= 3. |
- __ sll(at, index, 1); |
- __ Addu(index, index, at); |
- |
- Register entity_name = scratch0; |
- // Having undefined at this place means the name is not contained. |
- ASSERT_EQ(kSmiTagSize, 1); |
- Register tmp = properties; |
- |
- __ sll(scratch0, index, 1); |
- __ Addu(tmp, properties, scratch0); |
- __ lw(entity_name, FieldMemOperand(tmp, kElementsStartOffset)); |
- |
- ASSERT(!tmp.is(entity_name)); |
- __ LoadRoot(tmp, Heap::kUndefinedValueRootIndex); |
- __ Branch(done, eq, entity_name, Operand(tmp)); |
- |
- if (i != kInlinedProbes - 1) { |
- // Stop if found the property. |
- __ Branch(miss, eq, entity_name, Operand(Handle<String>(name))); |
- |
- // Check if the entry name is not a symbol. |
- __ lw(entity_name, FieldMemOperand(entity_name, HeapObject::kMapOffset)); |
- __ lbu(entity_name, |
- FieldMemOperand(entity_name, Map::kInstanceTypeOffset)); |
- __ And(scratch0, entity_name, Operand(kIsSymbolMask)); |
- __ Branch(miss, eq, scratch0, Operand(zero_reg)); |
- |
- // Restore the properties. |
- __ lw(properties, |
- FieldMemOperand(receiver, JSObject::kPropertiesOffset)); |
- } |
- } |
- |
- const int spill_mask = |
- (ra.bit() | t2.bit() | t1.bit() | t0.bit() | a3.bit() | |
- a2.bit() | a1.bit() | a0.bit() | v0.bit()); |
- |
- __ MultiPush(spill_mask); |
- __ lw(a0, FieldMemOperand(receiver, JSObject::kPropertiesOffset)); |
- __ li(a1, Operand(Handle<String>(name))); |
- StringDictionaryLookupStub stub(NEGATIVE_LOOKUP); |
- MaybeObject* result = masm->TryCallStub(&stub); |
- if (result->IsFailure()) return result; |
- __ mov(at, v0); |
- __ MultiPop(spill_mask); |
- |
- __ Branch(done, eq, at, Operand(zero_reg)); |
- __ Branch(miss, ne, at, Operand(zero_reg)); |
- return result; |
-} |
- |
- |
// Probe the string dictionary in the |elements| register. Jump to the |
// |done| label if a property with the given name is found. Jump to |
// the |miss| label otherwise. |