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

Timestamp:

Oct 18, 2013, 9:25:02 AM (12 years ago)

Author:

[email protected]

Message:

Change native function call stubs to use JIT operations instead of ctiVMHandleException
​https://bugs.webkit.org/show_bug.cgi?id=122982

Reviewed by Geoffrey Garen.

Change ctiVMHandleException to operationVMHandleException. Change all exception operations to
return the catch callFrame and entryPC via vm.callFrameForThrow and vm.targetMachinePCForThrow.
This removed calling convention headaches, fixing ​https://bugs.webkit.org/show_bug.cgi?id=122980
in the process.

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::compileExceptionHandlers):

• jit/CCallHelpers.h:

(JSC::CCallHelpers::jumpToExceptionHandler):

• jit/JIT.cpp:

(JSC::JIT::privateCompileExceptionHandlers):

• jit/JIT.h:
• jit/JITExceptions.cpp:

(JSC::genericUnwind):

• jit/JITExceptions.h:
• jit/JITInlines.h:

(JSC::JIT::callOperationNoExceptionCheck):

• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_throw):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTINativeCall):
(JSC::JIT::emit_op_throw):

• jit/JITOperations.cpp:
• jit/JITOperations.h:
• jit/JITStubs.cpp:
• jit/JITStubs.h:
• jit/JITStubsARM.h:
• jit/JITStubsARM64.h:
• jit/JITStubsARMv7.h:
• jit/JITStubsMIPS.h:
• jit/JITStubsMSVC64.asm:
• jit/JITStubsSH4.h:
• jit/JITStubsX86.h:
• jit/JITStubsX86_64.h:
• jit/Repatch.cpp:

(JSC::tryBuildGetByIDList):

• jit/SlowPathCall.h:

(JSC::JITSlowPathCall::call):

• jit/ThunkGenerators.cpp:

(JSC::throwExceptionFromCallSlowPathGenerator):
(JSC::nativeForGenerator):

• runtime/VM.h:

(JSC::VM::callFrameForThrowOffset):
(JSC::VM::targetMachinePCForThrowOffset):

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -39 +39 @@
 namespace JSC {
 
-#if USE(JSVALUE32_64)
-EncodedExceptionHandler encode(ExceptionHandler handler)
-{
-    ExceptionHandlerUnion u;
-    u.handler = handler;
-    return u.encodedHandler;
-}
-#endif
-
-ExceptionHandler uncaughtExceptionHandler()
-{
-    void* catchRoutine = FunctionPtr(LLInt::getCodePtr(ctiOpThrowNotCaught)).value();
-    ExceptionHandler exceptionHandler = { 0, catchRoutine};
-    return exceptionHandler;
-}
-
-ExceptionHandler genericUnwind(VM* vm, ExecState* callFrame, JSValue exceptionValue)
+void genericUnwind(VM* vm, ExecState* callFrame, JSValue exceptionValue)
 {
     RELEASE_ASSERT(exceptionValue);
@@ -73 +57 @@
     
     RELEASE_ASSERT(catchRoutine);
-    ExceptionHandler exceptionHandler = { callFrame, catchRoutine};
-    return exceptionHandler;
 }