diff options
Diffstat (limited to 'src/ic/x87')
| -rw-r--r-- | src/ic/x87/OWNERS | 1 | ||||
| -rw-r--r-- | src/ic/x87/handler-compiler-x87.cc | 131 | ||||
| -rw-r--r-- | src/ic/x87/ic-compiler-x87.cc | 45 | ||||
| -rw-r--r-- | src/ic/x87/ic-x87.cc | 525 | ||||
| -rw-r--r-- | src/ic/x87/stub-cache-x87.cc | 185 |
5 files changed, 27 insertions, 860 deletions
diff --git a/src/ic/x87/OWNERS b/src/ic/x87/OWNERS index dd9998b2..61245ae8 100644 --- a/src/ic/x87/OWNERS +++ b/src/ic/x87/OWNERS @@ -1 +1,2 @@ weiliang.lin@intel.com +chunyang.dai@intel.com diff --git a/src/ic/x87/handler-compiler-x87.cc b/src/ic/x87/handler-compiler-x87.cc index a5c32d37..5a61eee1 100644 --- a/src/ic/x87/handler-compiler-x87.cc +++ b/src/ic/x87/handler-compiler-x87.cc @@ -83,16 +83,6 @@ void PropertyHandlerCompiler::DiscardVectorAndSlot() { __ add(esp, Immediate(2 * kPointerSize)); } -void PropertyHandlerCompiler::PushReturnAddress(Register tmp) { - MacroAssembler* masm = this->masm(); - __ push(tmp); -} - -void PropertyHandlerCompiler::PopReturnAddress(Register tmp) { - MacroAssembler* masm = this->masm(); - __ pop(tmp); -} - void PropertyHandlerCompiler::GenerateDictionaryNegativeLookup( MacroAssembler* masm, Label* miss_label, Register receiver, Handle<Name> name, Register scratch0, Register scratch1) { @@ -132,27 +122,6 @@ void PropertyHandlerCompiler::GenerateDictionaryNegativeLookup( __ DecrementCounter(counters->negative_lookups_miss(), 1); } - -void NamedLoadHandlerCompiler::GenerateDirectLoadGlobalFunctionPrototype( - MacroAssembler* masm, int index, Register result, Label* miss) { - __ LoadGlobalFunction(index, result); - // Load its initial map. The global functions all have initial maps. - __ mov(result, - FieldOperand(result, JSFunction::kPrototypeOrInitialMapOffset)); - // Load the prototype from the initial map. - __ mov(result, FieldOperand(result, Map::kPrototypeOffset)); -} - - -void NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype( - MacroAssembler* masm, Register receiver, Register scratch1, - Register scratch2, Label* miss_label) { - // TODO(mvstanton): This isn't used on ia32. Move all the other - // platform implementations into a code stub so this method can be removed. - UNREACHABLE(); -} - - // Generate call to api function. // This function uses push() to generate smaller, faster code than // the version above. It is an optimization that should will be removed @@ -324,10 +293,12 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter( } } +static void CompileCallLoadPropertyWithInterceptor( + MacroAssembler* masm, Register receiver, Register holder, Register name, + Handle<JSObject> holder_obj, Runtime::FunctionId id) { + DCHECK(NamedLoadHandlerCompiler::kInterceptorArgsLength == + Runtime::FunctionForId(id)->nargs); -static void PushInterceptorArguments(MacroAssembler* masm, Register receiver, - Register holder, Register name, - Handle<JSObject> holder_obj) { STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsNameIndex == 0); STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsThisIndex == 1); STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsHolderIndex == 2); @@ -335,15 +306,7 @@ static void PushInterceptorArguments(MacroAssembler* masm, Register receiver, __ push(name); __ push(receiver); __ push(holder); -} - -static void CompileCallLoadPropertyWithInterceptor( - MacroAssembler* masm, Register receiver, Register holder, Register name, - Handle<JSObject> holder_obj, Runtime::FunctionId id) { - DCHECK(NamedLoadHandlerCompiler::kInterceptorArgsLength == - Runtime::FunctionForId(id)->nargs); - PushInterceptorArguments(masm, receiver, holder, name, holder_obj); __ CallRuntime(id); } @@ -359,58 +322,6 @@ void NamedStoreHandlerCompiler::GenerateRestoreName(Label* label, } } - -void NamedStoreHandlerCompiler::GenerateRestoreName(Handle<Name> name) { - __ mov(this->name(), Immediate(name)); -} - - -void NamedStoreHandlerCompiler::GenerateRestoreMap(Handle<Map> transition, - Register map_reg, - Register scratch, - Label* miss) { - Handle<WeakCell> cell = Map::WeakCellForMap(transition); - DCHECK(!map_reg.is(scratch)); - __ LoadWeakValue(map_reg, cell, miss); - if (transition->CanBeDeprecated()) { - __ mov(scratch, FieldOperand(map_reg, Map::kBitField3Offset)); - __ and_(scratch, Immediate(Map::Deprecated::kMask)); - __ j(not_zero, miss); - } -} - - -void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, - int descriptor, - Register value_reg, - Register scratch, - Label* miss_label) { - DCHECK(!map_reg.is(scratch)); - DCHECK(!map_reg.is(value_reg)); - DCHECK(!value_reg.is(scratch)); - __ LoadInstanceDescriptors(map_reg, scratch); - __ mov(scratch, - FieldOperand(scratch, DescriptorArray::GetValueOffset(descriptor))); - __ cmp(value_reg, scratch); - __ j(not_equal, miss_label); -} - -void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(FieldType* field_type, - Register value_reg, - Label* miss_label) { - Register map_reg = scratch1(); - Register scratch = scratch2(); - DCHECK(!value_reg.is(map_reg)); - DCHECK(!value_reg.is(scratch)); - __ JumpIfSmi(value_reg, miss_label); - if (field_type->IsClass()) { - __ mov(map_reg, FieldOperand(value_reg, HeapObject::kMapOffset)); - __ CmpWeakValue(map_reg, Map::WeakCellForMap(field_type->AsClass()), - scratch); - __ j(not_equal, miss_label); - } -} - void PropertyHandlerCompiler::GenerateAccessCheck( Handle<WeakCell> native_context_cell, Register scratch1, Register scratch2, Label* miss, bool compare_native_contexts_only) { @@ -540,14 +451,6 @@ void NamedStoreHandlerCompiler::FrontendFooter(Handle<Name> name, Label* miss) { } } - -void NamedLoadHandlerCompiler::GenerateLoadConstant(Handle<Object> value) { - // Return the constant value. - __ LoadObject(eax, value); - __ ret(0); -} - - void NamedLoadHandlerCompiler::GenerateLoadInterceptorWithFollowup( LookupIterator* it, Register holder_reg) { DCHECK(holder()->HasNamedInterceptor()); @@ -620,10 +523,26 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) { DCHECK(holder()->HasNamedInterceptor()); DCHECK(!holder()->GetNamedInterceptor()->getter()->IsUndefined(isolate())); // Call the runtime system to load the interceptor. - __ pop(scratch2()); // save old return address - PushInterceptorArguments(masm(), receiver(), holder_reg, this->name(), - holder()); - __ push(scratch2()); // restore old return address + + // Stack: + // return address + + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsNameIndex == 0); + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsThisIndex == 1); + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsHolderIndex == 2); + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsLength == 3); + __ push(receiver()); + __ push(holder_reg); + // See NamedLoadHandlerCompiler::InterceptorVectorSlotPop() for details. + if (holder_reg.is(receiver())) { + __ push(slot()); + __ push(vector()); + } else { + __ push(scratch3()); // slot + __ push(scratch2()); // vector + } + __ push(Operand(esp, 4 * kPointerSize)); // return address + __ mov(Operand(esp, 5 * kPointerSize), name()); __ TailCallRuntime(Runtime::kLoadPropertyWithInterceptor); } diff --git a/src/ic/x87/ic-compiler-x87.cc b/src/ic/x87/ic-compiler-x87.cc deleted file mode 100644 index 11a8cdcd..00000000 --- a/src/ic/x87/ic-compiler-x87.cc +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2012 the V8 project authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#if V8_TARGET_ARCH_X87 - -#include "src/ic/ic.h" -#include "src/ic/ic-compiler.h" - -namespace v8 { -namespace internal { - -#define __ ACCESS_MASM(masm) - - -void PropertyICCompiler::GenerateRuntimeSetProperty( - MacroAssembler* masm, LanguageMode language_mode) { - typedef StoreWithVectorDescriptor Descriptor; - STATIC_ASSERT(Descriptor::kStackArgumentsCount == 3); - // ----------- S t a t e ------------- - // -- esp[12] : value - // -- esp[8] : slot - // -- esp[4] : vector - // -- esp[0] : return address - // ----------------------------------- - __ LoadParameterFromStack<Descriptor>(Descriptor::ValueRegister(), - Descriptor::kValue); - - __ mov(Operand(esp, 12), Descriptor::ReceiverRegister()); - __ mov(Operand(esp, 8), Descriptor::NameRegister()); - __ mov(Operand(esp, 4), Descriptor::ValueRegister()); - __ pop(ebx); - __ push(Immediate(Smi::FromInt(language_mode))); - __ push(ebx); // return address - - // Do tail-call to runtime routine. - __ TailCallRuntime(Runtime::kSetProperty); -} - - -#undef __ -} // namespace internal -} // namespace v8 - -#endif // V8_TARGET_ARCH_X87 diff --git a/src/ic/x87/ic-x87.cc b/src/ic/x87/ic-x87.cc index f96e509f..7564c006 100644 --- a/src/ic/x87/ic-x87.cc +++ b/src/ic/x87/ic-x87.cc @@ -6,532 +6,11 @@ #include "src/codegen.h" #include "src/ic/ic.h" -#include "src/ic/ic-compiler.h" #include "src/ic/stub-cache.h" namespace v8 { namespace internal { -// ---------------------------------------------------------------------------- -// Static IC stub generators. -// - -#define __ ACCESS_MASM(masm) - -// Helper function used to load a property from a dictionary backing -// storage. This function may fail to load a property even though it is -// in the dictionary, so code at miss_label must always call a backup -// property load that is complete. This function is safe to call if -// name is not internalized, and will jump to the miss_label in that -// case. The generated code assumes that the receiver has slow -// properties, is not a global object and does not have interceptors. -static void GenerateDictionaryLoad(MacroAssembler* masm, Label* miss_label, - Register elements, Register name, - Register r0, Register r1, Register result) { - // Register use: - // - // elements - holds the property dictionary on entry and is unchanged. - // - // name - holds the name of the property on entry and is unchanged. - // - // Scratch registers: - // - // r0 - used for the index into the property dictionary - // - // r1 - used to hold the capacity of the property dictionary. - // - // result - holds the result on exit. - - Label done; - - // Probe the dictionary. - NameDictionaryLookupStub::GeneratePositiveLookup(masm, miss_label, &done, - elements, name, r0, r1); - - // If probing finds an entry in the dictionary, r0 contains the - // index into the dictionary. Check that the value is a normal - // property. - __ bind(&done); - const int kElementsStartOffset = - NameDictionary::kHeaderSize + - NameDictionary::kElementsStartIndex * kPointerSize; - const int kDetailsOffset = kElementsStartOffset + 2 * kPointerSize; - __ test(Operand(elements, r0, times_4, kDetailsOffset - kHeapObjectTag), - Immediate(PropertyDetails::TypeField::kMask << kSmiTagSize)); - __ j(not_zero, miss_label); - - // Get the value at the masked, scaled index. - const int kValueOffset = kElementsStartOffset + kPointerSize; - __ mov(result, Operand(elements, r0, times_4, kValueOffset - kHeapObjectTag)); -} - - -// Helper function used to store a property to a dictionary backing -// storage. This function may fail to store a property eventhough it -// is in the dictionary, so code at miss_label must always call a -// backup property store that is complete. This function is safe to -// call if name is not internalized, and will jump to the miss_label in -// that case. The generated code assumes that the receiver has slow -// properties, is not a global object and does not have interceptors. -static void GenerateDictionaryStore(MacroAssembler* masm, Label* miss_label, - Register elements, Register name, - Register value, Register r0, Register r1) { - // Register use: - // - // elements - holds the property dictionary on entry and is clobbered. - // - // name - holds the name of the property on entry and is unchanged. - // - // value - holds the value to store and is unchanged. - // - // r0 - used for index into the property dictionary and is clobbered. - // - // r1 - used to hold the capacity of the property dictionary and is clobbered. - Label done; - - - // Probe the dictionary. - NameDictionaryLookupStub::GeneratePositiveLookup(masm, miss_label, &done, - elements, name, r0, r1); - - // If probing finds an entry in the dictionary, r0 contains the - // index into the dictionary. Check that the value is a normal - // property that is not read only. - __ bind(&done); - const int kElementsStartOffset = - NameDictionary::kHeaderSize + - NameDictionary::kElementsStartIndex * kPointerSize; - const int kDetailsOffset = kElementsStartOffset + 2 * kPointerSize; - const int kTypeAndReadOnlyMask = - (PropertyDetails::TypeField::kMask | - PropertyDetails::AttributesField::encode(READ_ONLY)) - << kSmiTagSize; - __ test(Operand(elements, r0, times_4, kDetailsOffset - kHeapObjectTag), - Immediate(kTypeAndReadOnlyMask)); - __ j(not_zero, miss_label); - - // Store the value at the masked, scaled index. - const int kValueOffset = kElementsStartOffset + kPointerSize; - __ lea(r0, Operand(elements, r0, times_4, kValueOffset - kHeapObjectTag)); - __ mov(Operand(r0, 0), value); - - // Update write barrier. Make sure not to clobber the value. - __ mov(r1, value); - __ RecordWrite(elements, r0, r1, kDontSaveFPRegs); -} - -static void KeyedStoreGenerateMegamorphicHelper( - MacroAssembler* masm, Label* fast_object, Label* fast_double, Label* slow, - KeyedStoreCheckMap check_map, KeyedStoreIncrementLength increment_length) { - Label transition_smi_elements; - Label finish_object_store, non_double_value, transition_double_elements; - Label fast_double_without_map_check; - Register receiver = StoreDescriptor::ReceiverRegister(); - Register key = StoreDescriptor::NameRegister(); - Register value = StoreDescriptor::ValueRegister(); - DCHECK(receiver.is(edx)); - DCHECK(key.is(ecx)); - DCHECK(value.is(eax)); - // key is a smi. - // ebx: FixedArray receiver->elements - // edi: receiver map - // Fast case: Do the store, could either Object or double. - __ bind(fast_object); - if (check_map == kCheckMap) { - __ mov(edi, FieldOperand(ebx, HeapObject::kMapOffset)); - __ cmp(edi, masm->isolate()->factory()->fixed_array_map()); - __ j(not_equal, fast_double); - } - - // HOLECHECK: guards "A[i] = V" - // We have to go to the runtime if the current value is the hole because - // there may be a callback on the element - Label holecheck_passed1; - __ cmp(FixedArrayElementOperand(ebx, key), - masm->isolate()->factory()->the_hole_value()); - __ j(not_equal, &holecheck_passed1); - __ JumpIfDictionaryInPrototypeChain(receiver, ebx, edi, slow); - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - - __ bind(&holecheck_passed1); - - // Smi stores don't require further checks. - Label non_smi_value; - __ JumpIfNotSmi(value, &non_smi_value); - if (increment_length == kIncrementLength) { - // Add 1 to receiver->length. - __ add(FieldOperand(receiver, JSArray::kLengthOffset), - Immediate(Smi::FromInt(1))); - } - // It's irrelevant whether array is smi-only or not when writing a smi. - __ mov(FixedArrayElementOperand(ebx, key), value); - __ ret(StoreWithVectorDescriptor::kStackArgumentsCount * kPointerSize); - - __ bind(&non_smi_value); - // Escape to elements kind transition case. - __ mov(edi, FieldOperand(receiver, HeapObject::kMapOffset)); - __ CheckFastObjectElements(edi, &transition_smi_elements); - - // Fast elements array, store the value to the elements backing store. - __ bind(&finish_object_store); - if (increment_length == kIncrementLength) { - // Add 1 to receiver->length. - __ add(FieldOperand(receiver, JSArray::kLengthOffset), - Immediate(Smi::FromInt(1))); - } - __ mov(FixedArrayElementOperand(ebx, key), value); - // Update write barrier for the elements array address. - __ mov(edx, value); // Preserve the value which is returned. - __ RecordWriteArray(ebx, edx, key, kDontSaveFPRegs, EMIT_REMEMBERED_SET, - OMIT_SMI_CHECK); - __ ret(StoreWithVectorDescriptor::kStackArgumentsCount * kPointerSize); - - __ bind(fast_double); - if (check_map == kCheckMap) { - // Check for fast double array case. If this fails, call through to the - // runtime. - __ cmp(edi, masm->isolate()->factory()->fixed_double_array_map()); - __ j(not_equal, slow); - // If the value is a number, store it as a double in the FastDoubleElements - // array. - } - - // HOLECHECK: guards "A[i] double hole?" - // We have to see if the double version of the hole is present. If so - // go to the runtime. - uint32_t offset = FixedDoubleArray::kHeaderSize + sizeof(kHoleNanLower32); - __ cmp(FieldOperand(ebx, key, times_4, offset), Immediate(kHoleNanUpper32)); - __ j(not_equal, &fast_double_without_map_check); - __ JumpIfDictionaryInPrototypeChain(receiver, ebx, edi, slow); - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - - __ bind(&fast_double_without_map_check); - __ StoreNumberToDoubleElements(value, ebx, key, edi, - &transition_double_elements, false); - if (increment_length == kIncrementLength) { - // Add 1 to receiver->length. - __ add(FieldOperand(receiver, JSArray::kLengthOffset), - Immediate(Smi::FromInt(1))); - } - __ ret(StoreWithVectorDescriptor::kStackArgumentsCount * kPointerSize); - - __ bind(&transition_smi_elements); - __ mov(ebx, FieldOperand(receiver, HeapObject::kMapOffset)); - - // Transition the array appropriately depending on the value type. - __ CheckMap(value, masm->isolate()->factory()->heap_number_map(), - &non_double_value, DONT_DO_SMI_CHECK); - - // Value is a double. Transition FAST_SMI_ELEMENTS -> FAST_DOUBLE_ELEMENTS - // and complete the store. - __ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS, - FAST_DOUBLE_ELEMENTS, ebx, edi, slow); - AllocationSiteMode mode = - AllocationSite::GetMode(FAST_SMI_ELEMENTS, FAST_DOUBLE_ELEMENTS); - ElementsTransitionGenerator::GenerateSmiToDouble(masm, receiver, key, value, - ebx, mode, slow); - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - __ jmp(&fast_double_without_map_check); - - __ bind(&non_double_value); - // Value is not a double, FAST_SMI_ELEMENTS -> FAST_ELEMENTS - __ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS, FAST_ELEMENTS, ebx, - edi, slow); - mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS); - ElementsTransitionGenerator::GenerateMapChangeElementsTransition( - masm, receiver, key, value, ebx, mode, slow); - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - __ jmp(&finish_object_store); - - __ bind(&transition_double_elements); - // Elements are FAST_DOUBLE_ELEMENTS, but value is an Object that's not a - // HeapNumber. Make sure that the receiver is a Array with FAST_ELEMENTS and - // transition array from FAST_DOUBLE_ELEMENTS to FAST_ELEMENTS - __ mov(ebx, FieldOperand(receiver, HeapObject::kMapOffset)); - __ LoadTransitionedArrayMapConditional(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS, - ebx, edi, slow); - mode = AllocationSite::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS); - ElementsTransitionGenerator::GenerateDoubleToObject(masm, receiver, key, - value, ebx, mode, slow); - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - __ jmp(&finish_object_store); -} - - -void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm, - LanguageMode language_mode) { - typedef StoreWithVectorDescriptor Descriptor; - // Return address is on the stack. - Label slow, fast_object, fast_object_grow; - Label fast_double, fast_double_grow; - Label array, extra, check_if_double_array, maybe_name_key, miss; - Register receiver = Descriptor::ReceiverRegister(); - Register key = Descriptor::NameRegister(); - DCHECK(receiver.is(edx)); - DCHECK(key.is(ecx)); - - // Check that the object isn't a smi. - __ JumpIfSmi(receiver, &slow); - // Get the map from the receiver. - __ mov(edi, FieldOperand(receiver, HeapObject::kMapOffset)); - // Check that the receiver does not require access checks. - // The generic stub does not perform map checks. - __ test_b(FieldOperand(edi, Map::kBitFieldOffset), - Immediate(1 << Map::kIsAccessCheckNeeded)); - __ j(not_zero, &slow); - - __ LoadParameterFromStack<Descriptor>(Descriptor::ValueRegister(), - Descriptor::kValue); - - // Check that the key is a smi. - __ JumpIfNotSmi(key, &maybe_name_key); - __ CmpInstanceType(edi, JS_ARRAY_TYPE); - __ j(equal, &array); - // 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 works as intended. - STATIC_ASSERT(JS_VALUE_TYPE < JS_OBJECT_TYPE); - __ CmpInstanceType(edi, JS_OBJECT_TYPE); - __ j(below, &slow); - - // Object case: Check key against length in the elements array. - // Key is a smi. - // edi: receiver map - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - // Check array bounds. Both the key and the length of FixedArray are smis. - __ cmp(key, FieldOperand(ebx, FixedArray::kLengthOffset)); - __ j(below, &fast_object); - - // Slow case: call runtime. - __ bind(&slow); - PropertyICCompiler::GenerateRuntimeSetProperty(masm, language_mode); - // Never returns to here. - - __ bind(&maybe_name_key); - __ mov(ebx, FieldOperand(key, HeapObject::kMapOffset)); - __ movzx_b(ebx, FieldOperand(ebx, Map::kInstanceTypeOffset)); - __ JumpIfNotUniqueNameInstanceType(ebx, &slow); - - masm->isolate()->store_stub_cache()->GenerateProbe(masm, receiver, key, edi, - no_reg); - - // Cache miss. - __ jmp(&miss); - - // Extra capacity case: Check if there is extra capacity to - // perform the store and update the length. Used for adding one - // element to the array by writing to array[array.length]. - __ bind(&extra); - // receiver is a JSArray. - // key is a smi. - // ebx: receiver->elements, a FixedArray - // edi: receiver map - // flags: compare (key, receiver.length()) - // do not leave holes in the array: - __ j(not_equal, &slow); - __ cmp(key, FieldOperand(ebx, FixedArray::kLengthOffset)); - __ j(above_equal, &slow); - __ mov(edi, FieldOperand(ebx, HeapObject::kMapOffset)); - __ cmp(edi, masm->isolate()->factory()->fixed_array_map()); - __ j(not_equal, &check_if_double_array); - __ jmp(&fast_object_grow); - - __ bind(&check_if_double_array); - __ cmp(edi, masm->isolate()->factory()->fixed_double_array_map()); - __ j(not_equal, &slow); - __ jmp(&fast_double_grow); - - // Array case: Get the length and the elements array from the JS - // array. Check that the array is in fast mode (and writable); if it - // is the length is always a smi. - __ bind(&array); - // receiver is a JSArray. - // key is a smi. - // edi: receiver map - __ mov(ebx, FieldOperand(receiver, JSObject::kElementsOffset)); - - // Check the key against the length in the array and fall through to the - // common store code. - __ cmp(key, FieldOperand(receiver, JSArray::kLengthOffset)); // Compare smis. - __ j(above_equal, &extra); - - KeyedStoreGenerateMegamorphicHelper(masm, &fast_object, &fast_double, &slow, - kCheckMap, kDontIncrementLength); - KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow, - &fast_double_grow, &slow, kDontCheckMap, - kIncrementLength); - - __ bind(&miss); - GenerateMiss(masm); -} - -void LoadIC::GenerateNormal(MacroAssembler* masm) { - Register dictionary = eax; - DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); - DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); - - Label slow; - - __ mov(dictionary, FieldOperand(LoadDescriptor::ReceiverRegister(), - JSObject::kPropertiesOffset)); - GenerateDictionaryLoad(masm, &slow, dictionary, - LoadDescriptor::NameRegister(), edi, ebx, eax); - __ ret(0); - - // Dictionary load failed, go slow (but don't miss). - __ bind(&slow); - GenerateRuntimeGetProperty(masm); -} - - -static void LoadIC_PushArgs(MacroAssembler* masm) { - Register receiver = LoadDescriptor::ReceiverRegister(); - Register name = LoadDescriptor::NameRegister(); - - Register slot = LoadDescriptor::SlotRegister(); - Register vector = LoadWithVectorDescriptor::VectorRegister(); - DCHECK(!edi.is(receiver) && !edi.is(name) && !edi.is(slot) && - !edi.is(vector)); - - __ pop(edi); - __ push(receiver); - __ push(name); - __ push(slot); - __ push(vector); - __ push(edi); -} - - -void LoadIC::GenerateMiss(MacroAssembler* masm) { - // Return address is on the stack. - __ IncrementCounter(masm->isolate()->counters()->ic_load_miss(), 1); - LoadIC_PushArgs(masm); - - // Perform tail call to the entry. - __ TailCallRuntime(Runtime::kLoadIC_Miss); -} - -void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { - // Return address is on the stack. - Register receiver = LoadDescriptor::ReceiverRegister(); - Register name = LoadDescriptor::NameRegister(); - DCHECK(!ebx.is(receiver) && !ebx.is(name)); - - __ pop(ebx); - __ push(receiver); - __ push(name); - __ push(ebx); - - // Do tail-call to runtime routine. - __ TailCallRuntime(Runtime::kGetProperty); -} - - -void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) { - // Return address is on the stack. - __ IncrementCounter(masm->isolate()->counters()->ic_keyed_load_miss(), 1); - - LoadIC_PushArgs(masm); - - // Perform tail call to the entry. - __ TailCallRuntime(Runtime::kKeyedLoadIC_Miss); -} - -void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { - // Return address is on the stack. - Register receiver = LoadDescriptor::ReceiverRegister(); - Register name = LoadDescriptor::NameRegister(); - DCHECK(!ebx.is(receiver) && !ebx.is(name)); - - __ pop(ebx); - __ push(receiver); - __ push(name); - __ push(ebx); - - // Do tail-call to runtime routine. - __ TailCallRuntime(Runtime::kKeyedGetProperty); -} - -static void StoreIC_PushArgs(MacroAssembler* masm) { - Register receiver = StoreWithVectorDescriptor::ReceiverRegister(); - Register name = StoreWithVectorDescriptor::NameRegister(); - - STATIC_ASSERT(StoreWithVectorDescriptor::kStackArgumentsCount == 3); - // Current stack layout: - // - esp[12] -- value - // - esp[8] -- slot - // - esp[4] -- vector - // - esp[0] -- return address - - Register return_address = StoreWithVectorDescriptor::SlotRegister(); - __ pop(return_address); - __ push(receiver); - __ push(name); - __ push(return_address); -} - - -void StoreIC::GenerateMiss(MacroAssembler* masm) { - // Return address is on the stack. - StoreIC_PushArgs(masm); - - // Perform tail call to the entry. - __ TailCallRuntime(Runtime::kStoreIC_Miss); -} - - -void StoreIC::GenerateNormal(MacroAssembler* masm) { - typedef StoreWithVectorDescriptor Descriptor; - Label restore_miss; - Register receiver = Descriptor::ReceiverRegister(); - Register name = Descriptor::NameRegister(); - Register value = Descriptor::ValueRegister(); - // Since the slot and vector values are passed on the stack we can use - // respective registers as scratch registers. - Register scratch1 = Descriptor::VectorRegister(); - Register scratch2 = Descriptor::SlotRegister(); - - __ LoadParameterFromStack<Descriptor>(value, Descriptor::kValue); - - // A lot of registers are needed for storing to slow case objects. - // Push and restore receiver but rely on GenerateDictionaryStore preserving - // the value and name. - __ push(receiver); - - Register dictionary = receiver; - __ mov(dictionary, FieldOperand(receiver, JSObject::kPropertiesOffset)); - GenerateDictionaryStore(masm, &restore_miss, dictionary, name, value, - scratch1, scratch2); - __ Drop(1); - Counters* counters = masm->isolate()->counters(); - __ IncrementCounter(counters->ic_store_normal_hit(), 1); - __ ret(Descriptor::kStackArgumentsCount * kPointerSize); - - __ bind(&restore_miss); - __ pop(receiver); - __ IncrementCounter(counters->ic_store_normal_miss(), 1); - GenerateMiss(masm); -} - - -void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) { - // Return address is on the stack. - StoreIC_PushArgs(masm); - - // Do tail-call to runtime routine. - __ TailCallRuntime(Runtime::kKeyedStoreIC_Miss); -} - -void KeyedStoreIC::GenerateSlow(MacroAssembler* masm) { - // Return address is on the stack. - StoreIC_PushArgs(masm); - - // Do tail-call to runtime routine. - __ TailCallRuntime(Runtime::kKeyedStoreIC_Slow); -} - -#undef __ - Condition CompareIC::ComputeCondition(Token::Value op) { switch (op) { @@ -582,9 +61,7 @@ void PatchInlinedSmiCode(Isolate* isolate, Address address, // condition code uses at the patched jump. uint8_t delta = *reinterpret_cast<uint8_t*>(delta_address); if (FLAG_trace_ic) { - PrintF("[ patching ic at %p, test=%p, delta=%d\n", - static_cast<void*>(address), - static_cast<void*>(test_instruction_address), delta); + LOG(isolate, PatchIC(address, test_instruction_address, delta)); } // Patch with a short conditional jump. Enabling means switching from a short diff --git a/src/ic/x87/stub-cache-x87.cc b/src/ic/x87/stub-cache-x87.cc deleted file mode 100644 index 68fa6154..00000000 --- a/src/ic/x87/stub-cache-x87.cc +++ /dev/null @@ -1,185 +0,0 @@ -// Copyright 2012 the V8 project authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#if V8_TARGET_ARCH_X87 - -#include "src/codegen.h" -#include "src/ic/ic.h" -#include "src/ic/stub-cache.h" -#include "src/interface-descriptors.h" - -namespace v8 { -namespace internal { - -#define __ ACCESS_MASM(masm) - -static void ProbeTable(StubCache* stub_cache, MacroAssembler* masm, - StubCache::Table table, Register name, Register receiver, - // The offset is scaled by 4, based on - // kCacheIndexShift, which is two bits - Register offset, Register extra) { - ExternalReference key_offset(stub_cache->key_reference(table)); - ExternalReference value_offset(stub_cache->value_reference(table)); - ExternalReference map_offset(stub_cache->map_reference(table)); - - Label miss; - Code::Kind ic_kind = stub_cache->ic_kind(); - bool is_vector_store = - IC::ICUseVector(ic_kind) && - (ic_kind == Code::STORE_IC || ic_kind == Code::KEYED_STORE_IC); - - // Multiply by 3 because there are 3 fields per entry (name, code, map). - __ lea(offset, Operand(offset, offset, times_2, 0)); - - if (extra.is_valid()) { - // Get the code entry from the cache. - __ mov(extra, Operand::StaticArray(offset, times_1, value_offset)); - - // Check that the key in the entry matches the name. - __ cmp(name, Operand::StaticArray(offset, times_1, key_offset)); - __ j(not_equal, &miss); - - // Check the map matches. - __ mov(offset, Operand::StaticArray(offset, times_1, map_offset)); - __ cmp(offset, FieldOperand(receiver, HeapObject::kMapOffset)); - __ j(not_equal, &miss); - -#ifdef DEBUG - if (FLAG_test_secondary_stub_cache && table == StubCache::kPrimary) { - __ jmp(&miss); - } else if (FLAG_test_primary_stub_cache && table == StubCache::kSecondary) { - __ jmp(&miss); - } -#endif - - if (is_vector_store) { - // The value, vector and slot were passed to the IC on the stack and - // they are still there. So we can just jump to the handler. - DCHECK(extra.is(StoreWithVectorDescriptor::SlotRegister())); - __ add(extra, Immediate(Code::kHeaderSize - kHeapObjectTag)); - __ jmp(extra); - } else { - // The vector and slot were pushed onto the stack before starting the - // probe, and need to be dropped before calling the handler. - __ pop(LoadWithVectorDescriptor::VectorRegister()); - __ pop(LoadDescriptor::SlotRegister()); - __ add(extra, Immediate(Code::kHeaderSize - kHeapObjectTag)); - __ jmp(extra); - } - - __ bind(&miss); - } else { - DCHECK(ic_kind == Code::STORE_IC || ic_kind == Code::KEYED_STORE_IC); - - // Save the offset on the stack. - __ push(offset); - - // Check that the key in the entry matches the name. - __ cmp(name, Operand::StaticArray(offset, times_1, key_offset)); - __ j(not_equal, &miss); - - // Check the map matches. - __ mov(offset, Operand::StaticArray(offset, times_1, map_offset)); - __ cmp(offset, FieldOperand(receiver, HeapObject::kMapOffset)); - __ j(not_equal, &miss); - - // Restore offset register. - __ mov(offset, Operand(esp, 0)); - - // Get the code entry from the cache. - __ mov(offset, Operand::StaticArray(offset, times_1, value_offset)); - -#ifdef DEBUG - if (FLAG_test_secondary_stub_cache && table == StubCache::kPrimary) { - __ jmp(&miss); - } else if (FLAG_test_primary_stub_cache && table == StubCache::kSecondary) { - __ jmp(&miss); - } -#endif - - // Restore offset and re-load code entry from cache. - __ pop(offset); - __ mov(offset, Operand::StaticArray(offset, times_1, value_offset)); - - // Jump to the first instruction in the code stub. - if (is_vector_store) { - DCHECK(offset.is(StoreWithVectorDescriptor::SlotRegister())); - } - __ add(offset, Immediate(Code::kHeaderSize - kHeapObjectTag)); - __ jmp(offset); - - // Pop at miss. - __ bind(&miss); - __ pop(offset); - } -} - -void StubCache::GenerateProbe(MacroAssembler* masm, Register receiver, - Register name, Register scratch, Register extra, - Register extra2, Register extra3) { - Label miss; - - // Assert that code is valid. The multiplying code relies on the entry size - // being 12. - DCHECK(sizeof(Entry) == 12); - - // Assert that there are no register conflicts. - DCHECK(!scratch.is(receiver)); - DCHECK(!scratch.is(name)); - DCHECK(!extra.is(receiver)); - DCHECK(!extra.is(name)); - DCHECK(!extra.is(scratch)); - - // Assert scratch and extra registers are valid, and extra2/3 are unused. - DCHECK(!scratch.is(no_reg)); - DCHECK(extra2.is(no_reg)); - DCHECK(extra3.is(no_reg)); - - Register offset = scratch; - scratch = no_reg; - - Counters* counters = masm->isolate()->counters(); - __ IncrementCounter(counters->megamorphic_stub_cache_probes(), 1); - - // Check that the receiver isn't a smi. - __ JumpIfSmi(receiver, &miss); - - // Get the map of the receiver and compute the hash. - __ mov(offset, FieldOperand(name, Name::kHashFieldOffset)); - __ add(offset, FieldOperand(receiver, HeapObject::kMapOffset)); - __ xor_(offset, kPrimaryMagic); - // We mask out the last two bits because they are not part of the hash and - // they are always 01 for maps. Also in the two 'and' instructions below. - __ and_(offset, (kPrimaryTableSize - 1) << kCacheIndexShift); - // ProbeTable expects the offset to be pointer scaled, which it is, because - // the heap object tag size is 2 and the pointer size log 2 is also 2. - DCHECK(kCacheIndexShift == kPointerSizeLog2); - - // Probe the primary table. - ProbeTable(this, masm, kPrimary, name, receiver, offset, extra); - - // Primary miss: Compute hash for secondary probe. - __ mov(offset, FieldOperand(name, Name::kHashFieldOffset)); - __ add(offset, FieldOperand(receiver, HeapObject::kMapOffset)); - __ xor_(offset, kPrimaryMagic); - __ and_(offset, (kPrimaryTableSize - 1) << kCacheIndexShift); - __ sub(offset, name); - __ add(offset, Immediate(kSecondaryMagic)); - __ and_(offset, (kSecondaryTableSize - 1) << kCacheIndexShift); - - // Probe the secondary table. - ProbeTable(this, masm, kSecondary, name, receiver, offset, extra); - - // Cache miss: Fall-through and let caller handle the miss by - // entering the runtime system. - __ bind(&miss); - __ IncrementCounter(counters->megamorphic_stub_cache_misses(), 1); -} - - -#undef __ -} // namespace internal -} // namespace v8 - -#endif // V8_TARGET_ARCH_X87 |