Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/JSVariableObject.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/JSVariableObject.h (modified) (7 diffs)

trunk/JavaScriptCore/kjs/JSVariableObject.h

@@ -30 +30 @@
 #define JSVariableObject_h
 
-#include "LocalStorageEntry.h"
+#include "Register.h"
 #include "SymbolTable.h"
+#include "UnusedParam.h"
 #include "object.h"
+#include <wtf/UnusedParam.h>
 
 namespace KJS {
+
+    class Register;
 
     class JSVariableObject : public JSObject {
     public:
         SymbolTable& symbolTable() const { return *d->symbolTable; }
-        LocalStorage& localStorage() const { return d->localStorage; }
 
         virtual void putWithAttributes(ExecState*, const Identifier&, JSValue*, unsigned attributes) = 0;
@@ -46 +49 @@
         virtual void getPropertyNames(ExecState*, PropertyNameArray&);
         
-        virtual void mark();
-
         virtual bool isVariableObject() const;
         virtual bool isDynamicScope() const = 0;
@@ -53 +54 @@
         virtual bool getPropertyAttributes(ExecState*, const Identifier& propertyName, unsigned& attributes) const;
 
+        JSValue*& valueAt(int index) const { return registers()[index].u.jsValue; }
     protected:
         // Subclasses of JSVariableObject can subclass this struct to add data
@@ -58 +60 @@
         // size of a JSCell).
         struct JSVariableObjectData {
-            JSVariableObjectData() { }
-            JSVariableObjectData(SymbolTable* s)
-                : symbolTable(s) // Subclass owns this pointer.
+            JSVariableObjectData(SymbolTable* symbolTable_, Register** registerBase_, int registerOffset_)
+                : symbolTable(symbolTable_)
+                , registerBase(registerBase_)
+                , registerOffset(registerOffset_)
             {
+                ASSERT(symbolTable_);
+                ASSERT(registerBase_);
             }
 
-            LocalStorage localStorage; // Storage for variables in the symbol table.
-            SymbolTable* symbolTable; // Maps name -> index in localStorage.
+            SymbolTable* symbolTable; // Maps name -> offset from "r" in register file.
+
+            Register** registerBase; // Location where a pointer to the base of the register file is stored.
+            int registerOffset; // Offset of "r", the register past the end of local storage.
         };
-
-        JSVariableObject() { }
 
         JSVariableObject(JSVariableObjectData* data)
@@ -81 +86 @@
         }
 
+        Register** registerBase() const { return d->registerBase; }
+        Register* registers() const { return *registerBase() + d->registerOffset; }
+
         bool symbolTableGet(const Identifier&, PropertySlot&);
+        bool symbolTableGet(const Identifier&, PropertySlot&, bool& slotIsWriteable);
         bool symbolTablePut(const Identifier&, JSValue*);
         bool symbolTablePutWithAttributes(const Identifier&, JSValue*, unsigned attributes);
-        bool symbolTableInsert(const Identifier&, JSValue*, unsigned attributes);
 
         JSVariableObjectData* d;
@@ -91 +99 @@
     inline bool JSVariableObject::symbolTableGet(const Identifier& propertyName, PropertySlot& slot)
     {
-        size_t index = symbolTable().inlineGet(propertyName.ustring().rep());
-        if (index == missingSymbolMarker())
-            return false;
-#ifndef NDEBUG
-        // During initialization, the variable object needs to advertise that it has certain
-        // properties, even if they're not ready for access yet. This check verifies that
-        // no one tries to access such a property. In a release build, we optimize this check
-        // away and just return an invalid pointer. There's no harm in an invalid pointer,
-        // since no one dereferences it.
-        if (index >= d->localStorage.size()) {
-            slot.setUngettable(this);
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.ustring().rep());
+        if (!entry.isEmpty()) {
+            slot.setValueSlot(this, &valueAt(entry.getIndex()));
             return true;
         }
-#endif
-        slot.setValueSlot(this, &d->localStorage[index].value);
-        return true;
+        return false;
+    }
+
+    inline bool JSVariableObject::symbolTableGet(const Identifier& propertyName, PropertySlot& slot, bool& slotIsWriteable)
+    {
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.ustring().rep());
+        if (!entry.isEmpty()) {
+            slot.setValueSlot(this, &valueAt(entry.getIndex()));
+            slotIsWriteable = !entry.isReadOnly();
+            return true;
+        }
+        return false;
     }
 
     inline bool JSVariableObject::symbolTablePut(const Identifier& propertyName, JSValue* value)
     {
-        size_t index = symbolTable().inlineGet(propertyName.ustring().rep());
-        if (index == missingSymbolMarker())
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.ustring().rep());
+        if (entry.isEmpty())
             return false;
-        LocalStorageEntry& entry = d->localStorage[index];
-        if (entry.attributes & ReadOnly)
+        if (entry.isReadOnly())
             return true;
-        entry.value = value;
+        valueAt(entry.getIndex()) = value;
         return true;
     }
@@ -123 +131 @@
     inline bool JSVariableObject::symbolTablePutWithAttributes(const Identifier& propertyName, JSValue* value, unsigned attributes)
     {
-        size_t index = symbolTable().get(propertyName.ustring().rep());
-        if (index == missingSymbolMarker())
+        SymbolTable::iterator iter = symbolTable().find(propertyName.ustring().rep());
+        if (iter == symbolTable().end())
             return false;
-        LocalStorageEntry& entry = d->localStorage[index];
-        entry.value = value;
-        entry.attributes = attributes;
-        return true;
-    }
-
-    inline bool JSVariableObject::symbolTableInsert(const Identifier& propertyName, JSValue* value, unsigned attributes)
-    {
-        if (symbolTable().get(propertyName.ustring().rep()) != missingSymbolMarker())
-            return false;
-        size_t localStorageIndex = d->localStorage.size();
-        d->localStorage.append(LocalStorageEntry(value, attributes));
-        symbolTable().add(propertyName.ustring().rep(), localStorageIndex);
+        SymbolTableEntry& entry = iter->second;
+        ASSERT(!entry.isEmpty());
+        entry.setAttributes(attributes);
+        valueAt(entry.getIndex()) = value;
         return true;
     }