mirror of https://github.com/PCSX2/pcsx2.git
parent
6aeca2c1e3
commit
43afeb205f
|
@ -31,18 +31,6 @@
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Because wxTrap isn't available on Linux builds of wxWidgets (non-Debug, typically)
|
|
||||||
void pxTrap()
|
|
||||||
{
|
|
||||||
#if defined(_WIN32)
|
|
||||||
__debugbreak();
|
|
||||||
#elif defined(__UNIX__)
|
|
||||||
raise(SIGTRAP);
|
|
||||||
#else
|
|
||||||
abort();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static std::mutex s_assertion_failed_mutex;
|
static std::mutex s_assertion_failed_mutex;
|
||||||
|
|
||||||
static inline void FreezeThreads(void** handle)
|
static inline void FreezeThreads(void** handle)
|
||||||
|
|
|
@ -20,9 +20,6 @@
|
||||||
#include "common/Assertions.h"
|
#include "common/Assertions.h"
|
||||||
#include "common/Pcsx2Defs.h"
|
#include "common/Pcsx2Defs.h"
|
||||||
|
|
||||||
// Because wxTrap isn't available on Linux builds of wxWidgets (non-Debug, typically)
|
|
||||||
void pxTrap();
|
|
||||||
|
|
||||||
namespace Exception
|
namespace Exception
|
||||||
{
|
{
|
||||||
class BaseException;
|
class BaseException;
|
||||||
|
|
|
@ -95,13 +95,6 @@ static void SysPageFaultSignalFilter(int signal, siginfo_t* siginfo, void* ctx)
|
||||||
|
|
||||||
std::fprintf(stderr, "Unhandled page fault @ 0x%08x", siginfo->si_addr);
|
std::fprintf(stderr, "Unhandled page fault @ 0x%08x", siginfo->si_addr);
|
||||||
pxFailRel("Unhandled page fault");
|
pxFailRel("Unhandled page fault");
|
||||||
|
|
||||||
// Bad mojo! Completely invalid address.
|
|
||||||
// Instigate a trap if we're in a debugger, and if not then do a SIGKILL.
|
|
||||||
|
|
||||||
pxTrap();
|
|
||||||
if (!IsDebugBuild)
|
|
||||||
raise(SIGKILL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _platform_InstallSignalHandler()
|
void _platform_InstallSignalHandler()
|
||||||
|
|
Loading…
Reference in New Issue