Refactoring various pieces of post interceptor caching.

src/arm/stub-cache-arm.cc

 // Copyright 2006-2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 373 matching lines @@
   if (object->IsGlobalObject()) {
     __ ldr(r3, FieldMemOperand(r0, GlobalObject::kGlobalReceiverOffset));
     __ str(r3, MemOperand(sp, arguments.immediate() * kPointerSize));
   }
 
   // Invoke the function.
   __ InvokeFunction(r1, arguments, JUMP_FUNCTION);
 }
 
 
-static void GenerateCallConstFunction(MacroAssembler* masm,
-                                      JSFunction* function,
-                                      const ParameterCount& arguments) {
-  ASSERT(function->is_compiled());
-
-  // Get the function and setup the context.
-  __ mov(r1, Operand(Handle<JSFunction>(function)));
-  __ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
-
-  // Jump to the cached code (tail call).
-  Handle<Code> code(function->code());
-  ParameterCount expected(function->shared()->formal_parameter_count());
-  __ InvokeCode(code, expected, arguments,
-                RelocInfo::CODE_TARGET, JUMP_FUNCTION);
-}
-
-
 template <class Compiler>
 static void CompileLoadInterceptor(Compiler* compiler,
                                    StubCompiler* stub_compiler,
                                    MacroAssembler* masm,
                                    JSObject* object,
                                    JSObject* holder,
                                    String* name,
                                    LookupResult* lookup,
                                    Register receiver,
                                    Register scratch1,
@@ skipping 75 matching lines @@
   void CompileCacheable(MacroAssembler* masm,
                         StubCompiler* stub_compiler,
                         Register receiver,
                         Register holder,
                         Register scratch1,
                         Register scratch2,
                         JSObject* holder_obj,
                         LookupResult* lookup,
                         String* name,
                         Label* miss_label) {
-    AccessorInfo* callback = 0;
+    AccessorInfo* callback = NULL;
     bool optimize = false;
     // So far the most popular follow ups for interceptor loads are FIELD
     // and CALLBACKS, so inline only them, other cases may be added
     // later.
     if (lookup->type() == FIELD) {
       optimize = true;
     } else if (lookup->type() == CALLBACKS) {
       Object* callback_object = lookup->GetCallbackObject();
       if (callback_object->IsAccessorInfo()) {
         callback = AccessorInfo::cast(callback_object);
@@ skipping 98 matching lines @@
   }
 
  private:
   Register name_;
 };
 
 
 class CallInterceptorCompiler BASE_EMBEDDED {
  public:
   CallInterceptorCompiler(const ParameterCount& arguments, Register name)
-      : arguments_(arguments), argc_(arguments.immediate()), name_(name) {}
+      : arguments_(arguments), name_(name) {}
 
   void CompileCacheable(MacroAssembler* masm,
                         StubCompiler* stub_compiler,
                         Register receiver,
                         Register holder,
                         Register scratch1,
                         Register scratch2,
                         JSObject* holder_obj,
                         LookupResult* lookup,
                         String* name,
@@ skipping 39 matching lines @@
     __ LoadRoot(scratch2, Heap::kNoInterceptorResultSentinelRootIndex);
     __ cmp(r0, scratch2);
     Label invoke;
     __ b(ne, &invoke);
 
     stub_compiler->CheckPrototypes(holder_obj, scratch1,
                                    lookup->holder(), scratch1,
                                    scratch2,
                                    name,
                                    miss_label);
-    GenerateCallConstFunction(masm, function, arguments_);
+    __ InvokeFunction(function, arguments_);
 
     __ bind(&invoke);
   }
 
   void CompileRegular(MacroAssembler* masm,
                       Register receiver,
                       Register holder,
                       Register scratch,
                       JSObject* holder_obj,
                       Label* miss_label) {
     __ EnterInternalFrame();
     // Save the name_ register across the call.
     __ push(name_);
 
     PushInterceptorArguments(masm,
                              receiver,
                              holder,
                              name_,
                              holder_obj);
 
-    ExternalReference ref = ExternalReference(
-        IC_Utility(IC::kLoadPropertyWithInterceptorForCall));
-    __ mov(r0, Operand(5));
-    __ mov(r1, Operand(ref));
-
-    CEntryStub stub(1);
-    __ CallStub(&stub);
+    __ CallExternalReference(
+        ExternalReference(IC_Utility(IC::kLoadPropertyWithInterceptorForCall)),
+        5);
 
     // Restore the name_ register.
     __ pop(name_);
     __ LeaveInternalFrame();
   }
 
  private:
   const ParameterCount& arguments_;
-  int argc_;
   Register name_;
 };
 
 
 #undef __
 #define __ ACCESS_MASM(masm())
 
 
 Register StubCompiler::CheckPrototypes(JSObject* object,
                                        Register object_reg,
@@ skipping 314 matching lines @@
       __ ldr(r2, FieldMemOperand(r3, HeapObject::kMapOffset));
       __ LoadRoot(ip, Heap::kFixedArrayMapRootIndex);
       __ cmp(r2, ip);
       __ b(ne, &miss);
       break;
 
     default:
       UNREACHABLE();
   }
 
-  GenerateCallConstFunction(masm(), function, arguments());
+  __ InvokeFunction(function, arguments());
 
   // Handle call cache miss.
   __ bind(&miss);
   Handle<Code> ic = ComputeCallMiss(arguments().immediate());
   __ Jump(ic, RelocInfo::CODE_TARGET);
 
   // Return the generated code.
   String* function_name = NULL;
   if (function->shared()->name()->IsString()) {
     function_name = String::cast(function->shared()->name());
@@ skipping 793 matching lines @@
   __ Jump(generic_construct_stub, RelocInfo::CODE_TARGET);
 
   // Return the generated code.
   return GetCode();
 }
 
 
 #undef __
 
 } }  // namespace v8::internal