ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small prettification

This commit is contained in:
Shawn Hoffman 2020-08-18 21:55:00 -07:00
parent 49b9deeb03
commit 2ba4fd960e
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/Core/MemTools.cpp
View File

@ -9,6 +9,7 @@
#include <cstring> #include <cstring>
#include <vector> #include <vector>
#include "Common/Assert.h"
#include "Common/CommonFuncs.h" #include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
@ -28,30 +29,32 @@ namespace EMM
{ {
#ifdef _WIN32 #ifdef _WIN32
static PVOID s_veh_handle;
static LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) static LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
{ {
switch (pPtrs->ExceptionRecord->ExceptionCode) switch (pPtrs->ExceptionRecord->ExceptionCode)
{ {
case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ACCESS_VIOLATION:
{ {
int accessType = (int)pPtrs->ExceptionRecord->ExceptionInformation[0]; ULONG_PTR access_type = pPtrs->ExceptionRecord->ExceptionInformation[0];
if (accessType == 8) // Rule out DEP if (access_type == 8) // Rule out DEP
{ {
return (DWORD)EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }
// virtual address of the inaccessible data // virtual address of the inaccessible data
uintptr_t badAddress = (uintptr_t)pPtrs->ExceptionRecord->ExceptionInformation[1]; uintptr_t fault_address = (uintptr_t)pPtrs->ExceptionRecord->ExceptionInformation[1];
CONTEXT* ctx = pPtrs->ContextRecord; SContext* ctx = pPtrs->ContextRecord;
if (JitInterface::HandleFault(badAddress, ctx)) if (JitInterface::HandleFault(fault_address, ctx))
{ {
return (DWORD)EXCEPTION_CONTINUE_EXECUTION; return EXCEPTION_CONTINUE_EXECUTION;
} }
else else
{ {
// Let's not prevent debugging. // Let's not prevent debugging.
return (DWORD)EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }
} }
@ -84,18 +87,17 @@ static LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
void InstallExceptionHandler() void InstallExceptionHandler()
{ {
// Make sure this is only called once per process execution if (s_veh_handle)
// Instead, could make a Uninstall function, but whatever..
static bool handlerInstalled = false;
if (handlerInstalled)
return; return;
AddVectoredExceptionHandler(TRUE, Handler); s_veh_handle = AddVectoredExceptionHandler(TRUE, Handler);
handlerInstalled = true; ASSERT(s_veh_handle);
} }
void UninstallExceptionHandler() void UninstallExceptionHandler()
{ {
ULONG status = RemoveVectoredExceptionHandler(s_veh_handle);
ASSERT(status);
} }
#elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE) #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)