Changeset 60376 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 28, 2010, 2:18:35 PM (15 years ago)

Author:

[email protected]

Message:

Bug 39898 - Move arity check into callee.

Reviewed by Sam Weinig.

We can reduce the size of the virtual call trampolines by moving the arity check
into the callee functions. As a following step we will be able to remove the
check for native function / codeblocks by performing translation in a lazy stub.

• interpreter/CallFrame.h:

(JSC::ExecState::init):
(JSC::ExecState::setReturnPC):

• jit/JIT.cpp:

(JSC::JIT::privateCompile):
(JSC::JIT::linkCall):
(JSC::JIT::linkConstruct):

• jit/JIT.h:

(JSC::JIT::compile):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/Executable.cpp:

(JSC::FunctionExecutable::generateJITCodeForCall):
(JSC::FunctionExecutable::generateJITCodeForConstruct):
(JSC::FunctionExecutable::reparseExceptionInfo):

• runtime/Executable.h:

(JSC::NativeExecutable::NativeExecutable):
(JSC::FunctionExecutable::generatedJITCodeForCallWithArityCheck):
(JSC::FunctionExecutable::generatedJITCodeForConstructWithArityCheck):

Location:

trunk/JavaScriptCore/runtime

Files:

• Executable.cpp (modified) (2 diffs)
• Executable.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/Executable.cpp

@@ -189 +189 @@
 {
     CodeBlock* codeBlock = &bytecodeForCall(exec, scopeChainNode);
-    m_jitCodeForCall = JIT::compile(scopeChainNode->globalData, codeBlock);
+    m_jitCodeForCall = JIT::compile(scopeChainNode->globalData, codeBlock, &m_jitCodeForCallWithArityCheck);
 
 #if !ENABLE(OPCODE_SAMPLING)
@@ -200 +200 @@
 {
     CodeBlock* codeBlock = &bytecodeForConstruct(exec, scopeChainNode);
-    m_jitCodeForConstruct = JIT::compile(scopeChainNode->globalData, codeBlock);
+    m_jitCodeForConstruct = JIT::compile(scopeChainNode->globalData, codeBlock, &m_jitCodeForConstructWithArityCheck);
 
 #if !ENABLE(OPCODE_SAMPLING)

trunk/JavaScriptCore/runtime/Executable.h

@@ -87 +87 @@
         JITCode m_jitCodeForCall;
         JITCode m_jitCodeForConstruct;
+        MacroAssemblerCodePtr m_jitCodeForCallWithArityCheck;
+        MacroAssemblerCodePtr m_jitCodeForConstructWithArityCheck;
 #endif
     };
@@ -111 +113 @@
             m_jitCodeForCall = callThunk;
             m_jitCodeForConstruct = constructThunk;
+            m_jitCodeForCallWithArityCheck = callThunk.addressForCall();
+            m_jitCodeForConstructWithArityCheck = constructThunk.addressForCall();
         }
 
@@ -408 +412 @@
         }
 
+        MacroAssemblerCodePtr generatedJITCodeForCallWithArityCheck()
+        {
+            ASSERT(m_jitCodeForCall);
+            ASSERT(m_jitCodeForCallWithArityCheck);
+            return m_jitCodeForCallWithArityCheck;
+        }
+
+        MacroAssemblerCodePtr generatedJITCodeForConstructWithArityCheck()
+        {
+            ASSERT(m_jitCodeForConstruct);
+            ASSERT(m_jitCodeForConstructWithArityCheck);
+            return m_jitCodeForConstructWithArityCheck;
+        }
+
     private:
         void generateJITCodeForCall(ExecState*, ScopeChainNode*);