| Index: src/ic/arm/ic-arm.cc
|
| diff --git a/src/ic/arm/ic-arm.cc b/src/ic/arm/ic-arm.cc
|
| index 10ec578f7bdfb2ace9b28089fb4203dc1e70d477..babf497a5b07e58c6e937454ad9a8402aa571420 100644
|
| --- a/src/ic/arm/ic-arm.cc
|
| +++ b/src/ic/arm/ic-arm.cc
|
| @@ -19,18 +19,6 @@ namespace internal {
|
|
|
| #define __ ACCESS_MASM(masm)
|
|
|
| -
|
| -static void GenerateGlobalInstanceTypeCheck(MacroAssembler* masm, Register type,
|
| - Label* global_object) {
|
| - // Register usage:
|
| - // type: holds the receiver instance type on entry.
|
| - __ cmp(type, Operand(JS_GLOBAL_OBJECT_TYPE));
|
| - __ b(eq, global_object);
|
| - __ cmp(type, Operand(JS_GLOBAL_PROXY_TYPE));
|
| - __ b(eq, global_object);
|
| -}
|
| -
|
| -
|
| // Helper function used from LoadIC GenerateNormal.
|
| //
|
| // elements: Property dictionary. It is not clobbered if a jump to the miss
|
| @@ -126,138 +114,6 @@ static void GenerateDictionaryStore(MacroAssembler* masm, Label* miss,
|
| kDontSaveFPRegs);
|
| }
|
|
|
| -
|
| -// Checks the receiver for special cases (value type, slow case bits).
|
| -// Falls through for regular JS object.
|
| -static void GenerateKeyedLoadReceiverCheck(MacroAssembler* masm,
|
| - Register receiver, Register map,
|
| - Register scratch,
|
| - int interceptor_bit, Label* slow) {
|
| - // Check that the object isn't a smi.
|
| - __ JumpIfSmi(receiver, slow);
|
| - // Get the map of the receiver.
|
| - __ ldr(map, FieldMemOperand(receiver, HeapObject::kMapOffset));
|
| - // Check bit field.
|
| - __ ldrb(scratch, FieldMemOperand(map, Map::kBitFieldOffset));
|
| - __ tst(scratch,
|
| - Operand((1 << Map::kIsAccessCheckNeeded) | (1 << interceptor_bit)));
|
| - __ b(ne, slow);
|
| - // Check that the object is some kind of JS object EXCEPT JS Value type.
|
| - // In the case that the object is a value-wrapper object,
|
| - // we enter the runtime system to make sure that indexing into string
|
| - // objects work as intended.
|
| - DCHECK(JS_OBJECT_TYPE > JS_VALUE_TYPE);
|
| - __ ldrb(scratch, FieldMemOperand(map, Map::kInstanceTypeOffset));
|
| - __ cmp(scratch, Operand(JS_OBJECT_TYPE));
|
| - __ b(lt, slow);
|
| -}
|
| -
|
| -
|
| -// Loads an indexed element from a fast case array.
|
| -static void GenerateFastArrayLoad(MacroAssembler* masm, Register receiver,
|
| - Register key, Register elements,
|
| - Register scratch1, Register scratch2,
|
| - Register result, Label* slow) {
|
| - // Register use:
|
| - //
|
| - // receiver - holds the receiver on entry.
|
| - // Unchanged unless 'result' is the same register.
|
| - //
|
| - // key - holds the smi key on entry.
|
| - // Unchanged unless 'result' is the same register.
|
| - //
|
| - // result - holds the result on exit if the load succeeded.
|
| - // Allowed to be the the same as 'receiver' or 'key'.
|
| - // Unchanged on bailout so 'receiver' and 'key' can be safely
|
| - // used by further computation.
|
| - //
|
| - // Scratch registers:
|
| - //
|
| - // elements - holds the elements of the receiver and its prototypes.
|
| - //
|
| - // scratch1 - used to hold elements length, bit fields, base addresses.
|
| - //
|
| - // scratch2 - used to hold maps, prototypes, and the loaded value.
|
| - Label check_prototypes, check_next_prototype;
|
| - Label done, in_bounds, absent;
|
| -
|
| - __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| - __ AssertFastElements(elements);
|
| -
|
| - // Check that the key (index) is within bounds.
|
| - __ ldr(scratch1, FieldMemOperand(elements, FixedArray::kLengthOffset));
|
| - __ cmp(key, Operand(scratch1));
|
| - __ b(lo, &in_bounds);
|
| - // Out-of-bounds. Check the prototype chain to see if we can just return
|
| - // 'undefined'.
|
| - __ cmp(key, Operand(0));
|
| - __ b(lt, slow); // Negative keys can't take the fast OOB path.
|
| - __ bind(&check_prototypes);
|
| - __ ldr(scratch2, FieldMemOperand(receiver, HeapObject::kMapOffset));
|
| - __ bind(&check_next_prototype);
|
| - __ ldr(scratch2, FieldMemOperand(scratch2, Map::kPrototypeOffset));
|
| - // scratch2: current prototype
|
| - __ CompareRoot(scratch2, Heap::kNullValueRootIndex);
|
| - __ b(eq, &absent);
|
| - __ ldr(elements, FieldMemOperand(scratch2, JSObject::kElementsOffset));
|
| - __ ldr(scratch2, FieldMemOperand(scratch2, HeapObject::kMapOffset));
|
| - // elements: elements of current prototype
|
| - // scratch2: map of current prototype
|
| - __ CompareInstanceType(scratch2, scratch1, JS_OBJECT_TYPE);
|
| - __ b(lo, slow);
|
| - __ ldrb(scratch1, FieldMemOperand(scratch2, Map::kBitFieldOffset));
|
| - __ tst(scratch1, Operand((1 << Map::kIsAccessCheckNeeded) |
|
| - (1 << Map::kHasIndexedInterceptor)));
|
| - __ b(ne, slow);
|
| - __ CompareRoot(elements, Heap::kEmptyFixedArrayRootIndex);
|
| - __ b(ne, slow);
|
| - __ jmp(&check_next_prototype);
|
| -
|
| - __ bind(&absent);
|
| - __ LoadRoot(result, Heap::kUndefinedValueRootIndex);
|
| - __ jmp(&done);
|
| -
|
| - __ bind(&in_bounds);
|
| - // Fast case: Do the load.
|
| - __ add(scratch1, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| - __ ldr(scratch2, MemOperand::PointerAddressFromSmiKey(scratch1, key));
|
| - __ CompareRoot(scratch2, Heap::kTheHoleValueRootIndex);
|
| - // In case the loaded value is the_hole we have to check the prototype chain.
|
| - __ b(eq, &check_prototypes);
|
| - __ mov(result, scratch2);
|
| - __ bind(&done);
|
| -}
|
| -
|
| -
|
| -// Checks whether a key is an array index string or a unique name.
|
| -// Falls through if a key is a unique name.
|
| -static void GenerateKeyNameCheck(MacroAssembler* masm, Register key,
|
| - Register map, Register hash,
|
| - Label* index_string, Label* not_unique) {
|
| - // The key is not a smi.
|
| - Label unique;
|
| - // Is it a name?
|
| - __ CompareObjectType(key, map, hash, LAST_UNIQUE_NAME_TYPE);
|
| - __ b(hi, not_unique);
|
| - STATIC_ASSERT(LAST_UNIQUE_NAME_TYPE == FIRST_NONSTRING_TYPE);
|
| - __ b(eq, &unique);
|
| -
|
| - // Is the string an array index, with cached numeric value?
|
| - __ ldr(hash, FieldMemOperand(key, Name::kHashFieldOffset));
|
| - __ tst(hash, Operand(Name::kContainsCachedArrayIndexMask));
|
| - __ b(eq, index_string);
|
| -
|
| - // Is the string internalized? We know it's a string, so a single
|
| - // bit test is enough.
|
| - // map: key map
|
| - __ ldrb(hash, FieldMemOperand(map, Map::kInstanceTypeOffset));
|
| - STATIC_ASSERT(kInternalizedTag == 0);
|
| - __ tst(hash, Operand(kIsNotInternalizedMask));
|
| - __ b(ne, not_unique);
|
| -
|
| - __ bind(&unique);
|
| -}
|
| -
|
| void LoadIC::GenerateNormal(MacroAssembler* masm) {
|
| Register dictionary = r0;
|
| DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister()));
|
| @@ -340,106 +196,6 @@ void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) {
|
| __ TailCallRuntime(Runtime::kKeyedGetProperty);
|
| }
|
|
|
| -void KeyedLoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| - // The return address is in lr.
|
| - Label slow, check_name, index_smi, index_name, property_array_property;
|
| - Label probe_dictionary, check_number_dictionary;
|
| -
|
| - Register key = LoadDescriptor::NameRegister();
|
| - Register receiver = LoadDescriptor::ReceiverRegister();
|
| - DCHECK(key.is(r2));
|
| - DCHECK(receiver.is(r1));
|
| -
|
| - Isolate* isolate = masm->isolate();
|
| -
|
| - // Check that the key is a smi.
|
| - __ JumpIfNotSmi(key, &check_name);
|
| - __ bind(&index_smi);
|
| - // Now the key is known to be a smi. This place is also jumped to from below
|
| - // where a numeric string is converted to a smi.
|
| -
|
| - GenerateKeyedLoadReceiverCheck(masm, receiver, r0, r3,
|
| - Map::kHasIndexedInterceptor, &slow);
|
| -
|
| - // Check the receiver's map to see if it has fast elements.
|
| - __ CheckFastElements(r0, r3, &check_number_dictionary);
|
| -
|
| - GenerateFastArrayLoad(masm, receiver, key, r0, r3, r4, r0, &slow);
|
| - __ IncrementCounter(isolate->counters()->ic_keyed_load_generic_smi(), 1, r4,
|
| - r3);
|
| - __ Ret();
|
| -
|
| - __ bind(&check_number_dictionary);
|
| - __ ldr(r4, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| - __ ldr(r3, FieldMemOperand(r4, JSObject::kMapOffset));
|
| -
|
| - // Check whether the elements is a number dictionary.
|
| - // r3: elements map
|
| - // r4: elements
|
| - __ LoadRoot(ip, Heap::kHashTableMapRootIndex);
|
| - __ cmp(r3, ip);
|
| - __ b(ne, &slow);
|
| - __ SmiUntag(r0, key);
|
| - __ LoadFromNumberDictionary(&slow, r4, key, r0, r0, r3, r5);
|
| - __ Ret();
|
| -
|
| - // Slow case, key and receiver still in r2 and r1.
|
| - __ bind(&slow);
|
| - __ IncrementCounter(isolate->counters()->ic_keyed_load_generic_slow(), 1, r4,
|
| - r3);
|
| - GenerateRuntimeGetProperty(masm);
|
| -
|
| - __ bind(&check_name);
|
| - GenerateKeyNameCheck(masm, key, r0, r3, &index_name, &slow);
|
| -
|
| - GenerateKeyedLoadReceiverCheck(masm, receiver, r0, r3,
|
| - Map::kHasNamedInterceptor, &slow);
|
| -
|
| - // If the receiver is a fast-case object, check the stub cache. Otherwise
|
| - // probe the dictionary.
|
| - __ ldr(r3, FieldMemOperand(receiver, JSObject::kPropertiesOffset));
|
| - __ ldr(r4, FieldMemOperand(r3, HeapObject::kMapOffset));
|
| - __ LoadRoot(ip, Heap::kHashTableMapRootIndex);
|
| - __ cmp(r4, ip);
|
| - __ b(eq, &probe_dictionary);
|
| -
|
| - // 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 = LoadWithVectorDescriptor::VectorRegister();
|
| - Register slot = LoadWithVectorDescriptor::SlotRegister();
|
| - DCHECK(!AreAliased(vector, slot, r4, r5, r6, r9));
|
| - Handle<TypeFeedbackVector> dummy_vector =
|
| - TypeFeedbackVector::DummyVector(masm->isolate());
|
| - int slot_index = dummy_vector->GetIndex(
|
| - FeedbackVectorSlot(TypeFeedbackVector::kDummyKeyedLoadICSlot));
|
| - __ LoadRoot(vector, Heap::kDummyVectorRootIndex);
|
| - __ mov(slot, Operand(Smi::FromInt(slot_index)));
|
| -
|
| - masm->isolate()->load_stub_cache()->GenerateProbe(masm, receiver, key, r4, r5,
|
| - r6, r9);
|
| - // Cache miss.
|
| - GenerateMiss(masm);
|
| -
|
| - // Do a quick inline probe of the receiver's dictionary, if it
|
| - // exists.
|
| - __ bind(&probe_dictionary);
|
| - // r3: elements
|
| - __ ldr(r0, FieldMemOperand(receiver, HeapObject::kMapOffset));
|
| - __ ldrb(r0, FieldMemOperand(r0, Map::kInstanceTypeOffset));
|
| - GenerateGlobalInstanceTypeCheck(masm, r0, &slow);
|
| - // Load the property to r0.
|
| - GenerateDictionaryLoad(masm, &slow, r3, key, r0, r5, r4);
|
| - __ IncrementCounter(isolate->counters()->ic_keyed_load_generic_symbol(), 1,
|
| - r4, r3);
|
| - __ Ret();
|
| -
|
| - __ bind(&index_name);
|
| - __ IndexFromHash(r3, key);
|
| - // Now jump to the place where smi keys are handled.
|
| - __ jmp(&index_smi);
|
| -}
|
| -
|
| -
|
| static void StoreIC_PushArgs(MacroAssembler* masm) {
|
| __ Push(StoreWithVectorDescriptor::ValueRegister(),
|
| StoreWithVectorDescriptor::SlotRegister(),
|
|
|