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

6502X: pending IRQs are not delayed when !RDY is asserted

This commit is contained in:
SaxxonPike 2019-07-13 12:31:09 -05:00
parent bf2cba0e23
commit d39f3e2e61
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs
View File

@ -803,18 +803,24 @@ namespace BizHawk.Emulation.Cores.Components.M6502
}
void Imp_SEI()
{
// not affected by RDY
iflag_pending = true;
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); iflag_pending = true;
FetchDummy();
}
}
void Imp_CLI()
{
// not affected by RDY
iflag_pending = false;
rdy_freeze = !RDY;
if (RDY)
{
FetchDummy(); iflag_pending = false;
FetchDummy();
}
}
void Imp_SEC()
@ -2970,10 +2976,7 @@ namespace BizHawk.Emulation.Cores.Components.M6502
{
// total cycles now increments every time a cycle is called to accurately count during RDY
TotalExecutedCycles++;
if (!rdy_freeze)
{
interrupt_pending |= Interrupted;
}
interrupt_pending |= Interrupted;
rdy_freeze = false;
//i tried making ExecuteOneRetry not re-entrant by having it set a flag instead, then exit from the call below, check the flag, and GOTO if it was flagged, but it wasnt faster

3
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
View File

@ -89,9 +89,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public void ExecutePhase()
{
_cpu.RDY = ReadRdy();
// if (!ReadAec())
// return;
_cpu.IRQ = !ReadIrq();
_pinNmiLast = _thisNmi;
_thisNmi = ReadNmi();