ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3769 from RisingFog/remove_framestep 

Remove Unused Framestop Functions
This commit is contained in:
Mathew Maidment 2016-04-29 19:41:25 -04:00
parent 3033096223 3140f9b226
commit b420abc908
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,6 @@ static std::mutex cs_frameSkip;
namespace Movie { namespace Movie {
static bool s_bFrameStep = false; static bool s_bFrameStep = false;
static bool s_bFrameStop = false;
static bool s_bReadOnly = true; static bool s_bReadOnly = true;
static u32 s_rerecords = 0; static u32 s_rerecords = 0;
static PlayMode s_playMode = MODE_NONE; static PlayMode s_playMode = MODE_NONE;
@ -160,11 +159,6 @@ void FrameUpdate()
s_bFrameStep = false; 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) if (s_framesToSkip)
FrameSkipping(); FrameSkipping();
@ -177,7 +171,6 @@ void Init()
{ {
s_bPolled = false; s_bPolled = false;
s_bFrameStep = false; s_bFrameStep = false;
s_bFrameStop = false;
s_bSaveConfig = false; s_bSaveConfig = false;
s_iCPUCore = SConfig::GetInstance().iCPUCore; s_iCPUCore = SConfig::GetInstance().iCPUCore;
if (IsPlayingInput()) if (IsPlayingInput())
@ -264,11 +257,6 @@ void DoFrameStep()
} }
} }
void SetFrameStopping(bool bEnabled)
{
s_bFrameStop = bEnabled;
}
void SetReadOnly(bool bEnabled) void SetReadOnly(bool bEnabled)
{ {
if (s_bReadOnly != bEnabled) if (s_bReadOnly != bEnabled)

1
Source/Core/Core/Movie.h
View File

@ -153,7 +153,6 @@ void ChangePads(bool instantly = false);
void ChangeWiiPads(bool instantly = false); void ChangeWiiPads(bool instantly = false);
void DoFrameStep(); void DoFrameStep();
void SetFrameStopping(bool bEnabled);
void SetReadOnly(bool bEnabled); void SetReadOnly(bool bEnabled);
void SetFrameSkipping(unsigned int framesToSkip); void SetFrameSkipping(unsigned int framesToSkip);

2
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -225,7 +225,7 @@ CPUState GetState()
return state; return state;
} }
volatile CPUState *GetStatePtr() const volatile CPUState *GetStatePtr()
{ {
return &state; return &state;
} }

2
Source/Core/Core/PowerPC/PowerPC.h
View File

@ -160,7 +160,7 @@ void Pause();
void Stop(); void Stop();
void FinishStateMove(); void FinishStateMove();
CPUState GetState(); 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(); u32 CompactCR();
void ExpandCR(u32 cr); void ExpandCR(u32 cr);