Changeset 60117 in webkit for trunk/JavaScriptCore/interpreter

Timestamp:

May 24, 2010, 8:04:43 PM (15 years ago)

Author:

[email protected]

Message:

Relanding r60075.

Reviewed by Sam Weinig.

• 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::compileOpCall):
(JSC::JIT::compileOpCallSlowCase):

• jit/JITCall32_64.cpp:

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

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::privateCompileCTINativeCall):
(JSC::JIT::emit_op_neq_null):
(JSC::JIT::emit_op_convert_this):
(JSC::JIT::emit_op_get_callee):
(JSC::JIT::emit_op_create_this):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::privateCompileCTINativeCall):
(JSC::JIT::emit_op_get_callee):
(JSC::JIT::emit_op_create_this):

• jit/JITStubs.cpp:

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

• jit/JITStubs.h:

(JSC::JITThunks::ctiNativeConstruct):
(JSC::):

• runtime/ExceptionHelpers.cpp:

(JSC::createNotAnObjectError):

• runtime/Executable.h:

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

• runtime/JSFunction.cpp:

(JSC::callHostFunctionAsConstructor):

• runtime/JSFunction.h:
• wtf/Platform.h:

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (5 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -3884 +3884 @@
         vPC = callFrame->returnPC();
         callFrame = callFrame->callerFrame();
-        
+
         if (callFrame->hasHostCallFrameFlag())
             return returnValue;
@@ -3929 +3929 @@
 
         vPC += OPCODE_LENGTH(op_enter_with_activation);
+        NEXT_INSTRUCTION();
+    }
+    DEFINE_OPCODE(op_get_callee) {
+        /* op_get_callee callee(r)
+
+           Move callee into a register.
+        */
+
+        callFrame->r(vPC[1].u.operand) = JSValue(callFrame->callee());
+
+        vPC += OPCODE_LENGTH(op_get_callee);
+        NEXT_INSTRUCTION();
+    }
+    DEFINE_OPCODE(op_create_this) {
+        /* op_create_this this(r) proto(r)
+
+           Allocate an object as 'this', fr use in construction.
+
+           This opcode should only be used at the beginning of a code
+           block.
+        */
+
+        int thisRegister = vPC[1].u.operand;
+        int protoRegister = vPC[2].u.operand;
+
+        JSFunction* constructor = asFunction(callFrame->callee());
+#if !ASSERT_DISABLED
+        ConstructData constructData;
+        ASSERT(constructor->getConstructData(constructData) == ConstructTypeJS);
+#endif
+
+        Structure* structure;
+        JSValue proto = callFrame->r(protoRegister).jsValue();
+        if (proto.isObject())
+            structure = asObject(proto)->inheritorID();
+        else
+            structure = constructor->scope().node()->globalObject->emptyObjectStructure();
+        callFrame->r(thisRegister) = new (&callFrame->globalData()) JSObject(structure);
+
+        vPC += OPCODE_LENGTH(op_create_this);
         NEXT_INSTRUCTION();
     }
@@ -4001 +4041 @@
         int argCount = vPC[2].u.operand;
         int registerOffset = vPC[3].u.operand;
-        int proto = vPC[4].u.operand;
-        int thisRegister = vPC[5].u.operand;
 
         JSValue v = callFrame->r(func).jsValue();
@@ -4012 +4050 @@
             ScopeChainNode* callDataScopeChain = constructData.js.scopeChain;
             CodeBlock* newCodeBlock = &constructData.js.functionExecutable->bytecodeForConstruct(callFrame, callDataScopeChain);
-
-            Structure* structure;
-            JSValue prototype = callFrame->r(proto).jsValue();
-            if (prototype.isObject())
-                structure = asObject(prototype)->inheritorID();
-            else
-                structure = callDataScopeChain->globalObject->emptyObjectStructure();
-            JSObject* newObject = new (globalData) JSObject(structure);
-
-            callFrame->r(thisRegister) = JSValue(newObject); // "this" value
 
             CallFrame* previousCallFrame = callFrame;
@@ -4044 +4072 @@
 
         if (constructType == ConstructTypeHost) {
-            ArgList args(callFrame->registers() + thisRegister + 1, argCount - 1);
-
             ScopeChainNode* scopeChain = callFrame->scopeChain();
             CallFrame* newCallFrame = CallFrame::create(callFrame->registers() + registerOffset);
             newCallFrame->init(0, vPC + OPCODE_LENGTH(op_construct), scopeChain, callFrame, 0, argCount, 0);
+
+            Register* thisRegister = newCallFrame->registers() - RegisterFile::CallFrameHeaderSize - argCount;
+            ArgList args(thisRegister + 1, argCount - 1);
 
             JSValue returnValue;