Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-13 02:29:40 +00:00
Code Issues Projects Releases Wiki Activity

MB: Moved MB_StartOfCpuExecute() to Snapshot_LoadState_v2(), since it's only needed there

Browse Source
This commit is contained in:
tomcw 2019-12-24 13:58:20 +00:00
parent e03b68b7f0
commit 960af9bda0
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/CPU.cpp
View File

@ -556,7 +556,9 @@ DWORD CpuExecute(const DWORD uCycles, const bool bVideoUpdate)
{ {
g_nCyclesExecuted = 0; g_nCyclesExecuted = 0;
MB_StartOfCpuExecute(); #ifdef _DEBUG
MB_CheckCumulativeCycles();
#endif
// uCycles: // uCycles:
// =0 : Do single step // =0 : Do single step

17
source/Mockingboard.cpp
View File

@ -1494,7 +1494,7 @@ void MB_Destroy()
static void ResetState() static void ResetState()
{ {
g_nMBTimerDevice = kTIMERDEVICE_INVALID; g_nMBTimerDevice = kTIMERDEVICE_INVALID;
g_uLastCumulativeCycles = 0; MB_SetCumulativeCycles();
g_nSSI263Device = 0; g_nSSI263Device = 0;
g_nCurrentActivePhoneme = -1; g_nCurrentActivePhoneme = -1;
@ -1761,8 +1761,19 @@ void MB_Demute()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Called by CpuExecute() before doing CPU emulation #ifdef _DEBUG
void MB_StartOfCpuExecute() void MB_CheckCumulativeCycles()
{
if (g_SoundcardType == CT_Empty)
return;
_ASSERT(g_uLastCumulativeCycles == g_nCumulativeCycles);
g_uLastCumulativeCycles = g_nCumulativeCycles;
}
#endif
// Called by: ResetState() and Snapshot_LoadState_v2()
void MB_SetCumulativeCycles()
{ {
g_uLastCumulativeCycles = g_nCumulativeCycles; g_uLastCumulativeCycles = g_nCumulativeCycles;
} }

5
source/Mockingboard.h
View File

@ -10,7 +10,10 @@ void MB_InitializeForLoadingSnapshot(void);
void MB_InitializeIO(LPBYTE pCxRomPeripheral, UINT uSlot4, UINT uSlot5); void MB_InitializeIO(LPBYTE pCxRomPeripheral, UINT uSlot4, UINT uSlot5);
void MB_Mute(); void MB_Mute();
void MB_Demute(); void MB_Demute();
void MB_StartOfCpuExecute(); #ifdef _DEBUG
void MB_CheckCumulativeCycles(); // DEBUG
#endif
void MB_SetCumulativeCycles();
void MB_PeriodicUpdate(UINT executedCycles); void MB_PeriodicUpdate(UINT executedCycles);
void MB_CheckIRQ(); void MB_CheckIRQ();
bool MB_UpdateCycles(ULONG uExecutedCycles); bool MB_UpdateCycles(ULONG uExecutedCycles);

1
source/SaveState.cpp
View File

@ -437,6 +437,7 @@ static void Snapshot_LoadState_v2(void)
throw std::string("Unknown top-level scalar: " + scalar); throw std::string("Unknown top-level scalar: " + scalar);
} }
MB_SetCumulativeCycles();
SetLoadedSaveStateFlag(true); SetLoadedSaveStateFlag(true);
// NB. The following disparity should be resolved: // NB. The following disparity should be resolved: