Changeset 27022 in webkit for trunk/JavaScriptCore/kjs/interpreter.cpp

Timestamp:

Oct 24, 2007, 11:38:35 PM (18 years ago)

Author:

eseidel

Message:

2007-10-24 Eric Seidel <​[email protected]>

Reviewed by Maciej.

Add a JSGlobalObject class and remove the InterpreterMap
​http://bugs.webkit.org/show_bug.cgi?id=15681

This required making JSCallbackObject a template class to allow for
JSGlobalObjects with JSCallbackObject functionality.

SunSpider claims this was a 0.5% speedup.

• API/JSCallbackObject.cpp: (KJS::):
• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h: Copied from API/JSCallbackObject.cpp. (KJS::::JSCallbackObject): (KJS::::init): (KJS::::~JSCallbackObject): (KJS::::initializeIfNeeded): (KJS::::className): (KJS::::getOwnPropertySlot): (KJS::::put): (KJS::::deleteProperty): (KJS::::implementsConstruct): (KJS::::construct): (KJS::::implementsHasInstance): (KJS::::hasInstance): (KJS::::implementsCall): (KJS::::callAsFunction): (KJS::::getPropertyNames): (KJS::::toNumber): (KJS::::toString): (KJS::::setPrivate): (KJS::::getPrivate): (KJS::::inherits): (KJS::::cachedValueGetter): (KJS::::staticValueGetter): (KJS::::staticFunctionGetter): (KJS::::callbackGetter):
• API/JSClassRef.cpp: (OpaqueJSClass::prototype):
• API/JSContextRef.cpp: (JSGlobalContextCreate):
• API/JSObjectRef.cpp: (JSObjectMake): (JSObjectGetPrivate): (JSObjectSetPrivate):
• API/JSValueRef.cpp: (JSValueIsObjectOfClass):
• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/c/c_utility.cpp: (KJS::Bindings::convertValueToNPVariant):
• bindings/jni/jni_jsobject.cpp:
• bindings/objc/objc_utility.mm: (KJS::Bindings::convertValueToObjcValue):
• kjs/Context.cpp: (KJS::Context::Context):
• kjs/ExecState.cpp: (KJS::ExecState::lexicalInterpreter):
• kjs/JSGlobalObject.h: Added. (KJS::JSGlobalObject::JSGlobalObject): (KJS::JSGlobalObject::isGlobalObject): (KJS::JSGlobalObject::interpreter): (KJS::JSGlobalObject::setInterpreter):
• kjs/array_instance.cpp:
• kjs/context.h:
• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::GlobalFuncImp::callAsFunction):
• kjs/interpreter.cpp: (KJS::Interpreter::Interpreter): (KJS::Interpreter::init): (KJS::Interpreter::~Interpreter): (KJS::Interpreter::globalObject): (KJS::Interpreter::initGlobalObject): (KJS::Interpreter::evaluate):
• kjs/interpreter.h:
• kjs/lookup.h: (KJS::cacheGlobalObject):
• kjs/object.h: (KJS::JSObject::isGlobalObject):
• kjs/testkjs.cpp:

File:

• trunk/JavaScriptCore/kjs/interpreter.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -80 +80 @@
     return* map;
 }
-    
-Interpreter::Interpreter(JSObject* globalObject)
+
+Interpreter::Interpreter(JSGlobalObject* globalObject)
     : m_globalExec(this, 0)
     , m_globalObject(globalObject)
@@ -90 +90 @@
 Interpreter::Interpreter()
     : m_globalExec(this, 0)
-    , m_globalObject(new JSObject())
+    , m_globalObject(new JSGlobalObject())
 {
     init();
@@ -119 +119 @@
         s_hook = next = prev = this;
     }
-    interpreterMap().set(m_globalObject, this);
 
     initGlobalObject();
@@ -138 +137 @@
         s_hook = 0;
     }
-    interpreterMap().remove(m_globalObject);
-}
-
-JSObject* Interpreter::globalObject() const
-{
-  return m_globalObject;
+}
+
+JSGlobalObject* Interpreter::globalObject() const
+{
+    return m_globalObject;
 }
 
 void Interpreter::initGlobalObject()
 {
+    m_globalObject->setInterpreter(this);
+
     // Clear before inititalizing, to avoid marking uninitialized (dangerous) or 
     // stale (wasteful) pointers during initialization.
-
+    
     // Prototypes
     m_FunctionPrototype = 0;
@@ -348 +348 @@
     m_recursion++;
     
-    JSObject* globalObj = m_globalObject;
+    JSGlobalObject* globalObj = m_globalObject;
     JSObject* thisObj = globalObj;
     
@@ -611 +611 @@
 }
 
-Interpreter* Interpreter::interpreterWithGlobalObject(JSObject* globalObject)
-{
-    return interpreterMap().get(globalObject);
-}
-
 #ifdef KJS_DEBUG_MEM
 #include "lexer.h"