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

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.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -31 +31 @@
 #include "JSGlobalObject.h"
 
-#include "Activation.h"
+#include "CodeBlock.h"
 #include "array_object.h"
 #include "bool_object.h"
@@ -105 +105 @@
 JSGlobalObject* JSGlobalObject::s_head = 0;
 
-void JSGlobalObject::deleteActivationStack()
-{
-    ActivationStackNode* prevNode = 0;
-    for (ActivationStackNode* currentNode = d()->activations; currentNode; currentNode = prevNode) {
-        prevNode = currentNode->prev;
-        delete currentNode;
-    }
-}
-
 JSGlobalObject::~JSGlobalObject()
 {
@@ -126 +117 @@
     if (s_head == this)
         s_head = 0;
-    
-    deleteActivationStack();
+
+    HashSet<ProgramCodeBlock*>::const_iterator end = codeBlocks().end();
+    for (HashSet<ProgramCodeBlock*>::const_iterator it = codeBlocks().begin(); it != end; ++it)
+        (*it)->globalObject = 0;
     
     delete d();
@@ -206 +199 @@
     d()->debugger = 0;
     
-    ActivationStackNode* newStackNode = new ActivationStackNode;
-    newStackNode->prev = 0;    
-    d()->activations = newStackNode;
-    d()->activationCount = 0;
-
     d()->perThreadData.arrayTable = &threadClassInfoHashTables()->arrayTable;
     d()->perThreadData.dateTable = &threadClassInfoHashTables()->dateTable;
@@ -220 +208 @@
     d()->perThreadData.propertyNames = CommonIdentifiers::shared();
 
-    d()->globalExec.set(new GlobalExecState(this, thisValue));
+    d()->globalExec.set(new ExecState(this, thisValue, d()->globalScopeChain.node()));
 
     d()->pageGroupIdentifier = 0;
 
     reset(prototype());
-}
-
-bool JSGlobalObject::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-    if (symbolTableGet(propertyName, slot))
-        return true;
-    return JSVariableObject::getOwnPropertySlot(exec, propertyName, slot);
 }
 
@@ -269 +250 @@
 
     _prop.clear();
-    localStorage().clear();
+    registerFileStack().current()->clear();
+    registerFileStack().current()->addGlobalSlots(1);
     symbolTable().clear();
 
@@ -390 +372 @@
 
     // Set global values.
-    Identifier mathIdent = "Math";
-    JSValue* mathObject = new MathObjectImp(exec, d()->objectPrototype);
-    symbolTableInsert(mathIdent, mathObject, DontEnum | DontDelete);
-    
-    Identifier nanIdent = "NaN";
-    JSValue* nanValue = jsNaN();
-    symbolTableInsert(nanIdent, nanValue, DontEnum | DontDelete);
-    
-    Identifier infinityIdent = "Infinity";
-    JSValue* infinityValue = jsNumber(Inf);
-    symbolTableInsert(infinityIdent, infinityValue, DontEnum | DontDelete);
-    
-    Identifier undefinedIdent = "undefined";
-    JSValue* undefinedValue = jsUndefined();
-    symbolTableInsert(undefinedIdent, undefinedValue, DontEnum | DontDelete);
+    GlobalPropertyInfo staticGlobals[] = {
+        GlobalPropertyInfo("Math", new MathObjectImp(exec, d()->objectPrototype), DontEnum | DontDelete),
+        GlobalPropertyInfo("NaN", jsNaN(), DontEnum | DontDelete),
+        GlobalPropertyInfo("Infinity", jsNumber(Inf), DontEnum | DontDelete),
+        GlobalPropertyInfo("undefined", jsUndefined(), DontEnum | DontDelete)
+    };
+
+    addStaticGlobals(staticGlobals, sizeof(staticGlobals) / sizeof(GlobalPropertyInfo));
 
     // Set global functions.
@@ -493 +468 @@
 {
     JSVariableObject::mark();
-
-    ExecStateStack::const_iterator end = d()->activeExecStates.end();
-    for (ExecStateStack::const_iterator it = d()->activeExecStates.begin(); it != end; ++it)
-        (*it)->m_scopeChain.mark();
+    
+    HashSet<ProgramCodeBlock*>::const_iterator end = codeBlocks().end();
+    for (HashSet<ProgramCodeBlock*>::const_iterator it = codeBlocks().begin(); it != end; ++it)
+        (*it)->mark();
+
+    registerFileStack().mark();
 
     markIfNeeded(d()->globalExec->exception());
@@ -545 +522 @@
 }
 
-void JSGlobalObject::tearOffActivation(ExecState* exec, bool leaveRelic)
-{
-    ActivationImp* oldActivation = exec->activationObject();
-    if (!oldActivation || !oldActivation->isOnStack())
-        return;
-
-    ASSERT(exec->codeType() == FunctionCode);
-    ActivationImp* newActivation = new ActivationImp(*oldActivation->d(), leaveRelic);
-    
-    if (!leaveRelic) {
-        checkActivationCount();
-        d()->activationCount--;
-    }
-    
-    oldActivation->d()->localStorage.shrink(0);
-    
-    exec->setActivationObject(newActivation);
-    exec->setVariableObject(newActivation);
-    exec->setLocalStorage(&newActivation->localStorage());
-    exec->replaceScopeChainTop(newActivation);
-}
-
 bool JSGlobalObject::isDynamicScope() const
 {