From: notaz Date: Sun, 10 Sep 2023 20:26:54 +0000 (+0300) Subject: adjust irq10 and rcnt for pal X-Git-Tag: r24l~188 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b2a1302e2b044523a3bd5a8cd0a967589a63a5;p=pcsx_rearmed.git adjust irq10 and rcnt for pal libretro/pcsx_rearmed#723 --- diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 388fb89d..9ff679e2 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -61,9 +61,8 @@ enum static const u32 CountToOverflow = 0; static const u32 CountToTarget = 1; -static const u32 FrameRate[] = { 60, 50 }; -static const u32 HSyncTotal[] = { 263, 314 }; // actually one more on odd lines for PAL -#define VBlankStart 240 +static const u32 HSyncTotal[] = { 263, 314 }; +#define VBlankStart 240 // todo: depend on the actual GPU setting #define VERBOSE_LEVEL 0 @@ -79,6 +78,15 @@ u32 psxNextCounter = 0, psxNextsCounter = 0; /******************************************************************************/ +static inline +u32 lineCycles(void) +{ + if (Config.PsxType) + return PSXCLK / 50 / HSyncTotal[1]; + else + return PSXCLK / 60 / HSyncTotal[0]; +} + static inline void setIrq( u32 irq ) { @@ -170,7 +178,7 @@ void _psxRcntWmode( u32 index, u32 value ) case 1: if( value & Rc1HSyncClock ) { - rcnts[index].rate = (PSXCLK / (FrameRate[Config.PsxType] * HSyncTotal[Config.PsxType])); + rcnts[index].rate = lineCycles(); } else { @@ -327,10 +335,10 @@ void psxRcntUpdate() { if (((rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset) || (rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset2)) - && cycles_passed > PSXCLK / 60 / 263) + && cycles_passed > lineCycles()) { - u32 q = cycles_passed / (PSXCLK / 60 / 263 + 1u); - rcnts[0].cycleStart += q * (PSXCLK / 60) / 263u; + u32 q = cycles_passed / (lineCycles() + 1u); + rcnts[0].cycleStart += q * lineCycles(); break; } else @@ -375,7 +383,7 @@ void psxRcntUpdate() // Update lace. if( hSyncCount >= HSyncTotal[Config.PsxType] ) { - u32 status, field = 0, i; + u32 status, field = 0; rcnts[3].cycleStart += Config.PsxType ? PSXCLK / 50 : PSXCLK / 60; hSyncCount = 0; frame_counter++; @@ -390,13 +398,21 @@ void psxRcntUpdate() HW_GPU_STATUS = SWAP32(status); GPU_vBlank(0, field); - for (i = 0; i < 2; i++) + if ((rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset) || + (rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset2)) + { + rcnts[0].cycleStart = rcnts[3].cycleStart; + } + + if ((rcnts[1].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset) || + (rcnts[1].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset2)) + { + rcnts[1].cycleStart = rcnts[3].cycleStart; + } + else if (rcnts[1].mode & Rc1HSyncClock) { - if ((rcnts[i].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset) || - (rcnts[i].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset2)) - { - rcnts[i].cycleStart = rcnts[3].cycleStart; - } + // adjust to remove the rounding error + _psxRcntWcount(1, (psxRegs.cycle - rcnts[1].cycleStart) / rcnts[1].rate); } } @@ -452,7 +468,8 @@ u32 psxRcntRcount0() (rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset2)) { count = psxRegs.cycle - rcnts[index].cycleStart; - count = ((16u * count) % (16u * PSXCLK / 60 / 263)) / 16u; + //count = ((16u * count) % (16u * PSXCLK / 60 / 263)) / 16u; + count = count % lineCycles(); rcnts[index].cycleStart = psxRegs.cycle - count; } else @@ -526,8 +543,6 @@ void psxRcntInit() // rcnt base. rcnts[3].rate = 1; - rcnts[3].mode = RcCountToTarget; - rcnts[3].target = (PSXCLK / (FrameRate[Config.PsxType] * HSyncTotal[Config.PsxType])); for( i = 0; i < CounterQuantity; ++i ) { @@ -537,6 +552,7 @@ void psxRcntInit() hSyncCount = 0; hsync_steps = 1; + scheduleRcntBase(); psxRcntSet(); } diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index df627251..69772d44 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -280,8 +280,11 @@ void irq10Interrupt() { irq10count, psxRegs.cycle - prevc, (psxRegs.CP0.n.SR & 0x401) != 0x401, !(psxHu32(0x1074) & 0x400)); #endif - if (--irq10count > 0) - psxScheduleIrq10One(prevc + PSXCLK / 60 / 263); + if (--irq10count > 0) { + u32 cycles_per_line = Config.PsxType + ? PSXCLK / 50 / 314 : PSXCLK / 60 / 263; + psxScheduleIrq10One(prevc + cycles_per_line); + } } void psxScheduleIrq10(int irq_count, int x_cycles, int y) {