From 20a16beabd751583dbb8491c20b4c3f0d0d1359c Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Fri, 13 Jun 2014 20:27:05 +0200 Subject: [PATCH] enum CPUState: rename CPU_* to STATE_* --- Source/Core/AudioCommon/Mixer.cpp | 4 ++-- Source/Core/Core/Core.cpp | 4 ++-- Source/Core/Core/Debugger/PPCDebugInterface.cpp | 3 ++- Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 4 ++-- Source/Core/Core/HW/CPU.cpp | 14 +++++++------- Source/Core/Core/Movie.cpp | 4 ++-- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 4 ++-- Source/Core/Core/PowerPC/Jit64/JitAsm.cpp | 2 +- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 4 ++-- Source/Core/Core/PowerPC/PowerPC.cpp | 14 +++++++------- Source/Core/Core/PowerPC/PowerPC.h | 6 +++--- Source/Core/DolphinWX/MainAndroid.cpp | 2 +- Source/Core/DolphinWX/MainNoGUI.cpp | 2 +- 13 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 388eb56b0d..6b11d31722 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -113,7 +113,7 @@ unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider memset(samples, 0, num_samples * 2 * sizeof(short)); - if (PowerPC::GetState() != PowerPC::CPU_RUNNING) + if (PowerPC::GetState() != PowerPC::STATE_RUNNING) { // Silence return num_samples; @@ -138,7 +138,7 @@ void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_sampl // The auto throttle function. This loop will put a ceiling on the CPU MHz. while (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2) { - if (*PowerPC::GetStatePtr() != PowerPC::CPU_RUNNING || soundStream->IsMuted()) + if (*PowerPC::GetStatePtr() != PowerPC::STATE_RUNNING || soundStream->IsMuted()) break; // Shortcut key for Throttle Skipping if (Core::GetIsFramelimiterTempDisabled()) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 3fffedb7fb..9e3c1ec808 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -226,7 +226,7 @@ bool Init() // Called from GUI thread void Stop() // - Hammertime! { - if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) + if (PowerPC::GetState() == PowerPC::STATE_POWERDOWN) { if (g_EmuThread.joinable()) g_EmuThread.join(); @@ -471,7 +471,7 @@ void EmuThread() // Spawn the CPU+GPU thread g_cpu_thread = std::thread(cpuThreadFunc); - while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) + while (PowerPC::GetState() != PowerPC::STATE_POWERDOWN) { g_video_backend->PeekMessages(); Common::SleepCurrentThread(20); diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp index d07d49c097..f605d618e4 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp @@ -18,7 +18,8 @@ void PPCDebugInterface::Disassemble(unsigned int address, char *dest, int max_size) { // Memory::ReadUnchecked_U32 seemed to crash on shutdown - if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return; + if (PowerPC::GetState() == PowerPC::STATE_POWERDOWN) + return; if (Core::GetState() != Core::CORE_UNINITIALIZED) { diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 96fada80b0..1397a0217b 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -64,9 +64,9 @@ bool FifoPlayer::Play() LoadMemory(); // This loop replaces the CPU loop that occurs when a game is run - while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) + while (PowerPC::GetState() != PowerPC::STATE_POWERDOWN) { - if (PowerPC::GetState() == PowerPC::CPU_RUNNING) + if (PowerPC::GetState() == PowerPC::STATE_RUNNING) { if (m_CurrentFrame >= m_FrameRangeEnd) { diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index 820617eb33..4e45ab4a00 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -47,21 +47,21 @@ void CCPU::Run() reswitch: switch (PowerPC::GetState()) { - case PowerPC::CPU_RUNNING: + case PowerPC::STATE_RUNNING: //1: enter a fast runloop PowerPC::RunLoop(); break; - case PowerPC::CPU_STEPPING: + case PowerPC::STATE_STEPPING: m_csCpuOccupied.unlock(); //1: wait for step command.. m_StepEvent.Wait(); m_csCpuOccupied.lock(); - if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) + if (PowerPC::GetState() == PowerPC::STATE_POWERDOWN) return; - if (PowerPC::GetState() != PowerPC::CPU_STEPPING) + if (PowerPC::GetState() != PowerPC::STATE_STEPPING) goto reswitch; //3: do a step @@ -76,7 +76,7 @@ reswitch: Host_UpdateDisasmDialog(); break; - case PowerPC::CPU_POWERDOWN: + case PowerPC::STATE_POWERDOWN: //1: Exit loop!! return; } @@ -91,7 +91,7 @@ void CCPU::Stop() bool CCPU::IsStepping() { - return PowerPC::GetState() == PowerPC::CPU_STEPPING; + return PowerPC::GetState() == PowerPC::STATE_STEPPING; } void CCPU::Reset() @@ -102,7 +102,7 @@ void CCPU::Reset() void CCPU::StepOpcode(Common::Event *event) { m_StepEvent.Set(); - if (PowerPC::GetState() == PowerPC::CPU_STEPPING) + if (PowerPC::GetState() == PowerPC::STATE_STEPPING) { m_SyncEvent = event; } diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index bc960ef832..98d8c41e9f 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -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(); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 7dac00d435..d7d6ecacc4 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -409,7 +409,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc // Comment out the following to disable breakpoints (speed-up) if (!Profiler::g_ProfileBlocks) { - if (GetState() == CPU_STEPPING) + if (GetState() == STATE_STEPPING) blockSize = 1; Trace(); } @@ -583,7 +583,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc SetJumpTarget(clearInt); } - if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != STATE_STEPPING) { gpr.Flush(); fpr.Flush(); diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp index 742837527a..384505acce 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp @@ -54,7 +54,7 @@ void Jit64AsmRoutineManager::Generate() if (Core::g_CoreStartupParameter.bEnableDebugging) { - TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::CPU_STEPPING)); + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(PowerPC::STATE_STEPPING)); FixupBranch notStepping = J_CC(CC_Z); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckBreakPoints)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index 8c58ae6418..8627b12630 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -508,7 +508,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc // Comment out the following to disable breakpoints (speed-up) if (!Profiler::g_ProfileBlocks) { - if (GetState() == CPU_STEPPING) + if (GetState() == STATE_STEPPING) blockSize = 1; Trace(); } @@ -642,7 +642,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc ibuild.EmitExtExceptionCheck(ibuild.EmitIntConst(ops[i].address)); } - if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != CPU_STEPPING) + if (Core::g_CoreStartupParameter.bEnableDebugging && breakpoints.IsAddressBreakPoint(ops[i].address) && GetState() != STATE_STEPPING) { ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); } diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index db4e755de4..22182104aa 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -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; @@ -158,7 +158,7 @@ void Init(int cpu_core) { mode = MODE_INTERPRETER; } - state = CPU_STEPPING; + state = STATE_STEPPING; ppcState.iCache.Init(); } @@ -168,7 +168,7 @@ void Shutdown() JitInterface::Shutdown(); interpreter->Shutdown(); cpu_core_base = nullptr; - state = CPU_POWERDOWN; + state = STATE_POWERDOWN; } CoreMode GetMode() @@ -205,7 +205,7 @@ void SingleStep() void RunLoop() { - state = CPU_RUNNING; + state = STATE_RUNNING; cpu_core_base->Run(); Host_UpdateDisasmDialog(); } @@ -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(); } diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index 107c63da95..c3b5a265b5 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -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; diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index a5cde56e91..31bf4fd824 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -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(); diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index d4b75d83cb..1955dbf6f2 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -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 }