preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 09:35:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Step 1 of removing PanicAlert

Browse Source
This commit is contained in:
Henrik Rydgård
2020-07-19 17:52:41 +02:00
parent c5e0b799d9
commit 617bbcfb87
8 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ExceptionHandlerSetup.cpp
+6 -14
View File
@@ -98,9 +98,7 @@ void UninstallExceptionHandler() {
#elif defined(__APPLE__)
static void CheckKR(const char* name, kern_return_t kr) {
if (kr) {
PanicAlert("%s failed: kr=%x", name, kr);
}
_assert_msg_(kr == 0, "%s failed: kr=%x", name, kr);
}
static void ExceptionThread(mach_port_t port) {
@@ -147,15 +145,8 @@ static void ExceptionThread(mach_port_t port) {
return;
}
if (msg_in.Head.msgh_id != 2406) {
PanicAlert("unknown message received");
return;
}
if (msg_in.flavor != x86_THREAD_STATE64) {
PanicAlert("unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64);
return;
}
_assert_msg_(msg_in.Head.msgh_id == 2406, "unknown message received");
_assert_msg_(msg_in.flavor == x86_THREAD_STATE64, "unknown flavor %d (expected %d)", msg_in.flavor, x86_THREAD_STATE64);
x86_thread_state64_t* state = (x86_thread_state64_t*)msg_in.old_state;
@@ -299,8 +290,9 @@ void InstallExceptionHandler(BadAccessHandler badAccessHandler) {
#endif
signal_stack.ss_size = SIGSTKSZ;
signal_stack.ss_flags = 0;
if (sigaltstack(&signal_stack, nullptr))
PanicAlert("sigaltstack failed");
if (sigaltstack(&signal_stack, nullptr)) {
_assert_msg_(false, "sigaltstack failed");
}
struct sigaction sa;
sa.sa_handler = nullptr;
sa.sa_sigaction = &sigsegv_handler;