Changeset 59637 in webkit for trunk/JavaScriptCore/runtime/JSGlobalData.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/JSGlobalData.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -171 +171 @@
 #if ENABLE(JIT)
         JITThunks jitStubs;
-        NativeExecutable* getThunk(ThunkGenerator generator)
+        MacroAssemblerCodePtr getThunk(ThunkGenerator generator)
         {
             return jitStubs.specializedThunk(this, generator);
@@ -179 +179 @@
         Terminator terminator;
         Heap heap;
+
+        typedef HashMap<NativeFunction, RefPtr<NativeExecutable> > NativeExecutableMap;
+        NativeExecutableMap m_nativeExecutableMap;
+        PassRefPtr<NativeExecutable> getNativeExecutable(NativeFunction function);
+#if ENABLE(JIT)
+        PassRefPtr<NativeExecutable> getNativeExecutable(NativeFunction function, ThunkGenerator generator);
+#endif
 
         JSValue exception;