Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions 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
Source/Core/DolphinWX/ConfigMain.cpp
+8 -7
View File
@@ -32,6 +32,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreParameter.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"
#include "Core/HW/EXI.h"
@@ -57,17 +58,17 @@
struct CPUCore
{
int CPUid;
CPUBackend CPUid;
const char *name;
};
const CPUCore CPUCores[] = {
{0, wxTRANSLATE("Interpreter (VERY slow)")},
{CPU_INTERPRETER, wxTRANSLATE("Interpreter (VERY slow)")},
#ifdef _M_ARM
{3, wxTRANSLATE("Arm JIT (experimental)")},
{4, wxTRANSLATE("Arm JITIL (experimental)")},
{CPU_JIT_ARM, wxTRANSLATE("Arm JIT (experimental)")},
{CPU_JIT_IL_ARM, wxTRANSLATE("Arm JITIL (experimental)")},
#else
{1, wxTRANSLATE("JIT Recompiler (recommended)")},
{2, wxTRANSLATE("JITIL Recompiler (slower, experimental)")},
{CPU_JIT_X64, wxTRANSLATE("JIT Recompiler (recommended)")},
{CPU_JIT_IL_X64, wxTRANSLATE("JITIL Recompiler (slower, experimental)")},
#endif
};
@@ -907,7 +908,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = CPUCores[CPUEngine->GetSelection()].CPUid;
if (main_frame->g_pCodeWindow)
main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER,
SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore?false:true);
SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore == CPU_INTERPRETER);
break;
case ID_NTSCJ:
SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked();
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
+1 -1
View File
@@ -369,7 +369,7 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
" and stepping to work as explained in the Developer Documentation. But it can be very"
" slow, perhaps slower than 1 fps."),
wxITEM_CHECK);
interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0);
interpreter->Check(_LocalCoreStartupParameter.iCPUCore == CPU_INTERPRETER);
pCoreMenu->AppendSeparator();
pCoreMenu->Append(IDM_JITBLOCKLINKING, _("&JIT Block Linking off"),
Source/Core/DolphinWX/MainAndroid.cpp
+1 -1
View File
@@ -370,7 +370,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *
// No use running the loop when booting fails
if ( BootManager::BootCore( g_filename.c_str() ) )
while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
while (PowerPC::GetState() != PowerPC::STATE_POWERDOWN)
updateMainFrameEvent.Wait();
WiimoteReal::Shutdown();
Source/Core/DolphinWX/MainNoGUI.cpp
+1 -1
View File
@@ -380,7 +380,7 @@ int main(int argc, char* argv[])
[event release];
[pool release];
#else
while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
while (PowerPC::GetState() != PowerPC::STATE_POWERDOWN)
updateMainFrameEvent.Wait();
#endif
}