Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common/PageFaultHandler: Fix for Windows/ARM64

Browse source
This commit is contained in:
Connor McLaughlin 2020-11-22 14:49:49 +10:00
parent ea355c20ad
commit 44b3c9be6e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/page_fault_handler.cpp
View file

@ -68,7 +68,7 @@ static bool IsStoreInstruction(const void* ptr)
} }
#endif #endif
#if defined(WIN32) && defined(CPU_X64) #if defined(WIN32) && (defined(CPU_X64) || defined(CPU_AARCH64))
static PVOID s_veh_handle; static PVOID s_veh_handle;
static LONG ExceptionHandler(PEXCEPTION_POINTERS exi) static LONG ExceptionHandler(PEXCEPTION_POINTERS exi)
@ -190,7 +190,7 @@ bool InstallHandler(void* owner, Callback callback)
if (was_empty) if (was_empty)
{ {
#if defined(WIN32) && defined(CPU_X64) #if defined(WIN32) && (defined(CPU_X64) || defined(CPU_AARCH64))
s_veh_handle = AddVectoredExceptionHandler(1, ExceptionHandler); s_veh_handle = AddVectoredExceptionHandler(1, ExceptionHandler);
if (!s_veh_handle) if (!s_veh_handle)
{ {
@ -247,7 +247,7 @@ bool RemoveHandler(void* owner)
if (m_handlers.empty()) if (m_handlers.empty())
{ {
#if defined(WIN32) && defined(CPU_X64) #if defined(WIN32) && (defined(CPU_X64) || defined(CPU_AARCH64))
RemoveVectoredExceptionHandler(s_veh_handle); RemoveVectoredExceptionHandler(s_veh_handle);
s_veh_handle = nullptr; s_veh_handle = nullptr;
#elif defined(USE_SIGSEGV) #elif defined(USE_SIGSEGV)