diff --git a/common/include/Utilities/lnx_memzero.h b/common/include/Utilities/lnx_memzero.h index b64ec47243..11c3e78093 100644 --- a/common/include/Utilities/lnx_memzero.h +++ b/common/include/Utilities/lnx_memzero.h @@ -112,7 +112,7 @@ static __forceinline void memset_8( void *dest ) "stosd\n" "stosd\n" ".att_syntax\n" - : + : "=D"(dest) // Input specifiers: D - edi, a -- eax, c ecx : [dest]"D"(dest), [data32]"a"(data32) : "memory" @@ -131,7 +131,7 @@ static __forceinline void memset_8( void *dest ) "stosd\n" "stosd\n" ".att_syntax\n" - : + : "=D"(dest) : [dest]"D"(dest), [data32]"a"(data32) : "memory" @@ -151,7 +151,7 @@ static __forceinline void memset_8( void *dest ) "stosd\n" "stosd\n" ".att_syntax\n" - : + : "=D"(dest) : [dest]"D"(dest), [data32]"a"(data32) : "memory" @@ -168,7 +168,7 @@ static __forceinline void memset_8( void *dest ) // "mov eax, %\[data32]n" "rep stosd\n" ".att_syntax\n" - : + : "=D"(dest) : [remdat]"c"(remdat), [dest]"D"(dest), [data32]"a"(data32) : "memory" ); diff --git a/pcsx2/windows/WinSysExec.cpp b/pcsx2/windows/WinSysExec.cpp index 6a11a70c62..ef1e761a3f 100644 --- a/pcsx2/windows/WinSysExec.cpp +++ b/pcsx2/windows/WinSysExec.cpp @@ -20,6 +20,8 @@ #include "Common.h" #include "System/PageFaultSource.h" +#if PCSX2_SEH + int SysPageFaultExceptionFilter( EXCEPTION_POINTERS* eps ) { if( eps->ExceptionRecord->ExceptionCode != EXCEPTION_ACCESS_VIOLATION ) @@ -29,6 +31,8 @@ int SysPageFaultExceptionFilter( EXCEPTION_POINTERS* eps ) return Source_PageFault.WasHandled() ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; } +#endif + void InstallSignalHandler() { // NOP on Win32 systems -- we use __try{} __except{} instead.