Changeset 46598 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Jul 30, 2009, 1:57:44 PM (16 years ago)

Author:

[email protected]

Message:

Merged nitro-extreme branch into trunk.

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (5 diffs)
• CodeBlock.h (modified) (1 diff)
• Opcode.h (modified) (2 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -58 +58 @@
 static UString valueToSourceString(ExecState* exec, JSValue val)
 {
+    if (!val)
+        return "0";
+
     if (val.isString()) {
         UString result("\"");
@@ -596 +599 @@
         case op_div: {
             printBinaryOp(location, it, "div");
+            ++it;
             break;
         }
@@ -738 +742 @@
             int id0 = (++it)->u.operand;
             printf("[%4d] resolve_with_base %s, %s, %s\n", location, registerName(r0).c_str(), registerName(r1).c_str(), idName(id0, m_identifiers[id0]).c_str());
-            break;
-        }
-        case op_resolve_func: {
-            int r0 = (++it)->u.operand;
-            int r1 = (++it)->u.operand;
-            int id0 = (++it)->u.operand;
-            printf("[%4d] resolve_func\t %s, %s, %s\n", location, registerName(r0).c_str(), registerName(r1).c_str(), idName(id0, m_identifiers[id0]).c_str());
             break;
         }
@@ -1328 +1325 @@
     }
 
+#if ENABLE(JIT_OPTIMIZE_CALL)
     unlinkCallers();
 #endif
+
+#endif // !ENABLE(JIT)
 
 #if DUMP_CODE_BLOCK_STATISTICS
@@ -1336 +1336 @@
 }
 
-#if ENABLE(JIT) 
+#if ENABLE(JIT_OPTIMIZE_CALL)
 void CodeBlock::unlinkCallers()
 {

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -235 +235 @@
         void refStructures(Instruction* vPC) const;
         void derefStructures(Instruction* vPC) const;
-#if ENABLE(JIT)
+#if ENABLE(JIT_OPTIMIZE_CALL)
         void unlinkCallers();
 #endif

trunk/JavaScriptCore/bytecode/Opcode.h

@@ -68 +68 @@
         macro(op_add, 5) \
         macro(op_mul, 5) \
-        macro(op_div, 4) \
+        macro(op_div, 5) \
         macro(op_mod, 4) \
         macro(op_sub, 5) \
@@ -99 +99 @@
         macro(op_resolve_base, 3) \
         macro(op_resolve_with_base, 4) \
-        macro(op_resolve_func, 4) \
         macro(op_get_by_id, 8) \
         macro(op_get_by_id_self, 8) \