| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index 9ad4a64457534a2abfe78675885f1a086cd8904b..b73d747c6a1a764969982c17f1a99c4d5937d60f 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -2642,84 +2642,6 @@ void NameDictionaryLookupStub::GenerateNegativeLookup(MacroAssembler* masm,
|
| __ b(ne, miss);
|
| }
|
|
|
| -
|
| -// Probe the name 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.
|
| -// If lookup was successful |scratch2| will be equal to elements + 4 * index.
|
| -void NameDictionaryLookupStub::GeneratePositiveLookup(MacroAssembler* masm,
|
| - Label* miss,
|
| - Label* done,
|
| - Register elements,
|
| - Register name,
|
| - Register scratch1,
|
| - Register scratch2) {
|
| - DCHECK(!elements.is(scratch1));
|
| - DCHECK(!elements.is(scratch2));
|
| - DCHECK(!name.is(scratch1));
|
| - DCHECK(!name.is(scratch2));
|
| -
|
| - __ AssertName(name);
|
| -
|
| - // Compute the capacity mask.
|
| - __ ldr(scratch1, FieldMemOperand(elements, kCapacityOffset));
|
| - __ SmiUntag(scratch1);
|
| - __ sub(scratch1, scratch1, Operand(1));
|
| -
|
| - // Generate an unrolled loop that performs a few probes before
|
| - // giving up. Measurements done on Gmail indicate that 2 probes
|
| - // cover ~93% of loads from dictionaries.
|
| - for (int i = 0; i < kInlinedProbes; i++) {
|
| - // Compute the masked index: (hash + i + i * i) & mask.
|
| - __ ldr(scratch2, FieldMemOperand(name, Name::kHashFieldOffset));
|
| - if (i > 0) {
|
| - // Add the probe offset (i + i * i) left shifted to avoid right shifting
|
| - // the hash in a separate instruction. The value hash + i + i * i is right
|
| - // shifted in the following and instruction.
|
| - DCHECK(NameDictionary::GetProbeOffset(i) <
|
| - 1 << (32 - Name::kHashFieldOffset));
|
| - __ add(scratch2, scratch2, Operand(
|
| - NameDictionary::GetProbeOffset(i) << Name::kHashShift));
|
| - }
|
| - __ and_(scratch2, scratch1, Operand(scratch2, LSR, Name::kHashShift));
|
| -
|
| - // Scale the index by multiplying by the entry size.
|
| - STATIC_ASSERT(NameDictionary::kEntrySize == 3);
|
| - // scratch2 = scratch2 * 3.
|
| - __ add(scratch2, scratch2, Operand(scratch2, LSL, 1));
|
| -
|
| - // Check if the key is identical to the name.
|
| - __ add(scratch2, elements, Operand(scratch2, LSL, 2));
|
| - __ ldr(ip, FieldMemOperand(scratch2, kElementsStartOffset));
|
| - __ cmp(name, Operand(ip));
|
| - __ b(eq, done);
|
| - }
|
| -
|
| - const int spill_mask =
|
| - (lr.bit() | r6.bit() | r5.bit() | r4.bit() |
|
| - r3.bit() | r2.bit() | r1.bit() | r0.bit()) &
|
| - ~(scratch1.bit() | scratch2.bit());
|
| -
|
| - __ stm(db_w, sp, spill_mask);
|
| - if (name.is(r0)) {
|
| - DCHECK(!elements.is(r1));
|
| - __ Move(r1, name);
|
| - __ Move(r0, elements);
|
| - } else {
|
| - __ Move(r0, elements);
|
| - __ Move(r1, name);
|
| - }
|
| - NameDictionaryLookupStub stub(masm->isolate(), POSITIVE_LOOKUP);
|
| - __ CallStub(&stub);
|
| - __ cmp(r0, Operand::Zero());
|
| - __ mov(scratch2, Operand(r2));
|
| - __ ldm(ia_w, sp, spill_mask);
|
| -
|
| - __ b(ne, done);
|
| - __ b(eq, miss);
|
| -}
|
| -
|
| -
|
| void NameDictionaryLookupStub::Generate(MacroAssembler* masm) {
|
| // This stub overrides SometimesSetsUpAFrame() to return false. That means
|
| // we cannot call anything that could cause a GC from this stub.
|
|
|