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

Z80: Actually upload the correct file >__>

This commit is contained in:
alyosha-tas 2017-06-28 16:34:01 -04:00 committed by GitHub
parent ef03bf63a3
commit c2476f1d36
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Emulation.Cores/CPUs/Z80/Execute.cs
View File

@ -11904,6 +11904,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80
}
}
bool int_triggered = false;
// Process interrupt requests.
if (nonMaskableInterruptPending)
@ -11923,6 +11924,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80
}
else if (iff1 && interrupt && Interruptable)
{
int_triggered = true;
Halted = false;
@ -11952,11 +11954,12 @@ namespace BizHawk.Emulation.Cores.Components.Z80
if (EI_pending > 0)
{
EI_pending--;
if (EI_pending == 0)
if (EI_pending == 0 && !int_triggered)
{
IFF1 = IFF2 = true;
}
}
}
}