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

Merge pull request #328 from Tilka/enum_cpubackend

Browse Source 
Don't add segfault handler in interpreter mode
This commit is contained in:
Dolphin Bot
2014-07-06 19:28:10 +02:00
parent db4e32a124 ad2aaedd8b
commit 4ec8c3714d
23 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Movie.cpp
View File

@ -61,7 +61,7 @@ u64 g_recordingStartTime; // seconds since 1970 that recording started
bool bSaveConfig = false, bSkipIdle = false, bDualCore = false, bProgressive = false, bDSPHLE = false, bFastDiscSpeed = false;
bool g_bClearSave = false, bSyncGPU = false, bNetPlay = false;
std::string videoBackend = "unknown";
int iCPUCore = 1;
CPUBackend iCPUCore = CPU_JIT_X64;
bool g_bDiscChange = false;
std::string g_discChange = "";
std::string author = "";
@ -143,9 +143,9 @@ void FrameUpdate()
}
// ("framestop") the only purpose of this is to cause interpreter/jit Run() to return temporarily.
// after that we set it back to CPU_RUNNING and continue as normal.
// after that we set it back to STATE_RUNNING and continue as normal.
if (g_bFrameStop)
*PowerPC::GetStatePtr() = PowerPC::CPU_STEPPING;
*PowerPC::GetStatePtr() = PowerPC::STATE_STEPPING;
if (g_framesToSkip)
FrameSkipping();
@ -356,7 +356,7 @@ bool IsFastDiscSpeed()
return bFastDiscSpeed;
}
int GetCPUMode()
CPUBackend GetCPUMode()
{
return iCPUCore;
}