Changeset 31173 in webkit for trunk/JavaScriptCore/kjs/ExecState.cpp

Timestamp:

Mar 20, 2008, 2:34:47 AM (17 years ago)

Author:

[email protected]

Message:

2008-03-20 Maciej Stachowiak <​[email protected]>

Reviewed by Oliver.

• reduce function call overhead for 1.014x speedup on SunSpider

I moved some functions from ExecState.cpp to ExecStateInline.h and
from JSGlobalObject.cpp to JSGlobalObject.h, and declared them
inline; machine function call overhead for these was hurting JS
funcion call overhead.

• kjs/ExecState.cpp:
• kjs/ExecStateInlines.h: Added. (KJS::ExecState::ExecState): (KJS::ExecState::~ExecState): (KJS::FunctionExecState::FunctionExecState): (KJS::FunctionExecState::~FunctionExecState):
• kjs/JSGlobalObject.cpp:
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::pushActivation): (KJS::JSGlobalObject::checkActivationCount): (KJS::JSGlobalObject::popActivation):
• kjs/function.cpp:

File:

• trunk/JavaScriptCore/kjs/ExecState.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ExecState.cpp

@@ -30 +30 @@
 #include "internal.h"
 #include "scope_chain_mark.h"
+#include "ExecStateInlines.h"
 
 namespace KJS {
@@ -110 +111 @@
 }
 
-inline ExecState::ExecState(JSGlobalObject* globalObject, JSObject* thisObject, 
-         FunctionBodyNode* functionBodyNode, ExecState* callingExec,
-         FunctionImp* func, const List& args)
-    : m_globalObject(globalObject)
-    , m_exception(0)
-    , m_propertyNames(callingExec->m_propertyNames)
-    , m_emptyList(callingExec->m_emptyList)
-    , m_callingExec(callingExec)
-    , m_scopeNode(functionBodyNode)
-    , m_function(func)
-    , m_arguments(&args)
-    , m_scopeChain(func->scope())
-    , m_inlineScopeChainNode(0, 0)
-    , m_thisValue(thisObject)
-    , m_iterationDepth(0)
-    , m_switchDepth(0) 
-    , m_codeType(FunctionCode)
-{
-    ASSERT(m_scopeNode);
-
-    ActivationImp* activation = globalObject->pushActivation(this);
-    m_activation = activation;
-    m_localStorage = &activation->localStorage();
-    m_variableObject = activation;
-    if (functionBodyNode->usesEval() || functionBodyNode->needsClosure())
-        m_scopeChain.push(activation);
-    else {
-        m_inlineScopeChainNode.object = activation;
-        // The ScopeChain will ref this node itself, so we don't need to worry about
-        // anything trying to delete our scopenode
-        m_scopeChain.push(&m_inlineScopeChainNode);
-    }
-}
-
-inline ExecState::~ExecState()
-{
-}
-
 JSGlobalObject* ExecState::lexicalGlobalObject() const
 {
@@ -188 +151 @@
     m_globalObject->activeExecStates().removeLast();
 }
-
-FunctionExecState::FunctionExecState(JSGlobalObject* globalObject, JSObject* thisObject, 
-         FunctionBodyNode* functionBodyNode, ExecState* callingExec,
-         FunctionImp* func, const List& args)
-    : ExecState(globalObject, thisObject, functionBodyNode, callingExec, func, args)
-{
-    m_globalObject->activeExecStates().append(this);
-}
-
-FunctionExecState::~FunctionExecState()
-{
-    ASSERT(m_globalObject->activeExecStates().last() == this);
-    m_globalObject->activeExecStates().removeLast();
-
-    if (m_activation->needsPop())
-        m_globalObject->popActivation();
-}
-
+    
 } // namespace KJS