diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2008-09-21 09:59:40 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2008-09-21 09:59:40 +0000 |
| commit | 6a5ad0ffdb0b9a6fcb40569df935fcdd9853d817 (patch) | |
| tree | a21bb7dc4cf65827bb35abdcd29b250b765d3e07 /Source | |
| parent | 3e2419776f2be1f0eda8e019f122a7fb5edc6f3e (diff) | |
Now stopping doesn't crash with the message "Tried to execute code that's not marked executable" (Access Violation error)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@592 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Src/MemTools.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp index b5c296db2a..154db1c499 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/MemTools.cpp @@ -25,6 +25,7 @@ #include "Common.h"
#include "MemTools.h"
#include "HW/Memmap.h"
+#include "PowerPC/PowerPC.h"
#include "PowerPC/Jit64/Jit.h"
#include "PowerPC/Jit64/JitBackpatch.h"
#include "x64Analyzer.h"
@@ -41,6 +42,10 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) int accessType = (int)pPtrs->ExceptionRecord->ExceptionInformation[0];
if (accessType == 8) //Rule out DEP
{
+ if(PowerPC::state == PowerPC::CPU_POWERDOWN) // Access violation during
+ // violent shutdown is fine
+ return EXCEPTION_CONTINUE_EXECUTION;
+
MessageBox(0, _T("Tried to execute code that's not marked executable. This is likely a JIT bug.\n"), 0, 0);
return EXCEPTION_CONTINUE_SEARCH;
}
|