Changeset 59637 in webkit for trunk/JavaScriptCore/jit/ThunkGenerators.cpp

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/jit/ThunkGenerators.cpp (modified) (7 diffs)

trunk/JavaScriptCore/jit/ThunkGenerators.cpp

@@ -63 +63 @@
 }
 
-PassRefPtr<NativeExecutable> charCodeAtThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
+MacroAssemblerCodePtr charCodeAtThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
 {
     SpecializedThunkJIT jit(1, globalData, pool);
@@ -71 +71 @@
 }
 
-PassRefPtr<NativeExecutable> charAtThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
+MacroAssemblerCodePtr charAtThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
 {
     SpecializedThunkJIT jit(1, globalData, pool);
@@ -80 +80 @@
 }
 
-PassRefPtr<NativeExecutable> fromCharCodeThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
+MacroAssemblerCodePtr fromCharCodeThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
 {
     SpecializedThunkJIT jit(1, globalData, pool);
@@ -90 +90 @@
 }
 
-PassRefPtr<NativeExecutable> sqrtThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
+MacroAssemblerCodePtr sqrtThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
 {
 #if USE(JSVALUE64) || USE(JSVALUE32_64)
     SpecializedThunkJIT jit(1, globalData, pool);
     if (!jit.supportsFloatingPointSqrt())
-        return globalData->jitStubs.ctiNativeCallThunk();
+        return globalData->jitStubs.ctiNativeCall();
 
     jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
@@ -103 +103 @@
 #else
     UNUSED_PARAM(pool);
-    return globalData->jitStubs.ctiNativeCallThunk();
+    return globalData->jitStubs.ctiNativeCall();
 #endif
 }
@@ -110 +110 @@
 static const double negativeHalfConstant = -0.5;
 
-PassRefPtr<NativeExecutable> powThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
+MacroAssemblerCodePtr powThunkGenerator(JSGlobalData* globalData, ExecutablePool* pool)
 {
 #if USE(JSVALUE64) || USE(JSVALUE32_64)
     SpecializedThunkJIT jit(2, globalData, pool);
     if (!jit.supportsFloatingPoint())
-        return globalData->jitStubs.ctiNativeCallThunk();
+        return globalData->jitStubs.ctiNativeCall();
 
     jit.loadDouble(&oneConstant, SpecializedThunkJIT::fpRegT1);
@@ -151 +151 @@
 #else
     UNUSED_PARAM(pool);
-    return globalData->jitStubs.ctiNativeCallThunk();
+    return globalData->jitStubs.ctiNativeCall();
 #endif
 }