Changeset 33341

Timestamp:

05/12/08 23:04:11 (6 months ago)

Author:

mrowe@apple.com

Message:

Bug 18749: SQUIRRELFISH: const support is broken
<https://bugs.webkit.org/show_bug.cgi?id=18749>

Cameron Zwarich <cwzwarich@uwaterloo.ca>
Reviewed by Oliver.

Adds support for const during code generation.

Fixes 2 layout tests.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (7 diffs)
• VM/CodeGenerator.h (modified) (2 diffs)
• kjs/nodes.cpp (modified) (6 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-05  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Oliver.
+
+        Bug 18749: SQUIRRELFISH: const support is broken
+        <https://bugs.webkit.org/show_bug.cgi?id=18749>
+
+        Adds support for const during code generation.
+
+        Fixes 2 layout tests.
+
+        * ChangeLog:
+        * VM/CodeGenerator.cpp:
+        (KJS::CodeGenerator::addVar):
+        (KJS::CodeGenerator::CodeGenerator):
+        (KJS::CodeGenerator::isLocalConstant):
+        * VM/CodeGenerator.h:
+        (KJS::CodeGenerator::addVar):
+        * kjs/nodes.cpp:
+        (KJS::PostIncResolveNode::emitCode):
+        (KJS::PostDecResolveNode::emitCode):
+        (KJS::PreIncResolveNode::emitCode):
+        (KJS::PreDecResolveNode::emitCode):
+        (KJS::ReadModifyResolveNode::emitCode):
+        (KJS::AssignResolveNode::emitCode):
+
 2008-05-04  Maciej Stachowiak  <mjs@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.cpp

@@ -139 +139 @@
 }
 
-bool CodeGenerator::addVar(const Identifier& ident, RegisterID*& r0)
+bool CodeGenerator::addVar(const Identifier& ident, RegisterID*& r0, bool isConstant)
 {
     int index = m_nextVar;
-    pair<SymbolTable::iterator, bool> result = symbolTable().add(ident.ustring().rep(), index);
+    SymbolTableEntry newEntry(index, isConstant ? ReadOnly : 0);
+    pair<SymbolTable::iterator, bool> result = symbolTable().add(ident.ustring().rep(), newEntry);
 
     if (!result.second)
@@ -183 +184 @@
         m_nextVar -= size;
     } else
-        addVar(m_propertyNames->thisIdentifier); // No need to make "this" a true parameter, since it's not passed by our caller.
+        addVar(m_propertyNames->thisIdentifier, false); // No need to make "this" a true parameter, since it's not passed by our caller.
 
     JSGlobalObject* globalObject = static_cast<JSGlobalObject*>(scopeChain.bottom());
@@ -193 +194 @@
         for (size_t i = 0; i < functionStack.size(); ++i) {
             FuncDeclNode* funcDecl = functionStack[i];
-            emitNewFunction(addVar(funcDecl->m_ident), funcDecl);
+            emitNewFunction(addVar(funcDecl->m_ident, false), funcDecl);
         }
         
         for (size_t i = 0; i < varStack.size(); ++i) {
             if (!globalObject->hasProperty(exec, varStack[i].first))
-                emitLoad(addVar(varStack[i].first), jsUndefined());
+                emitLoad(addVar(varStack[i].first, varStack[i].second & DeclarationStacks::IsConstant), jsUndefined());
         }
     } else {
@@ -233 +234 @@
         
         m_functions.add(ident.ustring().rep());
-        emitNewFunction(addVar(ident), funcDecl);
+        emitNewFunction(addVar(ident, false), funcDecl);
     }
 
@@ -242 +243 @@
         
         RegisterID* r0;
-        if (addVar(ident, r0))
+        if (addVar(ident, r0, varStack[i].second & DeclarationStacks::IsConstant))
             emitLoad(r0, jsUndefined());
     }
@@ -267 +268 @@
     , m_propertyNames(CommonIdentifiers::shared())
 {
-    addVar(m_propertyNames->thisIdentifier);
+    addVar(m_propertyNames->thisIdentifier, false);
     
     for (size_t i = 0; i < varStack.size(); ++i)
@@ -319 +320 @@
     
     return &m_locals[localsIndex(index)];
+}
+
+bool CodeGenerator::isLocalConstant(const Identifier& ident)
+{
+    return symbolTable().get(ident.ustring().rep()).attributes & ReadOnly;
 }
 

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.h

