Changeset 34030 in webkit for trunk/JavaScriptCore

Timestamp:

May 22, 2008, 12:36:52 PM (17 years ago)

Author:

[email protected]

Message:

Bug 19116: SquirrelFish shouldn't regress on variable lookups
<​https://bugs.webkit.org/show_bug.cgi?id=19116>

Reviewed by Darin.

Last of the multiscope look up optimisations. This is a wash overall on SunSpider
but is a factor of 5-10 improvement in multiscope read/write/modify (eg. ++, --, +=,
... applied to any non-local var).

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-22  Oliver Hunt  <[email protected]>
+
+        Reviewed by Darin.
+
+        Bug 19116: SquirrelFish shouldn't regress on variable lookups
+        <https://bugs.webkit.org/show_bug.cgi?id=19116>
+
+        Last of the multiscope look up optimisations.  This is a wash overall on SunSpider
+        but is a factor of 5-10 improvement in multiscope read/write/modify (eg. ++, --, +=,
+        ... applied to any non-local var).
+
+        * kjs/nodes.cpp:
+        (KJS::PostIncResolveNode::emitCode):
+        (KJS::PostDecResolveNode::emitCode):
+        (KJS::PreIncResolveNode::emitCode):
+        (KJS::PreDecResolveNode::emitCode):
+        (KJS::ReadModifyResolveNode::emitCode):
+
 2008-05-22  David Kilzer  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1743 +1743 @@
     }
 
+    int index = 0;
+    size_t depth = 0;
+    if (generator.findScopedProperty(m_ident, index, depth) && index != missingSymbolMarker()) {
+        RefPtr<RegisterID> value = generator.emitGetScopedVar(generator.newTemporary(), depth, index);
+        RegisterID* oldValue = generator.emitPostInc(generator.finalDestination(dst), value.get());
+        generator.emitPutScopedVar(depth, index, value.get());
+        return oldValue;
+    }
+
     RefPtr<RegisterID> value = generator.newTemporary();
     RefPtr<RegisterID> base = generator.emitResolveWithBase(generator.newTemporary(), value.get(), m_ident);
@@ -1825 +1834 @@
         
         return generator.emitPostDec(generator.finalDestination(dst), local);
+    }
+
+    int index = 0;
+    size_t depth = 0;
+    if (generator.findScopedProperty(m_ident, index, depth) && index != missingSymbolMarker()) {
+        RefPtr<RegisterID> value = generator.emitGetScopedVar(generator.newTemporary(), depth, index);
+        RegisterID* oldValue = generator.emitPostDec(generator.finalDestination(dst), value.get());
+        generator.emitPutScopedVar(depth, index, value.get());
+        return oldValue;
     }
 
@@ -2350 +2368 @@
         return generator.moveToDestinationIfNeeded(dst, local);
     }
-    
+
+    int index = 0;
+    size_t depth = 0;
+    if (generator.findScopedProperty(m_ident, index, depth) && index != missingSymbolMarker()) {
+        RefPtr<RegisterID> propDst = generator.emitGetScopedVar(generator.tempDestination(dst), depth, index);
+        generator.emitPreInc(propDst.get());
+        generator.emitPutScopedVar(depth, index, propDst.get());
+        return generator.moveToDestinationIfNeeded(dst, propDst.get());;
+    }
+
     RefPtr<RegisterID> propDst = generator.tempDestination(dst);
     RefPtr<RegisterID> base = generator.emitResolveWithBase(generator.newTemporary(), propDst.get(), m_ident);
@@ -2420 +2447 @@
         generator.emitPreDec(local);
         return generator.moveToDestinationIfNeeded(dst, local);
+    }
+
+    int index = 0;
+    size_t depth = 0;
+    if (generator.findScopedProperty(m_ident, index, depth) && index != missingSymbolMarker()) {
+        RefPtr<RegisterID> propDst = generator.emitGetScopedVar(generator.tempDestination(dst), depth, index);
+        generator.emitPreDec(propDst.get());
+        generator.emitPutScopedVar(depth, index, propDst.get());
+        return generator.moveToDestinationIfNeeded(dst, propDst.get());;
     }
 
@@ -4184 +4220 @@
     }
 
+    int index = 0;
+    size_t depth = 0;
+    if (generator.findScopedProperty(m_ident, index, depth) && index != missingSymbolMarker()) {
+        RefPtr<RegisterID> src1 = generator.emitGetScopedVar(generator.tempDestination(dst), depth, index);
+        RegisterID* src2 = generator.emitNode(m_right.get());
+        RegisterID* result = emitReadModifyAssignment(generator, generator.finalDestination(dst, src1.get()), src1.get(), src2, m_operator);
+        generator.emitPutScopedVar(depth, index, result);
+        return result;
+    }
+
     RefPtr<RegisterID> src1 = generator.tempDestination(dst);
     RefPtr<RegisterID> base = generator.emitResolveWithBase(generator.newTemporary(), src1.get(), m_ident);