piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1449 from comex/memtools-merge

Browse Source 
Reorganize faulting stuff.  Differentiate between arch- and OS-specific defines.
This commit is contained in:
comex
2014-11-16 13:46:33 -05:00
parent c0291d5b88 2ecd849eab
commit aa2fc1f66b
14 changed files with 37 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Core.cpp
View File

@ -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;
}