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

Some simplification.

This commit is contained in:
Brandon Wright 2018-06-01 15:34:51 -05:00
parent f70592df90
commit c4cf40c509
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cpuexec.cpp
View File

@ -242,8 +242,14 @@ void S9xMainLoop (void)
} }
} }
if (CPU.IRQTransition) if ((CPU.Cycles >= Timings.NextIRQTimer))
{ {
S9xUpdateIRQPositions();
#ifdef DEBUGGER
S9xTraceMessage ("Timer triggered\n");
#endif
if (CPU.WaitingForInterrupt) if (CPU.WaitingForInterrupt)
{ {
CPU.WaitingForInterrupt = FALSE; CPU.WaitingForInterrupt = FALSE;
@ -253,20 +259,9 @@ void S9xMainLoop (void)
S9xDoHEventProcessing(); S9xDoHEventProcessing();
} }
CPU.IRQTransition = FALSE;
CPU.IRQLine = TRUE; CPU.IRQLine = TRUE;
} }
if ((CPU.Cycles >= Timings.NextIRQTimer) && !CPU.IRQLine && !CPU.IRQTransition)
{
S9xUpdateIRQPositions();
#ifdef DEBUGGER
S9xTraceMessage ("Timer triggered\n");
#endif
CPU.IRQTransition = TRUE;
}
if ((CPU.IRQLine || CPU.IRQExternal) && !CheckFlag(IRQ)) if ((CPU.IRQLine || CPU.IRQExternal) && !CheckFlag(IRQ))
{ {
/* The flag pushed onto the stack is the new value */ /* The flag pushed onto the stack is the new value */