wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 909534 - tidy up AsmJSSignalHandler, remove unnecessary SIGBUS handling (r=bhackett)

Browse Source 
--HG--
extra : rebase_source : a02fa6e374ea610db1e964181b84e251e5e44cbf
This commit is contained in:
Luke Wagner 2013-08-27 17:33:32 -05:00
parent 52056ee677
commit bb164a9906
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/src/jit/AsmJSSignalHandlers.cpp
View File

@ -941,8 +941,7 @@ HandleSignal(int signum, siginfo_t *info, void *ctx)
# endif
}
static struct sigaction sPrevSegvHandler;
static struct sigaction sPrevBusHandler;
static struct sigaction sPrevHandler;
static void
AsmJSFaultHandler(int signum, siginfo_t *info, void *context)
@ -962,20 +961,12 @@ AsmJSFaultHandler(int signum, siginfo_t *info, void *context)
// signal to it's original disposition and returning.
//
// Note: the order of these tests matter.
struct sigaction* prevHandler = NULL;
if (signum == SIGSEGV)
prevHandler = &sPrevSegvHandler;
else {
JS_ASSERT(signum == SIGBUS);
prevHandler = &sPrevBusHandler;
}
if (prevHandler->sa_flags & SA_SIGINFO)
prevHandler->sa_sigaction(signum, info, context);
else if (prevHandler->sa_handler == SIG_DFL || prevHandler->sa_handler == SIG_IGN)
sigaction(signum, prevHandler, NULL);
if (sPrevHandler.sa_flags & SA_SIGINFO)
sPrevHandler.sa_sigaction(signum, info, context);
else if (sPrevHandler.sa_handler == SIG_DFL || sPrevHandler.sa_handler == SIG_IGN)
sigaction(signum, &sPrevHandler, NULL);
else
prevHandler->sa_handler(signum);
sPrevHandler.sa_handler(signum);
}
# endif
@ -995,19 +986,15 @@ js::EnsureAsmJSSignalHandlersInstalled(JSRuntime *rt)
# if defined(XP_WIN)
if (!AddVectoredExceptionHandler(/* FirstHandler = */true, AsmJSExceptionHandler))
return false;
# else // assume Unix
# else
// Assume Unix. SA_NODEFER allows us to reenter the signal handler if we
// crash while handling the signal, and fall through to the Breakpad
// handler by testing handlingSignal.
struct sigaction sigAction;
sigAction.sa_flags = SA_SIGINFO | SA_NODEFER;
sigAction.sa_sigaction = &AsmJSFaultHandler;
sigemptyset(&sigAction.sa_mask);
// Note: SA_NODEFER allows us to reenter the signal handler if we crash
// while handling the signal, and fall through to the Breakpad handler
// by testing handlingSignal.
sigAction.sa_flags = SA_SIGINFO | SA_NODEFER;
if (sigaction(SIGSEGV, &sigAction, &sPrevSegvHandler))
return false;
if (sigaction(SIGBUS, &sigAction, &sPrevBusHandler))
if (sigaction(SIGSEGV, &sigAction, &sPrevHandler))
return false;
# endif