Changeset 68237 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Sep 23, 2010, 11:24:21 PM (15 years ago)

Author:

Csaba Osztrogonác

Message:

2010-09-23 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r68223.
​http://trac.webkit.org/changeset/68223
​https://bugs.webkit.org/show_bug.cgi?id=46448

It broke 2-3 tests on bots (Requested by Ossy on #webkit).

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump):
• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::BytecodeGenerator): (JSC::BytecodeGenerator::registerFor): (JSC::BytecodeGenerator::constRegisterFor): (JSC::BytecodeGenerator::emitNewFunction):
• bytecompiler/BytecodeGenerator.h:
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• jit/JIT.h:
• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_new_func): (JSC::JIT::emit_op_init_arguments):
• jit/JITOpcodes32_64.cpp: (JSC::JIT::emit_op_new_func): (JSC::JIT::emit_op_init_arguments):
• parser/Nodes.h:

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (3 diffs)
• Opcode.h (modified) (2 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -496 +496 @@
             break;
         }
-        case op_init_lazy_reg: {
-            int r0 = (++it)->u.operand;
-            printf("[%4d] init_lazy_reg\t %s\n", location, registerName(exec, r0).data());
+        case op_init_arguments: {
+            int r0 = (++it)->u.operand;
+            printf("[%4d] init_arguments\t %s\n", location, registerName(exec, r0).data());
             break;
         }
@@ -714 +714 @@
             int r0 = (++it)->u.operand;
             int id0 = (++it)->u.operand;
-            printf("[%4d] resolve_global\t %s, %s\n", location, registerName(exec, r0).data(), idName(id0, m_identifiers[id0]).data());
+            JSValue scope = JSValue((++it)->u.jsCell);
+            ++it;
+            printf("[%4d] resolve_global\t %s, %s, %s\n", location, registerName(exec, r0).data(), valueToSourceString(exec, scope).utf8().data(), idName(id0, m_identifiers[id0]).data());
             it += 2;
             break;
@@ -1029 +1031 @@
             int r0 = (++it)->u.operand;
             int f0 = (++it)->u.operand;
-            int shouldCheck = (++it)->u.operand;
-            printf("[%4d] new_func\t\t %s, f%d, %s\n", location, registerName(exec, r0).data(), f0, shouldCheck ? "<Checked>" : "<Unchecked>");
+            printf("[%4d] new_func\t\t %s, f%d\n", location, registerName(exec, r0).data(), f0);
             break;
         }

trunk/JavaScriptCore/bytecode/Opcode.h

@@ -41 +41 @@
         macro(op_enter, 1) \
         macro(op_enter_with_activation, 2) \
-        macro(op_init_lazy_reg, 2) \
+        macro(op_init_arguments, 2) \
         macro(op_create_arguments, 2) \
         macro(op_create_this, 3) \
@@ -154 +154 @@
         macro(op_switch_string, 4) \
         \
-        macro(op_new_func, 4) \
+        macro(op_new_func, 3) \
         macro(op_new_func_exp, 3) \
         macro(op_call, 4) \