Merge pull request #1449 from comex/memtools-merge
Reorganize faulting stuff. Differentiate between arch- and OS-specific defines.
This commit is contained in:
commit
aa2fc1f66b
14 files changed
+37
-108
No files matched your search
@@ -255,10 +255,8 @@ static void CpuThread()
|
||||
g_video_backend->Video_Prepare();
|
||||
}
|
||||
|
||||
#if _M_X86_64 || _M_ARM_32
|
||||
if (_CoreParameter.bFastmem)
|
||||
EMM::InstallExceptionHandler(); // Let's run under memory watch
|
||||
#endif
|
||||
|
||||
if (!s_state_filename.empty())
|
||||
State::LoadAs(s_state_filename);
|
||||
@@ -283,9 +281,7 @@ static void CpuThread()
|
||||
if (!_CoreParameter.bCPUThread)
|
||||
g_video_backend->Video_Cleanup();
|
||||
|
||||
#if _M_X86_64 || _M_ARM_32
|
||||
EMM::UninstallExceptionHandler();
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user