diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 825d15e4ce..0fdc5cfcdb 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -44,7 +44,6 @@ static std::mutex cs_frameSkip; namespace Movie { static bool s_bFrameStep = false; -static bool s_bFrameStop = false; static bool s_bReadOnly = true; static u32 s_rerecords = 0; static PlayMode s_playMode = MODE_NONE; @@ -160,11 +159,6 @@ void FrameUpdate() s_bFrameStep = false; } - // ("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. - if (s_bFrameStop) - *PowerPC::GetStatePtr() = PowerPC::CPU_STEPPING; - if (s_framesToSkip) FrameSkipping(); @@ -177,7 +171,6 @@ void Init() { s_bPolled = false; s_bFrameStep = false; - s_bFrameStop = false; s_bSaveConfig = false; s_iCPUCore = SConfig::GetInstance().iCPUCore; if (IsPlayingInput()) @@ -264,11 +257,6 @@ void DoFrameStep() } } -void SetFrameStopping(bool bEnabled) -{ - s_bFrameStop = bEnabled; -} - void SetReadOnly(bool bEnabled) { if (s_bReadOnly != bEnabled) diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 7fa19d22f5..350c9da28e 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -153,7 +153,6 @@ void ChangePads(bool instantly = false); void ChangeWiiPads(bool instantly = false); void DoFrameStep(); -void SetFrameStopping(bool bEnabled); void SetReadOnly(bool bEnabled); void SetFrameSkipping(unsigned int framesToSkip); diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index d5ef266ede..d709708456 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -225,7 +225,7 @@ CPUState GetState() return state; } -volatile CPUState *GetStatePtr() +const volatile CPUState *GetStatePtr() { return &state; } diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index 2bddfb7955..71faf219b5 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -160,7 +160,7 @@ void Pause(); void Stop(); void FinishStateMove(); CPUState GetState(); -volatile CPUState *GetStatePtr(); // this oddity is here instead of an extern declaration to easily be able to find all direct accesses throughout the code. +const volatile CPUState *GetStatePtr(); // this oddity is here instead of an extern declaration to easily be able to find all direct accesses throughout the code. u32 CompactCR(); void ExpandCR(u32 cr);