Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common/PageFaultHandler: Fix compiling on 32-bit Windows

Browse source
This commit is contained in:
Connor McLaughlin 2020-11-21 02:14:43 +10:00
parent a03bca2f72
commit a29669432f
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/page_fault_handler.cpp
View file

@ -1,4 +1,5 @@
#include "page_fault_handler.h"
#include "common/cpu_detect.h"
#include "common/log.h"
#include <algorithm>
#include <cstring>
@ -67,7 +68,7 @@ static bool IsStoreInstruction(const void* ptr)
}
#endif
#if defined(WIN32)
#if defined(WIN32) && defined(CPU_X64)
static PVOID s_veh_handle;
static LONG ExceptionHandler(PEXCEPTION_POINTERS exi)
@ -189,7 +190,7 @@ bool InstallHandler(void* owner, Callback callback)
if (was_empty)
{
#if defined(WIN32)
#if defined(WIN32) && defined(CPU_X64)
s_veh_handle = AddVectoredExceptionHandler(1, ExceptionHandler);
if (!s_veh_handle)
{
@ -246,10 +247,10 @@ bool RemoveHandler(void* owner)
if (m_handlers.empty())
{
#if defined(WIN32)
#if defined(WIN32) && defined(CPU_X64)
RemoveVectoredExceptionHandler(s_veh_handle);
s_veh_handle = nullptr;
#else
#elif defined(USE_SIGSEGV)
// restore old signal handler
#if defined(__APPLE__) || defined(__aarch64__)
if (sigaction(SIGBUS, &s_old_sigbus_action, nullptr) < 0)
@ -267,6 +268,8 @@ bool RemoveHandler(void* owner)
}
s_old_sigsegv_action = {};
#else
return false;
#endif
}