Changeset 158751 in webkit for trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

Timestamp:

Nov 6, 2013, 9:29:12 AM (12 years ago)

Author:

[email protected]

Message:

Change ctiTrampoline into a thunk
​https://bugs.webkit.org/show_bug.cgi?id=123844

Reviewed by Filip Pizlo.

Converted ctiTrampoline and ctiOpThrowNotCaught into thunks named callToJavaScript
and returnFromJavaScript. Cleaned up and in some cases removed JITStubsXXX.h files
after removing ctiTrampoline and ctiOpThrowNotCaught. Added callJavaScriptJITFunction
to VM that is a function pointer to the callToJavaScript thunk.

• GNUmakefile.list.am:
• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGDriver.cpp:

(JSC::DFG::compileImpl):

• jit/JITCode.cpp:

(JSC::JITCode::execute):

• jit/JITExceptions.cpp:

(JSC::genericUnwind):

• jit/JITStubs.cpp:
• jit/JITStubs.h:
• jit/JITStubsARM.h:
• jit/JITStubsARM64.h: Removed.
• jit/JITStubsARMv7.h:
• jit/JITStubsMIPS.h: Removed.
• jit/JITStubsMSVC64.asm:
• jit/JITStubsSH4.h: Removed.
• jit/JITStubsX86.h:
• jit/JITStubsX86_64.h:
• jit/JSInterfaceJIT.h:
• jit/ThunkGenerators.cpp:

(JSC::returnFromJavaScript):
(JSC::callToJavaScript):

• jit/ThunkGenerators.h:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -50 +50 @@
         catchRoutine = ExecutableBase::catchRoutineFor(handler, catchPCForInterpreter);
     } else
-        catchRoutine = FunctionPtr(LLInt::getCodePtr(ctiOpThrowNotCaught)).value();
+        catchRoutine = vm->getCTIStub(throwNotCaught).code().executableAddress();
     
     vm->callFrameForThrow = callFrame;