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

Timestamp:

May 17, 2010, 7:39:20 PM (15 years ago)

Author:

[email protected]

Message:

Bug 39252 - Move host/native JSFunction's NativeFunction onto NativeExecutable.

Reviewed by Geoff Garen.

Currently host functions reuse JSFunction's ScopeChain as storage for their
NativeFunction (the C function pointer to the host function implementation).
Instead, move this onto NativeExecutable. This will allow host functions to
have a scopechain (which will be implemented as a separate patch).

• JavaScriptCore.xcodeproj/project.pbxproj:
• jit/JIT.h:
• jit/JITCall.cpp:

(JSC::JIT::compileOpCallInitializeCallFrame):
(JSC::JIT::compileOpCall):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITOpcodes32_64.cpp:
• jit/JITPropertyAccess.cpp:

(JSC::JIT::stringGetByValStubGenerator):
(JSC::JIT::emitSlow_op_get_by_val):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::stringGetByValStubGenerator):
(JSC::JIT::emitSlow_op_get_by_val):

• jit/JITStubs.cpp:

(JSC::JITThunks::specializedThunk):

• jit/JITStubs.h:

(JSC::JITThunks::ctiNativeCall):

• jit/SpecializedThunkJIT.h:

(JSC::SpecializedThunkJIT::finalize):

• jit/ThunkGenerators.cpp:

(JSC::charCodeAtThunkGenerator):
(JSC::charAtThunkGenerator):
(JSC::fromCharCodeThunkGenerator):
(JSC::sqrtThunkGenerator):
(JSC::powThunkGenerator):

• jit/ThunkGenerators.h:
• runtime/Executable.h:

(JSC::NativeExecutable::create):
(JSC::NativeExecutable::function):
(JSC::NativeExecutable::NativeExecutable):
(JSC::JSFunction::nativeFunction):

• runtime/JSFunction.cpp:

(JSC::JSFunction::JSFunction):
(JSC::JSFunction::~JSFunction):
(JSC::JSFunction::markChildren):
(JSC::JSFunction::getCallData):
(JSC::JSFunction::call):
(JSC::JSFunction::getOwnPropertySlot):
(JSC::JSFunction::getConstructData):
(JSC::JSFunction::construct):

• runtime/JSFunction.h:

(JSC::JSFunction::scope):

• runtime/JSGlobalData.h:

(JSC::JSGlobalData::getThunk):

• runtime/Lookup.cpp:

(JSC::setUpStaticFunctionSlot):

• runtime/StringConstructor.cpp:

(JSC::StringConstructor::StringConstructor):

File:

• trunk/JavaScriptCore/runtime/Executable.h (modified) (4 diffs)

trunk/JavaScriptCore/runtime/Executable.h

@@ -27 +27 @@
 #define Executable_h
 
+#include "CallData.h"
 #include "JSFunction.h"
 #include "Interpreter.h"
@@ -91 +92 @@
 #if ENABLE(JIT)
     class NativeExecutable : public ExecutableBase {
-    public:
-        NativeExecutable(ExecState* exec)
+        friend class JIT;
+    public:
+        static PassRefPtr<NativeExecutable> create(MacroAssemblerCodePtr thunk, NativeFunction function)
+        {
+            return adoptRef(new NativeExecutable(JITCode::HostFunction(thunk), function));
+        }
+
+        ~NativeExecutable();
+
+        NativeFunction function() { return m_function; }
+
+    private:
+        NativeExecutable(JITCode thunk, NativeFunction function)
             : ExecutableBase(NUM_PARAMETERS_IS_HOST)
-        {
-            m_jitCodeForCall = exec->globalData().jitStubs.ctiNativeCallThunk()->m_jitCodeForCall;
-            m_jitCodeForConstruct = exec->globalData().jitStubs.ctiNativeCallThunk()->m_jitCodeForCall; // FIXME: this thunk should have a construct form
-        }
-        NativeExecutable(JITCode thunk)
-            : ExecutableBase(NUM_PARAMETERS_IS_HOST)
+            , m_function(function)
         {
             m_jitCodeForCall = thunk;
@@ -105 +112 @@
         }
 
-        ~NativeExecutable();
+        NativeFunction m_function;
     };
 #endif
@@ -404 +411 @@
     }
 
+    inline NativeFunction JSFunction::nativeFunction()
+    {
+        ASSERT(isHostFunction());
+        return static_cast<NativeExecutable*>(m_executable.get())->function();
+    }
 }