Index: src/x64/stub-cache-x64.cc |
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc |
index 0244eb0c0d820b0eb75825ac40670cf752b0e06a..b7e7b48774687b5c535a84ddce9a728fdde9c5a5 100644 |
--- a/src/x64/stub-cache-x64.cc |
+++ b/src/x64/stub-cache-x64.cc |
@@ -468,149 +468,6 @@ static void GenerateFastApiCall(MacroAssembler* masm, |
} |
-class CallInterceptorCompiler BASE_EMBEDDED { |
- public: |
- CallInterceptorCompiler(CallStubCompiler* stub_compiler, |
- Register name) |
- : stub_compiler_(stub_compiler), |
- name_(name) {} |
- |
- void Compile(MacroAssembler* masm, |
- Handle<JSObject> object, |
- Handle<JSObject> holder, |
- Handle<Name> name, |
- LookupResult* lookup, |
- Register receiver, |
- Register scratch1, |
- Register scratch2, |
- Register scratch3, |
- Label* miss) { |
- ASSERT(holder->HasNamedInterceptor()); |
- ASSERT(!holder->GetNamedInterceptor()->getter()->IsUndefined()); |
- |
- // Check that the receiver isn't a smi. |
- __ JumpIfSmi(receiver, miss); |
- |
- CallOptimization optimization(lookup); |
- if (optimization.is_constant_call()) { |
- CompileCacheable(masm, object, receiver, scratch1, scratch2, scratch3, |
- holder, lookup, name, optimization, miss); |
- } else { |
- CompileRegular(masm, object, receiver, scratch1, scratch2, scratch3, |
- name, holder, miss); |
- } |
- } |
- |
- private: |
- void CompileCacheable(MacroAssembler* masm, |
- Handle<JSObject> object, |
- Register receiver, |
- Register scratch1, |
- Register scratch2, |
- Register scratch3, |
- Handle<JSObject> interceptor_holder, |
- LookupResult* lookup, |
- Handle<Name> name, |
- const CallOptimization& optimization, |
- Label* miss_label) { |
- ASSERT(optimization.is_constant_call()); |
- ASSERT(!lookup->holder()->IsGlobalObject()); |
- |
- Counters* counters = masm->isolate()->counters(); |
- __ IncrementCounter(counters->call_const_interceptor(), 1); |
- |
- // Check that the maps from receiver to interceptor's holder |
- // haven't changed and thus we can invoke interceptor. |
- Label miss_cleanup; |
- Register holder = |
- stub_compiler_->CheckPrototypes( |
- IC::CurrentTypeOf(object, masm->isolate()), receiver, |
- interceptor_holder, scratch1, scratch2, scratch3, |
- name, miss_label); |
- |
- // Invoke an interceptor and if it provides a value, |
- // branch to |regular_invoke|. |
- Label regular_invoke; |
- LoadWithInterceptor(masm, receiver, holder, interceptor_holder, |
- ®ular_invoke); |
- |
- // Interceptor returned nothing for this property. Try to use cached |
- // constant function. |
- |
- // Check that the maps from interceptor's holder to constant function's |
- // holder haven't changed and thus we can use cached constant function. |
- if (*interceptor_holder != lookup->holder()) { |
- stub_compiler_->CheckPrototypes( |
- IC::CurrentTypeOf(interceptor_holder, masm->isolate()), holder, |
- handle(lookup->holder()), scratch1, scratch2, scratch3, |
- name, miss_label); |
- } |
- |
- Handle<JSFunction> fun = optimization.constant_function(); |
- stub_compiler_->GenerateJumpFunction(object, fun); |
- |
- // Invoke a regular function. |
- __ bind(®ular_invoke); |
- } |
- |
- void CompileRegular(MacroAssembler* masm, |
- Handle<JSObject> object, |
- Register receiver, |
- Register scratch1, |
- Register scratch2, |
- Register scratch3, |
- Handle<Name> name, |
- Handle<JSObject> interceptor_holder, |
- Label* miss_label) { |
- Register holder = |
- stub_compiler_->CheckPrototypes( |
- IC::CurrentTypeOf(object, masm->isolate()), receiver, |
- interceptor_holder, scratch1, scratch2, scratch3, name, miss_label); |
- |
- FrameScope scope(masm, StackFrame::INTERNAL); |
- // Save the name_ register across the call. |
- __ push(name_); |
- |
- CompileCallLoadPropertyWithInterceptor( |
- masm, receiver, holder, name_, interceptor_holder, |
- IC::kLoadPropertyWithInterceptorForCall); |
- |
- // Restore the name_ register. |
- __ pop(name_); |
- |
- // Leave the internal frame. |
- } |
- |
- void LoadWithInterceptor(MacroAssembler* masm, |
- Register receiver, |
- Register holder, |
- Handle<JSObject> holder_obj, |
- Label* interceptor_succeeded) { |
- { |
- FrameScope scope(masm, StackFrame::INTERNAL); |
- __ push(receiver); |
- __ push(holder); |
- __ push(name_); |
- |
- CompileCallLoadPropertyWithInterceptor( |
- masm, receiver, holder, name_, holder_obj, |
- IC::kLoadPropertyWithInterceptorOnly); |
- |
- __ pop(name_); |
- __ pop(holder); |
- __ pop(receiver); |
- // Leave the internal frame. |
- } |
- |
- __ CompareRoot(rax, Heap::kNoInterceptorResultSentinelRootIndex); |
- __ j(not_equal, interceptor_succeeded); |
- } |
- |
- CallStubCompiler* stub_compiler_; |
- Register name_; |
-}; |
- |
- |
void StoreStubCompiler::GenerateRestoreName(MacroAssembler* masm, |
Label* label, |
Handle<Name> name) { |
@@ -1261,244 +1118,17 @@ void LoadStubCompiler::GenerateLoadInterceptor( |
} |
-void CallStubCompiler::GenerateNameCheck(Handle<Name> name, Label* miss) { |
- if (kind_ == Code::KEYED_CALL_IC) { |
- __ Cmp(rcx, name); |
- __ j(not_equal, miss); |
- } |
-} |
- |
- |
-void CallStubCompiler::GenerateFunctionCheck(Register function, |
- Register scratch, |
- Label* miss) { |
- __ JumpIfSmi(function, miss); |
- __ CmpObjectType(function, JS_FUNCTION_TYPE, scratch); |
- __ j(not_equal, miss); |
-} |
- |
- |
-void CallStubCompiler::GenerateLoadFunctionFromCell( |
- Handle<Cell> cell, |
- Handle<JSFunction> function, |
- Label* miss) { |
- // Get the value from the cell. |
- __ Move(rdi, cell); |
- __ movp(rdi, FieldOperand(rdi, Cell::kValueOffset)); |
- |
- // Check that the cell contains the same function. |
- if (heap()->InNewSpace(*function)) { |
- // We can't embed a pointer to a function in new space so we have |
- // to verify that the shared function info is unchanged. This has |
- // the nice side effect that multiple closures based on the same |
- // function can all use this call IC. Before we load through the |
- // function, we have to verify that it still is a function. |
- GenerateFunctionCheck(rdi, rax, miss); |
- |
- // Check the shared function info. Make sure it hasn't changed. |
- __ Move(rax, Handle<SharedFunctionInfo>(function->shared())); |
- __ cmpq(FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset), rax); |
- } else { |
- __ Cmp(rdi, function); |
- } |
- __ j(not_equal, miss); |
-} |
- |
- |
-void CallStubCompiler::GenerateMissBranch() { |
- Handle<Code> code = |
- isolate()->stub_cache()->ComputeCallMiss(arguments().immediate(), |
- kind_, |
- extra_state()); |
- __ Jump(code, RelocInfo::CODE_TARGET); |
-} |
- |
- |
-Handle<Code> CallStubCompiler::CompileCallField(Handle<JSObject> object, |
- Handle<JSObject> holder, |
- PropertyIndex index, |
- Handle<Name> name) { |
- Label miss; |
- |
- Register reg = HandlerFrontendHeader( |
- object, holder, name, RECEIVER_MAP_CHECK, &miss); |
- |
- GenerateFastPropertyLoad(masm(), rdi, reg, index.is_inobject(holder), |
- index.translate(holder), Representation::Tagged()); |
- GenerateJumpFunction(object, rdi, &miss); |
- |
- HandlerFrontendFooter(&miss); |
- |
- // Return the generated code. |
- return GetCode(Code::FAST, name); |
-} |
- |
- |
void StubCompiler::GenerateBooleanCheck(Register object, Label* miss) { |
Label success; |
// Check that the object is a boolean. |
- __ CompareRoot(object, Heap::kTrueValueRootIndex); |
+ __ Cmp(object, factory()->true_value()); |
__ j(equal, &success); |
- __ CompareRoot(object, Heap::kFalseValueRootIndex); |
+ __ Cmp(object, factory()->false_value()); |
__ j(not_equal, miss); |
__ bind(&success); |
} |
-void CallStubCompiler::PatchImplicitReceiver(Handle<Object> object) { |
- if (object->IsGlobalObject()) { |
- StackArgumentsAccessor args(rsp, arguments()); |
- __ LoadRoot(rdx, Heap::kUndefinedValueRootIndex); |
- __ movp(args.GetReceiverOperand(), rdx); |
- } |
-} |
- |
- |
-Register CallStubCompiler::HandlerFrontendHeader(Handle<Object> object, |
- Handle<JSObject> holder, |
- Handle<Name> name, |
- CheckType check, |
- Label* miss) { |
- GenerateNameCheck(name, miss); |
- |
- Register reg = rdx; |
- |
- StackArgumentsAccessor args(rsp, arguments()); |
- __ movp(reg, args.GetReceiverOperand()); |
- |
- // Check that the receiver isn't a smi. |
- if (check != NUMBER_CHECK) { |
- __ JumpIfSmi(reg, miss); |
- } |
- |
- // Make sure that it's okay not to patch the on stack receiver |
- // unless we're doing a receiver map check. |
- ASSERT(!object->IsGlobalObject() || check == RECEIVER_MAP_CHECK); |
- |
- Counters* counters = isolate()->counters(); |
- switch (check) { |
- case RECEIVER_MAP_CHECK: |
- __ IncrementCounter(counters->call_const(), 1); |
- |
- // Check that the maps haven't changed. |
- reg = CheckPrototypes(IC::CurrentTypeOf(object, isolate()), reg, holder, |
- rbx, rax, rdi, name, miss); |
- break; |
- |
- case STRING_CHECK: { |
- // Check that the object is a string. |
- __ CmpObjectType(reg, FIRST_NONSTRING_TYPE, rax); |
- __ j(above_equal, miss); |
- // Check that the maps starting from the prototype haven't changed. |
- GenerateDirectLoadGlobalFunctionPrototype( |
- masm(), Context::STRING_FUNCTION_INDEX, rax, miss); |
- break; |
- } |
- case SYMBOL_CHECK: { |
- // Check that the object is a symbol. |
- __ CmpObjectType(reg, SYMBOL_TYPE, rax); |
- __ j(not_equal, miss); |
- // Check that the maps starting from the prototype haven't changed. |
- GenerateDirectLoadGlobalFunctionPrototype( |
- masm(), Context::SYMBOL_FUNCTION_INDEX, rax, miss); |
- break; |
- } |
- case NUMBER_CHECK: { |
- Label fast; |
- // Check that the object is a smi or a heap number. |
- __ JumpIfSmi(reg, &fast); |
- __ CmpObjectType(reg, HEAP_NUMBER_TYPE, rax); |
- __ j(not_equal, miss); |
- __ bind(&fast); |
- // Check that the maps starting from the prototype haven't changed. |
- GenerateDirectLoadGlobalFunctionPrototype( |
- masm(), Context::NUMBER_FUNCTION_INDEX, rax, miss); |
- break; |
- } |
- case BOOLEAN_CHECK: { |
- GenerateBooleanCheck(reg, miss); |
- // Check that the maps starting from the prototype haven't changed. |
- GenerateDirectLoadGlobalFunctionPrototype( |
- masm(), Context::BOOLEAN_FUNCTION_INDEX, rax, miss); |
- break; |
- } |
- } |
- |
- if (check != RECEIVER_MAP_CHECK) { |
- Handle<Object> prototype(object->GetPrototype(isolate()), isolate()); |
- reg = CheckPrototypes( |
- IC::CurrentTypeOf(prototype, isolate()), |
- rax, holder, rbx, rdx, rdi, name, miss); |
- } |
- |
- return reg; |
-} |
- |
- |
-void CallStubCompiler::GenerateJumpFunction(Handle<Object> object, |
- Register function, |
- Label* miss) { |
- // Check that the function really is a function. |
- GenerateFunctionCheck(function, rbx, miss); |
- |
- if (!function.is(rdi)) __ movp(rdi, function); |
- PatchImplicitReceiver(object); |
- |
- // Invoke the function. |
- __ InvokeFunction(rdi, arguments(), JUMP_FUNCTION, NullCallWrapper()); |
-} |
- |
- |
-Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object, |
- Handle<JSObject> holder, |
- Handle<Name> name) { |
- Label miss; |
- GenerateNameCheck(name, &miss); |
- |
- LookupResult lookup(isolate()); |
- LookupPostInterceptor(holder, name, &lookup); |
- |
- // Get the receiver from the stack. |
- StackArgumentsAccessor args(rsp, arguments()); |
- __ movp(rdx, args.GetReceiverOperand()); |
- |
- CallInterceptorCompiler compiler(this, rcx); |
- compiler.Compile(masm(), object, holder, name, &lookup, rdx, rbx, rdi, rax, |
- &miss); |
- |
- // Restore receiver. |
- __ movp(rdx, args.GetReceiverOperand()); |
- |
- GenerateJumpFunction(object, rax, &miss); |
- |
- HandlerFrontendFooter(&miss); |
- |
- // Return the generated code. |
- return GetCode(Code::FAST, name); |
-} |
- |
- |
-Handle<Code> CallStubCompiler::CompileCallGlobal( |
- Handle<JSObject> object, |
- Handle<GlobalObject> holder, |
- Handle<PropertyCell> cell, |
- Handle<JSFunction> function, |
- Handle<Name> name) { |
- Label miss; |
- HandlerFrontendHeader(object, holder, name, RECEIVER_MAP_CHECK, &miss); |
- // Potentially loads a closure that matches the shared function info of the |
- // function, rather than function. |
- GenerateLoadFunctionFromCell(cell, function, &miss); |
- Counters* counters = isolate()->counters(); |
- __ IncrementCounter(counters->call_global_inline(), 1); |
- GenerateJumpFunction(object, rdi, function); |
- HandlerFrontendFooter(&miss); |
- |
- // Return the generated code. |
- return GetCode(Code::NORMAL, name); |
-} |
- |
- |
Handle<Code> StoreStubCompiler::CompileStoreCallback( |
Handle<JSObject> object, |
Handle<JSObject> holder, |
@@ -1751,13 +1381,13 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal( |
__ Check(not_equal, kDontDeleteCellsCannotContainTheHole); |
} |
- HandlerFrontendFooter(name, &miss); |
- |
Counters* counters = isolate()->counters(); |
__ IncrementCounter(counters->named_load_global_stub(), 1); |
__ movp(rax, rbx); |
__ ret(0); |
+ HandlerFrontendFooter(name, &miss); |
+ |
// Return the generated code. |
return GetCode(kind(), Code::NORMAL, name); |
} |