Changeset 60117 in webkit for trunk/JavaScriptCore/runtime/Executable.h

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/runtime/Executable.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Executable.h

@@ -94 +94 @@
         friend class JIT;
     public:
-        static PassRefPtr<NativeExecutable> create(MacroAssemblerCodePtr thunk, NativeFunction function)
-        {
-            return adoptRef(new NativeExecutable(JITCode::HostFunction(thunk), function));
+        static PassRefPtr<NativeExecutable> create(MacroAssemblerCodePtr callThunk, NativeFunction function, MacroAssemblerCodePtr constructThunk, NativeFunction constructor)
+        {
+            return adoptRef(new NativeExecutable(JITCode::HostFunction(callThunk), function, JITCode::HostFunction(constructThunk), constructor));
         }
 
@@ -104 +104 @@
 
     private:
-        NativeExecutable(JITCode thunk, NativeFunction function)
+        NativeExecutable(JITCode callThunk, NativeFunction function, JITCode constructThunk, NativeFunction constructor)
             : ExecutableBase(NUM_PARAMETERS_IS_HOST)
             , m_function(function)
-        {
-            m_jitCodeForCall = thunk;
-            m_jitCodeForConstruct = thunk;
+            , m_constructor(constructor)
+        {
+            m_jitCodeForCall = callThunk;
+            m_jitCodeForConstruct = constructThunk;
         }
 
         NativeFunction m_function;
+        // Probably should be a NativeConstructor, but this will currently require rewriting the JIT
+        // trampoline. It may be easier to make NativeFunction be passed 'this' as a part of the ArgList.
+        NativeFunction m_constructor;
     };
 #endif