Changeset 35231 in webkit for trunk/JavaScriptCore/VM/CodeBlock.cpp

Timestamp:

Jul 17, 2008, 9:00:28 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-17 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Next step toward putting doubles in registers: Store constant pool
entries as registers, not JSValue*s.

SunSpider reports no change.

File:

• trunk/JavaScriptCore/VM/CodeBlock.cpp (modified) (6 diffs)

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -49 +49 @@
 }
 
-static UString valueToSourceString(ExecState* exec, JSValue* val) 
-{
-    if (val->isString()) {
+static UString valueToSourceString(ExecState* exec, const Register& val)
+{
+    if (val.isString()) {
         UString result("\"");
-        result += escapeQuotes(val->toString(exec)) + "\"";
+        result += escapeQuotes(val.toString(exec)) + "\"";
         return result;
     } 
 
-    return val->toString(exec);
+    return val.toString(exec);
 }
 
@@ -68 +68 @@
 }
 
-static CString constantName(ExecState* exec, int k, JSValue* value)
+static CString constantName(ExecState* exec, int k, const Register& value)
 {
     return (valueToSourceString(exec, value) + "(@k" + UString::from(k) + ")").UTF8String();
@@ -172 +172 @@
     }
 
-    if (jsValues.size()) {
+    if (registers.size()) {
         printf("\nConstants:\n");
         size_t i = 0;
         do {
-            printf("  k%u = %s\n", static_cast<unsigned>(i), valueToSourceString(exec, jsValues[i]).ascii());
+            printf("  k%u = %s\n", static_cast<unsigned>(i), valueToSourceString(exec, registers[i]).ascii());
             ++i;
-        } while (i < jsValues.size());
+        } while (i < registers.size());
     }
     
@@ -209 +209 @@
             int r0 = (++it)->u.operand;
             int k0 = (++it)->u.operand;
-            printf("[%4d] load\t\t %s, %s\t\t\n", location, registerName(r0).c_str(), constantName(exec, k0, jsValues[k0]).c_str());
+            printf("[%4d] load\t\t %s, %s\t\t\n", location, registerName(r0).c_str(), constantName(exec, k0, registers[k0]).c_str());
             break;
         }
@@ -588 +588 @@
             int errorType = (++it)->u.operand;
             int k0 = (++it)->u.operand;
-            printf("[%4d] new_error\t %s, %d, %s\n", location, registerName(r0).c_str(), errorType, constantName(exec, k0, jsValues[k0]).c_str());
+            printf("[%4d] new_error\t %s, %d, %s\n", location, registerName(r0).c_str(), errorType, constantName(exec, k0, registers[k0]).c_str());
             break;
         }
@@ -623 +623 @@
 void CodeBlock::mark()
 {
-    for (size_t i = 0; i < jsValues.size(); ++i)
-        if (!jsValues[i]->marked())
-            jsValues[i]->mark();
+    for (size_t i = 0; i < registers.size(); ++i)
+        if (!registers[i].marked())
+            registers[i].mark();
 
     for (size_t i = 0; i < functions.size(); ++i)