Changeset 104770 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Jan 11, 2012, 5:00:58 PM (13 years ago)

Author:

[email protected]

Message:

Bytecode dumping is broken for call opcodes (due to two new operands)
​https://bugs.webkit.org/show_bug.cgi?id=75886

Reviewed by Oliver Hunt.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::printCallOp): Made a helper function, so I wouldn't have
to fix this more than once. The helper function skips the extra two operands
at the end of the opcode, used for optimization.

(JSC::CodeBlock::dump): Used the helper function.

• bytecode/CodeBlock.h: Declared the helper function.

File:

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

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -184 +184 @@
 }
 
+void CodeBlock::printCallOp(ExecState* exec, int location, Vector<Instruction>::const_iterator& it, const char* op) const
+{
+    int func = (++it)->u.operand;
+    int argCount = (++it)->u.operand;
+    int registerOffset = (++it)->u.operand;
+    printf("[%4d] %s\t %s, %d, %d\n", location, op, registerName(exec, func).data(), argCount, registerOffset);
+    it += 2;
+}
+
 void CodeBlock::printPutByIdOp(ExecState* exec, int location, Vector<Instruction>::const_iterator& it, const char* op) const
 {
@@ -523 +532 @@
         case op_convert_this: {
             int r0 = (++it)->u.operand;
-            printf("[%4d] convert_this %s\n", location, registerName(exec, r0).data());
+            printf("[%4d] convert_this\t %s\n", location, registerName(exec, r0).data());
             break;
         }
@@ -1120 +1129 @@
         }
         case op_call: {
-            int func = (++it)->u.operand;
-            int argCount = (++it)->u.operand;
-            int registerOffset = (++it)->u.operand;
-            printf("[%4d] call\t\t %s, %d, %d\n", location, registerName(exec, func).data(), argCount, registerOffset);
+            printCallOp(exec, location, it, "call");
             break;
         }
         case op_call_eval: {
-            int func = (++it)->u.operand;
-            int argCount = (++it)->u.operand;
-            int registerOffset = (++it)->u.operand;
-            printf("[%4d] call_eval\t %s, %d, %d\n", location, registerName(exec, func).data(), argCount, registerOffset);
+            printCallOp(exec, location, it, "call_eval");
             break;
         }
@@ -1149 +1152 @@
         case op_tear_off_arguments: {
             int r0 = (++it)->u.operand;
-            printf("[%4d] tear_off_arguments\t %s\n", location, registerName(exec, r0).data());
+            printf("[%4d] tear_off_arguments %s\n", location, registerName(exec, r0).data());
             break;
         }
@@ -1169 +1172 @@
         }
         case op_construct: {
-            int func = (++it)->u.operand;
-            int argCount = (++it)->u.operand;
-            int registerOffset = (++it)->u.operand;
-            printf("[%4d] construct\t %s, %d, %d\n", location, registerName(exec, func).data(), argCount, registerOffset);
+            printCallOp(exec, location, it, "construct");
             break;
         }