Changeset 60105 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

May 24, 2010, 5:44:17 PM (15 years ago)

Author:

[email protected]

Message:

Reverting 60075 & 60084, these broke the interpreter.

Reviewed by NOBODY (revert).

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):
(JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset):

• bytecode/CodeBlock.h:
• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitConstruct):

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::emitGetByIdExceptionInfo):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

• jit/JIT.h:
• jit/JITCall.cpp:

(JSC::JIT::compileOpConstructSetupArgs):
(JSC::JIT::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITCall32_64.cpp:

(JSC::JIT::compileOpConstructSetupArgs):
(JSC::JIT::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::emit_op_neq_null):
(JSC::JIT::emit_op_convert_this):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):
(JSC::JITThunks::hostFunctionStub):

• jit/JITStubs.h:

(JSC::JITThunks::ctiNativeCall):
(JSC::):

• runtime/ExceptionHelpers.cpp:

(JSC::createNotAnObjectError):

• runtime/Executable.h:

(JSC::NativeExecutable::create):
(JSC::NativeExecutable::NativeExecutable):

• runtime/JSFunction.cpp:
• runtime/JSFunction.h:

Location:

trunk/JavaScriptCore/bytecode

Files:

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

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -500 +500 @@
             break;
         }
-        case op_get_callee: {
-            int r0 = (++it)->u.operand;
-            printf("[%4d] op_get_callee %s\n", location, registerName(exec, r0).data());
-            break;
-        }
-        case op_create_this: {
-            int r0 = (++it)->u.operand;
-            int r1 = (++it)->u.operand;
-            printf("[%4d] create_this %s %s\n", location, registerName(exec, r0).data(), registerName(exec, r1).data());
-            break;
-        }
         case op_convert_this: {
             int r0 = (++it)->u.operand;
@@ -1095 +1084 @@
             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);
+            int proto = (++it)->u.operand;
+            int thisRegister = (++it)->u.operand;
+            printf("[%4d] construct\t %s, %d, %d, %s, %s\n", location, registerName(exec, func).data(), argCount, registerOffset, registerName(exec, proto).data(), registerName(exec, thisRegister).data());
             break;
         }
@@ -1646 +1637 @@
         return false;
 
-    opcodeID = m_exceptionInfo->m_getByIdExceptionInfo[low - 1].isOpCreateThis ? op_create_this : op_instanceof;
+    opcodeID = m_exceptionInfo->m_getByIdExceptionInfo[low - 1].isOpConstruct ? op_construct : op_instanceof;
     return true;
 }

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -98 +98 @@
     struct GetByIdExceptionInfo {
         unsigned bytecodeOffset : 31;
-        bool isOpCreateThis : 1;
+        bool isOpConstruct : 1;
     };
 

trunk/JavaScriptCore/bytecode/Opcode.h

@@ -43 +43 @@
         macro(op_init_arguments, 2) \
         macro(op_create_arguments, 2) \
-        macro(op_create_this, 3) \
-        macro(op_get_callee, 2) \
         macro(op_convert_this, 2) \
         \
@@ -167 +165 @@
         macro(op_method_check, 1) \
         \
-        macro(op_construct, 4) \
+        macro(op_construct, 6) \
         macro(op_strcat, 4) \
         macro(op_to_primitive, 3) \