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

Timestamp:

Dec 5, 2007, 6:31:41 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and
functions accessing data members from Interpreter to JSGlobalObject.
Changed Interpreter member functions to static functions.

This resolves a bug in global object bootstrapping, where the global
ExecState could be used when uninitialized.

This is a big change, but it's mostly code motion and renaming.

Layout and JS tests, and testjsglue and testapi, pass. SunSpider reports
a .7% regression, but Shark sees no difference related to this patch,
and SunSpider reported a .7% speedup from an earlier step in this
refactoring, so I think it's fair to call that a wash.

JavaScriptGlue:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject. Replaced JSInterpreter
subclass with JSGlobalObject subclass.

• JSRun.cpp: (JSRun::JSRun): (JSRun::Evaluate): (JSRun::CheckSyntax):
• JSRun.h: (JSGlueGlobalObject::JSGlueGlobalObject):
• JSUtils.cpp: (KJSValueToCFTypeInternal):
• JSValueWrapper.cpp: (getThreadGlobalExecState):

WebCore:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject. Changed Interpreter
member functions to static functions. Same for the subclass,
ScriptInterpreter.

This is a big change, but it's mostly code motion and renaming.

WebKit/mac:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject.

• WebView/WebFrame.mm: (-[WebFrame _attachScriptDebugger]):

WebKit/win:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject.

• WebFrame.cpp: (WebFrame::globalContext): (WebFrame::attachScriptDebugger): (WebFrame::windowObjectCleared):
• WebScriptDebugger.cpp: (WebScriptDebugger::WebScriptDebugger):

File:

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

trunk/JavaScriptCore/kjs/ExecState.cpp

@@ -32 +32 @@
 namespace KJS {
 
-
 // ECMA 10.2
-ExecState::ExecState(Interpreter* interpreter, JSGlobalObject* globalObject, JSObject* thisV, 
-                     FunctionBodyNode* currentBody, CodeType type, ExecState* callingExec, 
+ExecState::ExecState(JSGlobalObject* globalObject, JSObject* thisV, 
+                     FunctionBodyNode* currentBody, CodeType type, ExecState* callingExec, ExecState* currentExec,
                      FunctionImp* func, const List* args)
-    : m_interpreter(interpreter)
+    : m_globalObject(globalObject)
     , m_exception(0)
     , m_propertyNames(CommonIdentifiers::shared())
-    , m_savedExecState(interpreter->currentExec())
+    , m_callingExec(callingExec)
+    , m_savedExec(currentExec)
     , m_currentBody(currentBody)
     , m_function(func)
@@ -46 +46 @@
     , m_iterationDepth(0)
     , m_switchDepth(0) 
+    , m_codeType(type)
 {
-    m_codeType = type;
-    m_callingExecState = callingExec;
-    
     // create and initialize activation object (ECMA 10.1.6)
     if (type == FunctionCode) {
@@ -62 +60 @@
     switch(type) {
     case EvalCode:
-        if (m_callingExecState) {
-            m_scopeChain = m_callingExecState->scopeChain();
-            m_variable = m_callingExecState->variableObject();
-            m_thisVal = m_callingExecState->thisValue();
+        if (m_callingExec) {
+            m_scopeChain = m_callingExec->scopeChain();
+            m_variable = m_callingExec->variableObject();
+            m_thisVal = m_callingExec->thisValue();
             break;
         } // else same as GlobalCode
     case GlobalCode:
-        if (globalObject)
-            setGlobalObject(globalObject);
+        m_scopeChain.push(globalObject);
+        m_thisVal = globalObject;
         break;
     case FunctionCode:
@@ -81 +79 @@
 
     if (currentBody)
-        m_interpreter->setCurrentExec(this);
+        m_globalObject->setCurrentExec(this);
 }
 
 ExecState::~ExecState()
 {
-    m_interpreter->setCurrentExec(m_savedExecState);
+    m_globalObject->setCurrentExec(m_savedExec);
 }
 
 void ExecState::mark()
 {
-    for (ExecState* exec = this; exec; exec = exec->m_callingExecState)
+    for (ExecState* exec = this; exec; exec = exec->m_callingExec)
         exec->m_scopeChain.mark();
 }
 
-void ExecState::setGlobalObject(JSGlobalObject* globalObject)
-{
-    m_scopeChain.clear();
-    m_scopeChain.push(globalObject);
-    m_thisVal = static_cast<JSObject*>(globalObject);
-}
-
-Interpreter* ExecState::lexicalInterpreter() const
+JSGlobalObject* ExecState::lexicalGlobalObject() const
 {
     if (scopeChain().isEmpty())
-        return dynamicInterpreter();
+        return dynamicGlobalObject();
     
     JSObject* object = scopeChain().bottom();
     if (object && object->isGlobalObject())
-        return static_cast<JSGlobalObject*>(object)->interpreter();
+        return static_cast<JSGlobalObject*>(object);
 
-    return dynamicInterpreter();
+    return dynamicGlobalObject();
 }