16 changes: 8 additions & 8 deletions Source/Core/Core/PowerPC/PowerPC.cpp
View file
Expand Up @@ -30,7 +30,7 @@ namespace PowerPC

// STATE_TO_SAVE
PowerPCState GC_ALIGNED16(ppcState);
volatile CPUState state = CPU_STEPPING;
volatile CPUState state = STATE_STEPPING;

Interpreter * const interpreter = Interpreter::getInstance();
CoreMode mode;
Expand Down Expand Up @@ -135,7 +135,7 @@ void Init(int cpu_core)

switch (cpu_core)
{
case 0:
case CPU_INTERPRETER:
{
cpu_core_base = interpreter;
break;
Expand All @@ -158,7 +158,7 @@ void Init(int cpu_core)
{
mode = MODE_INTERPRETER;
}
state = CPU_STEPPING;
state = STATE_STEPPING;

ppcState.iCache.Init();
}
Expand All @@ -168,7 +168,7 @@ void Shutdown()
JitInterface::Shutdown();
interpreter->Shutdown();
cpu_core_base = nullptr;
state = CPU_POWERDOWN;
state = STATE_POWERDOWN;
}

CoreMode GetMode()
Expand Down Expand Up @@ -205,7 +205,7 @@ void SingleStep()

void RunLoop()
{
state = CPU_RUNNING;
state = STATE_RUNNING;
cpu_core_base->Run();
Host_UpdateDisasmDialog();
}
Expand All @@ -222,19 +222,19 @@ volatile CPUState *GetStatePtr()

void Start()
{
state = CPU_RUNNING;
state = STATE_RUNNING;
Host_UpdateDisasmDialog();
}

void Pause()
{
state = CPU_STEPPING;
state = STATE_STEPPING;
Host_UpdateDisasmDialog();
}

void Stop()
{
state = CPU_POWERDOWN;
state = STATE_POWERDOWN;
Host_UpdateDisasmDialog();
}

Expand Down
6 changes: 3 additions & 3 deletions Source/Core/Core/PowerPC/PowerPC.h
View file
Expand Up @@ -75,9 +75,9 @@ struct GC_ALIGNED64(PowerPCState)

enum CPUState
{
CPU_RUNNING = 0,
CPU_STEPPING = 2,
CPU_POWERDOWN = 3,
STATE_RUNNING = 0,
STATE_STEPPING = 2,
STATE_POWERDOWN = 3,
};

extern PowerPCState ppcState;
Expand Down
15 changes: 8 additions & 7 deletions Source/Core/DolphinWX/ConfigMain.cpp
View file
Expand Up @@ -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"
Expand All @@ -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
};

Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View file
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/MainAndroid.cpp
View file
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/MainNoGUI.cpp
View file
Expand Up @@ -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
}
Expand Down