@@ -91 +91 @@
         RegisterID* registerForLocalConstInit(const Identifier&);
 
+        bool isLocalConstant(const Identifier&);
+
         // Returns the next available temporary register. Registers returned by
         // newTemporary require a modified form of reference counting: any
@@ -258 +260 @@
         
         // Returns the RegisterID corresponding to ident.
-        RegisterID* addVar(const Identifier& ident)
+        RegisterID* addVar(const Identifier& ident, bool isConstant)
         {
             RegisterID* local;
-            addVar(ident, local);
+            addVar(ident, local, isConstant);
             return local;
         }
 
         // Returns true if a new RegisterID was added, false if a pre-existing RegisterID was re-used.
-        bool addVar(const Identifier&, RegisterID*&);
+        bool addVar(const Identifier&, RegisterID*&, bool isConstant);
 
         void addParameter(const Identifier&);

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -1738 +1738 @@
     // and emit a PreInc instead of a PostInc. A post-pass to eliminate dead
     // code would work, too.
-    if (RegisterID* local = generator.registerForLocal(m_ident))
+    if (RegisterID* local = generator.registerForLocal(m_ident)) {
+        if (generator.isLocalConstant(m_ident))
+            return generator.emitToJSNumber(generator.finalDestination(dst), local);
+        
         return generator.emitPostInc(generator.finalDestination(dst), local);
+    }
 
     RefPtr<RegisterID> value = generator.newTemporary();
@@ -1818 +1822 @@
     // and emit a PreDec instead of a PostDec. A post-pass to eliminate dead
     // code would work, too.
-    if (RegisterID* local = generator.registerForLocal(m_ident))
+    if (RegisterID* local = generator.registerForLocal(m_ident)) {
+        if (generator.isLocalConstant(m_ident))
+            return generator.emitToJSNumber(generator.finalDestination(dst), local);
+        
         return generator.emitPostDec(generator.finalDestination(dst), local);
+    }
 
     RefPtr<RegisterID> value = generator.newTemporary();
@@ -2336 +2344 @@
 {
     if (RegisterID* local = generator.registerForLocal(m_ident)) {
+        if (generator.isLocalConstant(m_ident)) {
+            RefPtr<RegisterID> r0 = generator.emitLoad(generator.finalDestination(dst), 1.0);
+            return generator.emitAdd(r0.get(), local, r0.get());
+        }
+        
         generator.emitPreInc(local);
         return generator.moveToDestinationIfNeeded(dst, local);
@@ -2401 +2414 @@
 {
     if (RegisterID* local = generator.registerForLocal(m_ident)) {
+        if (generator.isLocalConstant(m_ident)) {
+            RefPtr<RegisterID> r0 = generator.emitLoad(generator.finalDestination(dst), -1.0);
+            return generator.emitAdd(r0.get(), local, r0.get());
+        }
+        
         generator.emitPreDec(local);
         return generator.moveToDestinationIfNeeded(dst, local);
@@ -4137 +4155 @@
 RegisterID* ReadModifyResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
 {
-    if (RegisterID* dst = generator.registerForLocal(m_ident)) {
+    if (RegisterID* local = generator.registerForLocal(m_ident)) {
+        if (generator.isLocalConstant(m_ident)) {
+            RegisterID* src2 = generator.emitNode(m_right.get());
+            return emitReadModifyAssignment(generator, generator.finalDestination(dst), local, src2, m_operator);
+        }
+        
         RegisterID* src2 = generator.emitNode(m_right.get());
-        RegisterID* result = emitReadModifyAssignment(generator, dst, dst, src2, m_operator);
+        RegisterID* result = emitReadModifyAssignment(generator, local, local, src2, m_operator);
         return generator.moveToDestinationIfNeeded(dst, result);
     }
@@ -4167 +4190 @@
 {
     if (RegisterID* local = generator.registerForLocal(m_ident)) {
+        if (generator.isLocalConstant(m_ident))
+            return generator.emitNode(dst, m_right.get());
+        
         RegisterID* result = generator.emitNode(local, m_right.get());
         return generator.moveToDestinationIfNeeded(dst, result);