empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

6522: Support cycle accurate reads from IFR for T1/T2 bits

Browse source
This commit is contained in:
tomcw 2021-04-30 22:23:20 +01:00
parent f959f4f1d6
commit 60ddf0fa35
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/Mockingboard.cpp
View file

@ -728,6 +728,17 @@ static USHORT GetTimer2Counter(BYTE reg, USHORT counter)
return counter - opcodeCycleAdjust; return counter - opcodeCycleAdjust;
} }
static bool IsTimer1Underflowed(BYTE reg, USHORT counter, USHORT latch, int timerIrqDelay)
{
const UINT opcodeCycleAdjust = GetOpcodeCyclesForRead(reg); // to compensate for the 4/5/6 cycle read opcode
return CheckTimerUnderflow(counter, timerIrqDelay, opcodeCycleAdjust);
}
static bool IsTimer2Underflowed(BYTE reg, USHORT counter)
{
return counter >= 0 && (short)GetTimer2Counter(reg, counter) < 0;
}
static BYTE SY6522_Read(BYTE nDevice, BYTE nReg) static BYTE SY6522_Read(BYTE nDevice, BYTE nReg)
{ {
g_bMB_Active = true; g_bMB_Active = true;
@ -780,6 +791,10 @@ static BYTE SY6522_Read(BYTE nDevice, BYTE nReg)
break; break;
case 0x0d: // IFR case 0x0d: // IFR
nValue = pMB->sy6522.IFR; nValue = pMB->sy6522.IFR;
if (pMB->bTimer1Active && IsTimer1Underflowed(nReg, pMB->sy6522.TIMER1_COUNTER.w, pMB->sy6522.TIMER1_LATCH.w, pMB->sy6522.timer1IrqDelay))
nValue |= IxR_TIMER1;
if (pMB->bTimer2Active && IsTimer2Underflowed(nReg, pMB->sy6522.TIMER2_COUNTER.w))
nValue |= IxR_TIMER2;
break; break;
case 0x0e: // IER case 0x0e: // IER
nValue = 0x80 | pMB->sy6522.IER; // GH#567 nValue = 0x80 | pMB->sy6522.IER; // GH#567