Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.h

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/JSGlobalObject.h (modified) (12 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -2 +2 @@
 /*
  *  Copyright (C) 2007 Eric Seidel <[email protected]>
- *  Copyright (C) 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -25 +25 @@
 
 #include "JSVariableObject.h"
-#include "Activation.h"
+#include "RegisterFile.h"
+#include "RegisterFileStack.h"
+#include <wtf/HashSet.h>
+#include <wtf/OwnPtr.h>
 
 namespace KJS {
 
-    class ActivationImp;
     class ArrayObjectImp;
     class ArrayPrototype;
@@ -51 +53 @@
     class ObjectObjectImp;
     class ObjectPrototype;
+    class ProgramCodeBlock;
     class PrototypeReflexiveFunction;
     class RangeError;
@@ -78 +81 @@
 
         struct JSGlobalObjectData : public JSVariableObjectData {
-            JSGlobalObjectData()
-                : JSVariableObjectData(&inlineSymbolTable)
+            JSGlobalObjectData(JSGlobalObject* globalObject, JSObject* thisValue)
+                : JSVariableObjectData(&symbolTable, registerFileStack.globalBasePointer(), 0)
+                , globalScopeChain(globalObject)
+                , globalExec(new ExecState(globalObject, thisValue, globalScopeChain.node()))
             {
             }
@@ -88 +93 @@
             Debugger* debugger;
             
-            OwnPtr<GlobalExecState> globalExec;
+            RegisterFileStack registerFileStack;
+            ScopeChain globalScopeChain;
+            OwnPtr<ExecState> globalExec;
+
             int recursion;
 
@@ -132 +140 @@
             NativeErrorPrototype* URIErrorPrototype;
             
-            SymbolTable inlineSymbolTable;
-
-            ExecStateStack activeExecStates;
-
-            ActivationStackNode* activations;
-            size_t activationCount;
-            
+            SymbolTable symbolTable;
             unsigned pageGroupIdentifier;
 
+            PerThreadData perThreadData;
+
+            HashSet<ProgramCodeBlock*> codeBlocks;
+
             OwnPtr<HashSet<JSObject*> > arrayVisitedElements; // Global data shared by array prototype functions.
-
-            PerThreadData perThreadData;
         };
 
     public:
         JSGlobalObject()
-            : JSVariableObject(new JSGlobalObjectData)
+            : JSVariableObject(new JSGlobalObjectData(this, this))
         {
             init(this);
@@ -155 +159 @@
     protected:
         JSGlobalObject(JSValue* proto, JSObject* globalThisValue)
-            : JSVariableObject(proto, new JSGlobalObjectData)
+            : JSVariableObject(proto, new JSGlobalObjectData(this, globalThisValue))
         {
             init(globalThisValue);
@@ -164 +168 @@
 
         virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&, bool& slotIsWriteable);
         virtual void put(ExecState*, const Identifier&, JSValue*);
         virtual void putWithAttributes(ExecState*, const Identifier& propertyName, JSValue* value, unsigned attributes);
@@ -228 +233 @@
         void incRecursion() { ++d()->recursion; }
         void decRecursion() { --d()->recursion; }
+        
+        ScopeChain& globalScopeChain() { return d()->globalScopeChain; }
 
         virtual void mark();
@@ -240 +247 @@
         virtual bool allowsAccessFrom(const JSGlobalObject*) const { return true; }
 
-        ActivationImp* pushActivation(ExecState*);
-        void popActivation();
-        void tearOffActivation(ExecState*, bool markAsRelic = false);
-
         virtual bool isDynamicScope() const;
 
-        ExecStateStack& activeExecStates() const { return d()->activeExecStates; }
-
         HashSet<JSObject*>& arrayVisitedElements() { if (!d()->arrayVisitedElements) d()->arrayVisitedElements.set(new HashSet<JSObject*>); return *d()->arrayVisitedElements; }
+
+        HashSet<ProgramCodeBlock*>& codeBlocks() { return d()->codeBlocks; }
+
+        RegisterFileStack& registerFileStack() { return d()->registerFileStack; }
 
         // Per-thread hash tables, cached on the global object for faster access.
@@ -261 +266 @@
         JSGlobalObjectData* d() const { return static_cast<JSGlobalObjectData*>(JSVariableObject::d); }
 
+        struct GlobalPropertyInfo {
+            GlobalPropertyInfo(const Identifier& i, JSValue* v, unsigned a)
+                : identifier(i)
+                , value(v)
+                , attributes(a)
+            {
+            }
+
+            const Identifier& identifier;
+            JSValue* value;
+            unsigned attributes;
+        };
+        void addStaticGlobals(GlobalPropertyInfo*, int count);
+
         bool checkTimeout();
         void resetTimeoutCheck();
 
-        void deleteActivationStack();
-        void checkActivationCount();
-
         static JSGlobalObject* s_head;
     };
 
+    inline void JSGlobalObject::addStaticGlobals(GlobalPropertyInfo* globals, int count)
+    {
+        RegisterFile* registerFile = registerFileStack().current();
+        ASSERT(registerFile->safeForReentry() && registerFile->isGlobal() && !registerFile->size());
+        int index = -registerFile->numGlobalSlots() - 1;
+        registerFile->addGlobalSlots(count);
+        for (int i = 0; i < count; ++i) {
+            ASSERT(globals[i].attributes & DontDelete);
+            SymbolTableEntry newEntry(index, globals[i].attributes);
+            symbolTable().add(globals[i].identifier.ustring().rep(), newEntry);
+            valueAt(index) = globals[i].value;
+            --index;
+        }
+    }
+
+    inline bool JSGlobalObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+    {
+        if (JSVariableObject::getOwnPropertySlot(exec, propertyName, slot))
+            return true;
+        return symbolTableGet(propertyName, slot);
+    }
+
+    inline bool JSGlobalObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot, bool& slotIsWriteable)
+    {
+        if (JSVariableObject::getOwnPropertySlotForWrite(exec, propertyName, slot, slotIsWriteable))
+            return true;
+        return symbolTableGet(propertyName, slot, slotIsWriteable);
+    }
+
     inline bool JSGlobalObject::timedOut()
     {
@@ -280 +325 @@
     }
 
-    inline ActivationImp* JSGlobalObject::pushActivation(ExecState* exec)
-    {
-        if (d()->activationCount == activationStackNodeSize) {
-            ActivationStackNode* newNode = new ActivationStackNode;
-            newNode->prev = d()->activations;
-            d()->activations = newNode;
-            d()->activationCount = 0;
-        }
-        
-        StackActivation* stackEntry = &d()->activations->data[d()->activationCount++];
-        stackEntry->activationStorage.init(exec);
-        return &stackEntry->activationStorage;
-    }
-
-    inline void JSGlobalObject::checkActivationCount()
-    {
-        if (!d()->activationCount) {
-            ActivationStackNode* prev = d()->activations->prev;
-            ASSERT(prev);
-            delete d()->activations;
-            d()->activations = prev;
-            d()->activationCount = activationStackNodeSize;
-        }
-    }
-
-    inline void JSGlobalObject::popActivation()
-    {
-        checkActivationCount();
-        d()->activations->data[--d()->activationCount].activationDataStorage.localStorage.shrink(0);    
+    inline JSGlobalObject* ScopeChainNode::globalObject() const
+    {
+        JSGlobalObject* globalObject = static_cast<JSGlobalObject*>(bottom());
+        ASSERT(globalObject->isGlobalObject());
+        return globalObject;
     }