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

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.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/ExecState.h

@@ -57 +57 @@
     public:
         /**
-         * Returns the interpreter currently running code
+         * Returns the global object that was in scope when the current script started executing.
          */
-        Interpreter* dynamicInterpreter() const { return m_interpreter; }
+        JSGlobalObject* dynamicGlobalObject() const { return m_globalObject; }
         
         /**
-         * Returns the interpreter associated with the current scope's global object
+         * Returns the global object that was in scope when the current body of code was defined.
          */
-        Interpreter* lexicalInterpreter() const;
+        JSGlobalObject* lexicalGlobalObject() const;
                 
         void setException(JSValue* e) { m_exception = e; }
@@ -79 +79 @@
         JSObject* thisValue() const { return m_thisVal; }
         
-        ExecState* callingExecState() { return m_callingExecState; }
+        ExecState* callingExecState() { return m_callingExec; }
         
         JSObject* activationObject() { return m_activation; }
@@ -99 +99 @@
         bool inSwitch() const { return (m_switchDepth > 0); }
 
-        void setGlobalObject(JSGlobalObject*);
-        
         void mark();
         
@@ -110 +108 @@
         void updateLocalStorage();
     
-    private:
-        ExecState(Interpreter* interp, JSGlobalObject* glob, JSObject* thisV,
+    public:
+        ExecState(JSGlobalObject* glob, JSObject* thisV,
                   FunctionBodyNode* currentBody, CodeType type = GlobalCode,
-                  ExecState* callingExecState = 0, FunctionImp* function = 0, const List* args = 0);
+                  ExecState* callingExecState = 0, ExecState* currentExec = 0, 
+                  FunctionImp* function = 0, const List* args = 0);
         ~ExecState();
 
+    private:
         // ExecStates are always stack-allocated, and the garbage collector
         // marks the stack, so we don't need to protect the objects below from GC.
 
-        Interpreter* m_interpreter;
+        JSGlobalObject* m_globalObject;
         JSValue* m_exception;
         CommonIdentifiers* m_propertyNames;
 
-        ExecState* m_callingExecState;
-        ExecState* m_savedExecState;
+        ExecState* m_callingExec;
+        ExecState* m_savedExec;
         FunctionBodyNode* m_currentBody;