| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index 793d30c62ef597f97bb9de434945e40906f654a7..9951659f7ee7020471ebc0bf1af193837547a58b 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -858,147 +858,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,
|
| - scratch1, scratch2);
|
| -
|
| - // 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, scratch2,
|
| - ®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> function = optimization.constant_function();
|
| - __ Move(r0, receiver);
|
| - stub_compiler_->GenerateJumpFunction(object, function);
|
| -
|
| - // 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);
|
| -
|
| - // Call a runtime function to load the interceptor property.
|
| - 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,
|
| - Register scratch,
|
| - Label* interceptor_succeeded) {
|
| - {
|
| - FrameScope scope(masm, StackFrame::INTERNAL);
|
| - __ Push(receiver);
|
| - __ Push(holder, name_);
|
| - CompileCallLoadPropertyWithInterceptor(
|
| - masm, receiver, holder, name_, holder_obj,
|
| - IC::kLoadPropertyWithInterceptorOnly);
|
| - __ pop(name_);
|
| - __ pop(holder);
|
| - __ pop(receiver);
|
| - }
|
| - // If interceptor returns no-result sentinel, call the constant function.
|
| - __ LoadRoot(scratch, Heap::kNoInterceptorResultSentinelRootIndex);
|
| - __ cmp(r0, scratch);
|
| - __ b(ne, interceptor_succeeded);
|
| - }
|
| -
|
| - CallStubCompiler* stub_compiler_;
|
| - Register name_;
|
| -};
|
| -
|
| -
|
| void StubCompiler::GenerateTailCall(MacroAssembler* masm, Handle<Code> code) {
|
| __ Jump(code, RelocInfo::CODE_TARGET);
|
| }
|
| @@ -1357,79 +1216,6 @@ void LoadStubCompiler::GenerateLoadInterceptor(
|
| }
|
|
|
|
|
| -void CallStubCompiler::GenerateNameCheck(Handle<Name> name, Label* miss) {
|
| - if (kind_ == Code::KEYED_CALL_IC) {
|
| - __ cmp(r2, Operand(name));
|
| - __ b(ne, miss);
|
| - }
|
| -}
|
| -
|
| -
|
| -void CallStubCompiler::GenerateFunctionCheck(Register function,
|
| - Register scratch,
|
| - Label* miss) {
|
| - __ JumpIfSmi(function, miss);
|
| - __ CompareObjectType(function, scratch, scratch, JS_FUNCTION_TYPE);
|
| - __ b(ne, miss);
|
| -}
|
| -
|
| -
|
| -void CallStubCompiler::GenerateLoadFunctionFromCell(
|
| - Handle<Cell> cell,
|
| - Handle<JSFunction> function,
|
| - Label* miss) {
|
| - // Get the value from the cell.
|
| - __ mov(r3, Operand(cell));
|
| - __ ldr(r1, FieldMemOperand(r3, 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(r1, r3, miss);
|
| -
|
| - // Check the shared function info. Make sure it hasn't changed.
|
| - __ Move(r3, Handle<SharedFunctionInfo>(function->shared()));
|
| - __ ldr(r4, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
|
| - __ cmp(r4, r3);
|
| - } else {
|
| - __ cmp(r1, Operand(function));
|
| - }
|
| - __ b(ne, 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(), r1, reg, index.is_inobject(holder),
|
| - index.translate(holder), Representation::Tagged());
|
| - GenerateJumpFunction(object, r1, &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.
|
| @@ -1443,170 +1229,6 @@ void StubCompiler::GenerateBooleanCheck(Register object, Label* miss) {
|
| }
|
|
|
|
|
| -void CallStubCompiler::PatchImplicitReceiver(Handle<Object> object) {
|
| - if (object->IsGlobalObject()) {
|
| - const int argc = arguments().immediate();
|
| - const int receiver_offset = argc * kPointerSize;
|
| - __ LoadRoot(r3, Heap::kUndefinedValueRootIndex);
|
| - __ str(r3, MemOperand(sp, receiver_offset));
|
| - }
|
| -}
|
| -
|
| -
|
| -Register CallStubCompiler::HandlerFrontendHeader(Handle<Object> object,
|
| - Handle<JSObject> holder,
|
| - Handle<Name> name,
|
| - CheckType check,
|
| - Label* miss) {
|
| - // ----------- S t a t e -------------
|
| - // -- r2 : name
|
| - // -- lr : return address
|
| - // -----------------------------------
|
| - GenerateNameCheck(name, miss);
|
| -
|
| - Register reg = r0;
|
| -
|
| - // Get the receiver from the stack
|
| - const int argc = arguments().immediate();
|
| - const int receiver_offset = argc * kPointerSize;
|
| - __ ldr(r0, MemOperand(sp, receiver_offset));
|
| -
|
| - // Check that the receiver isn't a smi.
|
| - if (check != NUMBER_CHECK) {
|
| - __ JumpIfSmi(r0, 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);
|
| - switch (check) {
|
| - case RECEIVER_MAP_CHECK:
|
| - __ IncrementCounter(isolate()->counters()->call_const(), 1, r1, r3);
|
| -
|
| - // Check that the maps haven't changed.
|
| - reg = CheckPrototypes(
|
| - IC::CurrentTypeOf(object, isolate()),
|
| - reg, holder, r1, r3, r4, name, miss);
|
| - break;
|
| -
|
| - case STRING_CHECK: {
|
| - // Check that the object is a string.
|
| - __ CompareObjectType(reg, r3, r3, FIRST_NONSTRING_TYPE);
|
| - __ b(ge, miss);
|
| - // Check that the maps starting from the prototype haven't changed.
|
| - GenerateDirectLoadGlobalFunctionPrototype(
|
| - masm(), Context::STRING_FUNCTION_INDEX, r1, miss);
|
| - break;
|
| - }
|
| - case SYMBOL_CHECK: {
|
| - // Check that the object is a symbol.
|
| - __ CompareObjectType(reg, r3, r3, SYMBOL_TYPE);
|
| - __ b(ne, miss);
|
| - // Check that the maps starting from the prototype haven't changed.
|
| - GenerateDirectLoadGlobalFunctionPrototype(
|
| - masm(), Context::SYMBOL_FUNCTION_INDEX, r1, miss);
|
| - break;
|
| - }
|
| - case NUMBER_CHECK: {
|
| - Label fast;
|
| - // Check that the object is a smi or a heap number.
|
| - __ JumpIfSmi(reg, &fast);
|
| - __ CompareObjectType(reg, r3, r3, HEAP_NUMBER_TYPE);
|
| - __ b(ne, miss);
|
| - __ bind(&fast);
|
| - // Check that the maps starting from the prototype haven't changed.
|
| - GenerateDirectLoadGlobalFunctionPrototype(
|
| - masm(), Context::NUMBER_FUNCTION_INDEX, r1, 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, r1, miss);
|
| - break;
|
| - }
|
| - }
|
| -
|
| - if (check != RECEIVER_MAP_CHECK) {
|
| - Handle<Object> prototype(object->GetPrototype(isolate()), isolate());
|
| - reg = CheckPrototypes(
|
| - IC::CurrentTypeOf(prototype, isolate()),
|
| - r1, holder, r1, r3, r4, name, miss);
|
| - }
|
| -
|
| - return reg;
|
| -}
|
| -
|
| -
|
| -void CallStubCompiler::GenerateJumpFunction(Handle<Object> object,
|
| - Register function,
|
| - Label* miss) {
|
| - ASSERT(function.is(r1));
|
| - // Check that the function really is a function.
|
| - GenerateFunctionCheck(function, r3, miss);
|
| - PatchImplicitReceiver(object);
|
| -
|
| - // Invoke the function.
|
| - __ InvokeFunction(r1, arguments(), JUMP_FUNCTION, NullCallWrapper());
|
| -}
|
| -
|
| -
|
| -Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object,
|
| - Handle<JSObject> holder,
|
| - Handle<Name> name) {
|
| - Label miss;
|
| - GenerateNameCheck(name, &miss);
|
| -
|
| - // Get the number of arguments.
|
| - const int argc = arguments().immediate();
|
| - LookupResult lookup(isolate());
|
| - LookupPostInterceptor(holder, name, &lookup);
|
| -
|
| - // Get the receiver from the stack.
|
| - __ ldr(r1, MemOperand(sp, argc * kPointerSize));
|
| -
|
| - CallInterceptorCompiler compiler(this, r2);
|
| - compiler.Compile(masm(), object, holder, name, &lookup, r1, r3, r4, r0,
|
| - &miss);
|
| -
|
| - // Move returned value, the function to call, to r1.
|
| - __ mov(r1, r0);
|
| - // Restore receiver.
|
| - __ ldr(r0, MemOperand(sp, argc * kPointerSize));
|
| -
|
| - GenerateJumpFunction(object, r1, &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, r3, r4);
|
| - GenerateJumpFunction(object, r1, function);
|
| - HandlerFrontendFooter(&miss);
|
| -
|
| - // Return the generated code.
|
| - return GetCode(Code::NORMAL, name);
|
| -}
|
| -
|
| -
|
| Handle<Code> StoreStubCompiler::CompileStoreCallback(
|
| Handle<JSObject> object,
|
| Handle<JSObject> holder,
|
| @@ -1821,7 +1443,6 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(
|
| Handle<Name> name,
|
| bool is_dont_delete) {
|
| Label miss;
|
| -
|
| HandlerFrontendHeader(type, receiver(), global, name, &miss);
|
|
|
| // Get the value from the cell.
|
| @@ -1835,13 +1456,13 @@ Handle<Code> LoadStubCompiler::CompileLoadGlobal(
|
| __ b(eq, &miss);
|
| }
|
|
|
| - HandlerFrontendFooter(name, &miss);
|
| -
|
| Counters* counters = isolate()->counters();
|
| __ IncrementCounter(counters->named_load_global_stub(), 1, r1, r3);
|
| __ mov(r0, r4);
|
| __ Ret();
|
|
|
| + HandlerFrontendFooter(name, &miss);
|
| +
|
| // Return the generated code.
|
| return GetCode(kind(), Code::NORMAL, name);
|
| }
|
|
|