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

Timestamp:

Jul 22, 2008, 10:10:05 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Reviewed by Oliver Hunt and Sam Weinig.

Next step toward putting doubles in registers: Prepare the Register class
and its clients for registers that don't contain JSValue*s.

This means a few things:

1. Register::jsValue() clients, including ArgList clients, must now supply an ExecState* when accessing an entry in an ArgList, in case the entry will need to create a JSValue* on the fly.

2. Register clients that definitely don't want to create a JSValue* on the fly now use different APIs: getJSValue() for clients that know the register contains a JSValue*, and v() for clients who just want a void*.

3. I had to change some headers around in order to resolve dependency problems created by using a Register in the ArgList header.

SunSpider reports no change.

JavaScriptGlue:

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

Reviewed by Oliver Hunt and Sam Weinig.

Next step toward putting doubles in registers: Prepare the Register class
and its clients for registers that don't contain JSValue*s.

WebCore:

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

Reviewed by Oliver Hunt and Sam Weinig.

Next step toward putting doubles in registers: Prepare the Register class
and its clients for registers that don't contain JSValue*s.

File:

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

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -49 +49 @@
 }
 
-static UString valueToSourceString(ExecState* exec, const Register& val)
-{
-    if (val.isString()) {
+static UString valueToSourceString(ExecState* exec, JSValue* 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, const Register& value)
+static CString constantName(ExecState* exec, int k, JSValue* value)
 {
     return (valueToSourceString(exec, value) + "(@k" + UString::from(k) + ")").UTF8String();
@@ -176 +176 @@
         size_t i = 0;
         do {
-            printf("  k%u = %s\n", static_cast<unsigned>(i), valueToSourceString(exec, registers[i]).ascii());
+            printf("  k%u = %s\n", static_cast<unsigned>(i), valueToSourceString(exec, registers[i].jsValue(exec)).ascii());
             ++i;
         } 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, registers[k0]).c_str());
+            printf("[%4d] load\t\t %s, %s\t\t\n", location, registerName(r0).c_str(), constantName(exec, k0, registers[k0].jsValue(exec)).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, registers[k0]).c_str());
+            printf("[%4d] new_error\t %s, %d, %s\n", location, registerName(r0).c_str(), errorType, constantName(exec, k0, registers[k0].jsValue(exec)).c_str());
             break;
         }