Changeset 27022 in webkit for trunk/JavaScriptCore/kjs

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:

Location:

trunk/JavaScriptCore/kjs

Files:

• Context.cpp (modified) (1 diff)
• ExecState.cpp (modified) (1 diff)
• JSGlobalObject.h (added)
• array_instance.cpp (modified) (1 diff)
• context.h (modified) (1 diff)
• function.cpp (modified) (3 diffs)
• interpreter.cpp (modified) (6 diffs)
• interpreter.h (modified) (6 diffs)
• lookup.h (modified) (3 diffs)
• object.h (modified) (1 diff)
• testkjs.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/Context.cpp

@@ -28 +28 @@
 
 // ECMA 10.2
-Context::Context(JSObject* glob, Interpreter* interpreter, JSObject* thisV, 
+Context::Context(JSGlobalObject* glob, Interpreter* interpreter, JSObject* thisV, 
                  FunctionBodyNode* currentBody, CodeType type, Context* callingCon, 
                  FunctionImp* func, const List* args)

trunk/JavaScriptCore/kjs/ExecState.cpp

@@ -31 +31 @@
 Interpreter* ExecState::lexicalInterpreter() const
 {
-  if (!m_context)
+    if (!m_context)
+        return dynamicInterpreter();
+    
+    JSObject* object = m_context->scopeChain().bottom();
+    if (object && object->isGlobalObject())
+        return static_cast<JSGlobalObject*>(object)->interpreter();
+
     return dynamicInterpreter();
-
-  Interpreter* result = Interpreter::interpreterWithGlobalObject(m_context->scopeChain().bottom());
-
-  if (!result)
-    return dynamicInterpreter();
-
-  return result;
 }
 

trunk/JavaScriptCore/kjs/array_instance.cpp

@@ -492 +492 @@
     JSObject *compareFunction;
     List arguments;
-    JSObject *globalObject;
+    JSGlobalObject* globalObject;
 };
 

trunk/JavaScriptCore/kjs/context.h

@@ -51 +51 @@
   class Context {
   public:
-    Context(JSObject* global, Interpreter*, JSObject* thisV,
+    Context(JSGlobalObject*, Interpreter*, JSObject* thisV,
             FunctionBodyNode* currentBody, CodeType type = GlobalCode,
             Context* callingContext = 0, FunctionImp* function = 0, const List* args = 0);

trunk/JavaScriptCore/kjs/function.cpp

@@ -31 +31 @@
 #include "function_object.h"
 #include "internal.h"
+#include "JSGlobalObject.h"
 #include "lexer.h"
 #include "nodes.h"
@@ -66 +67 @@
 JSValue* FunctionImp::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
-  JSObject* globalObj = exec->dynamicInterpreter()->globalObject();
+  JSGlobalObject* globalObj = exec->dynamicInterpreter()->globalObject();
 
   // enter a new execution context
@@ -755 +756 @@
           return throwError(exec, SyntaxError, errMsg, errLine, sid, NULL);
 
-        bool switchGlobal = thisObj && exec->dynamicInterpreter()->isGlobalObject(thisObj) && thisObj != exec->dynamicInterpreter()->globalObject();
+        bool switchGlobal = thisObj && thisObj != exec->dynamicInterpreter()->globalObject();
           
         // enter a new execution context
-        Interpreter* interpreter = switchGlobal ? exec->dynamicInterpreter()->interpreterForGlobalObject(thisObj) : exec->dynamicInterpreter();
+        Interpreter* interpreter = switchGlobal ? static_cast<JSGlobalObject*>(thisObj)->interpreter() : exec->dynamicInterpreter();
         JSObject* thisVal = static_cast<JSObject*>(exec->context()->thisValue());
         Context ctx(interpreter->globalObject(),

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"

trunk/JavaScriptCore/kjs/interpreter.h

@@ -46 +46 @@
   class FunctionObjectImp;
   class FunctionPrototype;
+  class JSGlobalObject;
   class NativeErrorImp;
   class NativeErrorPrototype;
@@ -95 +96 @@
      * @param global The object to use as the global object for this interpreter
      */
-    Interpreter(JSObject* globalObject);
+    Interpreter(JSGlobalObject*);
     /**
      * Creates a new interpreter. A global object will be created and
@@ -112 +113 @@
      * execution performed by this interpreter
      */
-    JSObject* globalObject() const;
+    JSGlobalObject* globalObject() const;
 
     /**
@@ -301 +302 @@
     void saveBuiltins (SavedBuiltins&) const;
     void restoreBuiltins (const SavedBuiltins&);
-
-    /**
-     * Determine if the value is a global object (for any interpreter).  This may
-     * be difficult to determine for multiple uses of JSC in a process that are
-     * logically independent of each other.  In the case of WebCore, this method
-     * is used to determine if an object is the Window object so we can perform
-     * security checks.
-     */
-    virtual bool isGlobalObject(JSValue*) { return false; }
-    
-    /** 
-     * Find the interpreter for a particular global object.  This should really
-     * be a static method, but we can't do that is C++.  Again, as with isGlobalObject()
-     * implementation really need to know about all instances of Interpreter
-     * created in an application to correctly implement this method.  The only
-     * override of this method is currently in WebCore.
-     */
-    virtual Interpreter* interpreterForGlobalObject(const JSValue*) { return 0; }
     
     /**
@@ -338 +321 @@
     void setContext(Context* c) { m_context = c; }
     Context* context() const { return m_context; }
-    
-    static Interpreter* interpreterWithGlobalObject(JSObject*);
-    
+        
     void setTimeoutTime(unsigned timeoutTime) { m_timeoutTime = timeoutTime; }
 
@@ -389 +370 @@
     unsigned m_ticksUntilNextTimeoutCheck;
 
-    JSObject* m_globalObject;
+    JSGlobalObject* m_globalObject;
 
     ObjectObjectImp* m_Object;

trunk/JavaScriptCore/kjs/lookup.h

@@ -20 +20 @@
  */
 
-#ifndef _KJSLOOKUP_H_
-#define _KJSLOOKUP_H_
+#ifndef KJS_lookup_h
+#define KJS_lookup_h
 
 #include "context.h"
 #include "identifier.h"
 #include "interpreter.h"
+#include "JSGlobalObject.h"
 #include "object.h"
 #include <stdio.h>
@@ -270 +271 @@
   inline JSObject* cacheGlobalObject(ExecState* exec, const Identifier& propertyName)
   {
-    JSObject* globalObject = static_cast<JSObject*>(exec->lexicalInterpreter()->globalObject());
+    JSGlobalObject* globalObject = exec->lexicalInterpreter()->globalObject();
     JSValue* obj = globalObject->getDirect(propertyName);
     if (obj) {
@@ -352 +353 @@
   };
 
-#endif
+#endif // KJS_lookup_h

trunk/JavaScriptCore/kjs/object.h

@@ -458 +458 @@
 
     virtual bool isActivation() { return false; }
+    virtual bool isGlobalObject() const { return false; }
   protected:
     PropertyMap _prop;

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -27 +27 @@
 #include "Parser.h"
 #include "collector.h"
+#include "JSGlobalObject.h"
 #include "object.h"
 #include "protect.h"
@@ -111 +112 @@
 }
 
-class GlobalImp : public JSObject {
+class GlobalImp : public JSGlobalObject {
 public:
   virtual UString className() const { return "global"; }