X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxcounters.c;h=35823dacdafc3cd34ab92c66c84d00285b538957;hp=ebfe62967fd2f6fa4ccbb1568352f275b82b288e;hb=bdd050c3ed792381df2e744fee5b7ee80b93fd68;hpb=ef79bbde537d6b9c745a7d86cb9df1d04c35590d diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index ebfe6296..35823dac 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -22,16 +22,11 @@ */ #include "psxcounters.h" +#include "gpu.h" +#include "debug.h" /******************************************************************************/ -typedef struct Rcnt -{ - u16 mode, target; - u32 rate, irq, counterState, irqState; - u32 cycle, cycleStart; -} Rcnt; - enum { Rc0Gate = 0x0001, // 0 not implemented @@ -65,18 +60,20 @@ static const u32 CountToOverflow = 0; static const u32 CountToTarget = 1; static const u32 FrameRate[] = { 60, 50 }; -static const u32 VBlankStart[] = { 240, 256 }; -static const u32 HSyncTotal[] = { 262, 312 }; -static const u32 SpuUpdInterval[] = { 23, 22 }; +static const u32 HSyncTotal[] = { 263, 313 }; +#define VBlankStart 240 -static const s32 VerboseLevel = 0; +#define VERBOSE_LEVEL 0 +static const s32 VerboseLevel = VERBOSE_LEVEL; /******************************************************************************/ -static Rcnt rcnts[ CounterQuantity ]; +Rcnt rcnts[ CounterQuantity ]; -static u32 hSyncCount = 0; -static u32 spuSyncCount = 0; +u32 hSyncCount = 0; +u32 frame_counter = 0; +static u32 hsync_steps = 0; +static u32 base_cycle = 0; u32 psxNextCounter = 0, psxNextsCounter = 0; @@ -89,8 +86,9 @@ void setIrq( u32 irq ) } static -void verboseLog( s32 level, const char *str, ... ) +void verboseLog( u32 level, const char *str, ... ) { +#if VERBOSE_LEVEL > 0 if( level <= VerboseLevel ) { va_list va; @@ -100,9 +98,10 @@ void verboseLog( s32 level, const char *str, ... ) vsprintf( buf, str, va ); va_end( va ); - printf( buf ); + printf( "%s", buf ); fflush( stdout ); } +#endif } /******************************************************************************/ @@ -127,7 +126,7 @@ void _psxRcntWcount( u32 index, u32 value ) } else { - rcnts[index].cycle = 0xffff * rcnts[index].rate; + rcnts[index].cycle = 0x10000 * rcnts[index].rate; rcnts[index].counterState = CountToOverflow; } } @@ -139,17 +138,64 @@ u32 _psxRcntRcount( u32 index ) count = psxRegs.cycle; count -= rcnts[index].cycleStart; - count /= rcnts[index].rate; + if (rcnts[index].rate > 1) + count /= rcnts[index].rate; - if( count > 0xffff ) + if( count > 0x10000 ) { - verboseLog( 1, "[RCNT %i] rcount > 0xffff: %x\n", index, count ); - count &= 0xffff; + verboseLog( 1, "[RCNT %i] rcount > 0x10000: %x\n", index, count ); } + count &= 0xffff; return count; } +static +void _psxRcntWmode( u32 index, u32 value ) +{ + rcnts[index].mode = value; + + switch( index ) + { + case 0: + if( value & Rc0PixelClock ) + { + rcnts[index].rate = 5; + } + else + { + rcnts[index].rate = 1; + } + break; + case 1: + if( value & Rc1HSyncClock ) + { + rcnts[index].rate = (PSXCLK / (FrameRate[Config.PsxType] * HSyncTotal[Config.PsxType])); + } + else + { + rcnts[index].rate = 1; + } + break; + case 2: + if( value & Rc2OneEighthClock ) + { + rcnts[index].rate = 8; + } + else + { + rcnts[index].rate = 1; + } + + // TODO: wcount must work. + if( value & Rc2Disable ) + { + rcnts[index].rate = 0xffffffff; + } + break; + } +} + /******************************************************************************/ static @@ -176,6 +222,9 @@ void psxRcntSet() psxNextCounter = countToUpdate; } } + + psxRegs.interrupt |= (1 << PSXINT_RCNT); + new_dyna_set_event(PSXINT_RCNT, psxNextCounter); } /******************************************************************************/ @@ -183,50 +232,58 @@ void psxRcntSet() static void psxRcntReset( u32 index ) { - u32 count; + u32 rcycles; + + rcnts[index].mode |= RcUnknown10; if( rcnts[index].counterState == CountToTarget ) { + rcycles = psxRegs.cycle - rcnts[index].cycleStart; if( rcnts[index].mode & RcCountToTarget ) { - count = psxRegs.cycle; - count -= rcnts[index].cycleStart; - count /= rcnts[index].rate; - count -= rcnts[index].target; + rcycles -= rcnts[index].target * rcnts[index].rate; + rcnts[index].cycleStart = psxRegs.cycle - rcycles; } else { - count = _psxRcntRcount( index ); + rcnts[index].cycle = 0x10000 * rcnts[index].rate; + rcnts[index].counterState = CountToOverflow; } - _psxRcntWcount( index, count ); - if( rcnts[index].mode & RcIrqOnTarget ) { if( (rcnts[index].mode & RcIrqRegenerate) || (!rcnts[index].irqState) ) { - verboseLog( 3, "[RCNT %i] irq: %x\n", index, count ); + verboseLog( 3, "[RCNT %i] irq\n", index ); setIrq( rcnts[index].irq ); rcnts[index].irqState = 1; } } rcnts[index].mode |= RcCountEqTarget; + + if( rcycles < 0x10000 * rcnts[index].rate ) + return; } - else if( rcnts[index].counterState == CountToOverflow ) + + if( rcnts[index].counterState == CountToOverflow ) { - count = psxRegs.cycle; - count -= rcnts[index].cycleStart; - count /= rcnts[index].rate; - count -= 0xffff; + rcycles = psxRegs.cycle - rcnts[index].cycleStart; + rcycles -= 0x10000 * rcnts[index].rate; - _psxRcntWcount( index, count ); + rcnts[index].cycleStart = psxRegs.cycle - rcycles; + + if( rcycles < rcnts[index].target * rcnts[index].rate ) + { + rcnts[index].cycle = rcnts[index].target * rcnts[index].rate; + rcnts[index].counterState = CountToTarget; + } if( rcnts[index].mode & RcIrqOnOverflow ) { if( (rcnts[index].mode & RcIrqRegenerate) || (!rcnts[index].irqState) ) { - verboseLog( 3, "[RCNT %i] irq: %x\n", index, count ); + verboseLog( 3, "[RCNT %i] irq\n", index ); setIrq( rcnts[index].irq ); rcnts[index].irqState = 1; } @@ -234,10 +291,6 @@ void psxRcntReset( u32 index ) rcnts[index].mode |= RcOverflow; } - - rcnts[index].mode |= RcUnknown10; - - psxRcntSet(); } void psxRcntUpdate() @@ -267,45 +320,61 @@ void psxRcntUpdate() // rcnt base. if( cycle - rcnts[3].cycleStart >= rcnts[3].cycle ) { - psxRcntReset( 3 ); + u32 leftover_cycles = cycle - rcnts[3].cycleStart - rcnts[3].cycle; + u32 next_vsync; - spuSyncCount++; - hSyncCount++; + hSyncCount += hsync_steps; - // Update spu. - if( spuSyncCount >= SpuUpdInterval[Config.PsxType] ) + // VSync irq. + if( hSyncCount == VBlankStart ) { - spuSyncCount = 0; + HW_GPU_STATUS &= ~PSXGPU_LCF; + GPU_vBlank( 1, 0 ); + setIrq( 0x01 ); + + EmuUpdate(); + GPU_updateLace(); if( SPU_async ) { - SPU_async( SpuUpdInterval[Config.PsxType] * rcnts[3].target ); + SPU_async( cycle, 1 ); } } - // VSync irq. - if( hSyncCount == VBlankStart[Config.PsxType] ) - { - GPU_vBlank( 1 ); - - // For the best times. :D - //setIrq( 0x01 ); - } - // Update lace. (with InuYasha fix) if( hSyncCount >= (Config.VSyncWA ? HSyncTotal[Config.PsxType] / BIAS : HSyncTotal[Config.PsxType]) ) { hSyncCount = 0; + frame_counter++; - GPU_vBlank( 0 ); - setIrq( 0x01 ); - - GPU_updateLace(); - EmuUpdate(); + gpuSyncPluginSR(); + if( (HW_GPU_STATUS & PSXGPU_ILACE_BITS) == PSXGPU_ILACE_BITS ) + HW_GPU_STATUS |= frame_counter << 31; + GPU_vBlank( 0, HW_GPU_STATUS >> 31 ); } + + // Schedule next call, in hsyncs + hsync_steps = HSyncTotal[Config.PsxType] - hSyncCount; + next_vsync = VBlankStart - hSyncCount; // ok to overflow + if( next_vsync && next_vsync < hsync_steps ) + hsync_steps = next_vsync; + + rcnts[3].cycleStart = cycle - leftover_cycles; + if (Config.PsxType) + // 20.12 precision, clk / 50 / 313 ~= 2164.14 + base_cycle += hsync_steps * 8864320; + else + // clk / 60 / 263 ~= 2146.31 + base_cycle += hsync_steps * 8791293; + rcnts[3].cycle = base_cycle >> 12; + base_cycle &= 0xfff; } + psxRcntSet(); + +#ifndef NDEBUG DebugVSync(); +#endif } /******************************************************************************/ @@ -314,8 +383,6 @@ void psxRcntWcount( u32 index, u32 value ) { verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value ); - psxRcntUpdate(); - _psxRcntWcount( index, value ); psxRcntSet(); } @@ -324,52 +391,10 @@ void psxRcntWmode( u32 index, u32 value ) { verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value ); - psxRcntUpdate(); + _psxRcntWmode( index, value ); + _psxRcntWcount( index, 0 ); - rcnts[index].mode = value; rcnts[index].irqState = 0; - - switch( index ) - { - case 0: - if( value & Rc0PixelClock ) - { - rcnts[index].rate = 5; - } - else - { - rcnts[index].rate = 1; - } - break; - case 1: - if( value & Rc1HSyncClock ) - { - rcnts[index].rate = (PSXCLK / (FrameRate[Config.PsxType] * HSyncTotal[Config.PsxType])); - } - else - { - rcnts[index].rate = 1; - } - break; - case 2: - if( value & Rc2OneEighthClock ) - { - rcnts[index].rate = 8; - } - else - { - rcnts[index].rate = 1; - } - - // TODO: wcount must work. - if( value & Rc2Disable ) - { - rcnts[index].rate = 0xffffffff; - } - break; - } - - _psxRcntWcount( index, 0 ); psxRcntSet(); } @@ -377,8 +402,6 @@ void psxRcntWtarget( u32 index, u32 value ) { verboseLog( 1, "[RCNT %i] wtarget: %x\n", index, value ); - psxRcntUpdate(); - rcnts[index].target = value; _psxRcntWcount( index, _psxRcntRcount( index ) ); @@ -391,8 +414,6 @@ u32 psxRcntRcount( u32 index ) { u32 count; - psxRcntUpdate(); - count = _psxRcntRcount( index ); // Parasite Eve 2 fix. @@ -416,8 +437,6 @@ u32 psxRcntRmode( u32 index ) { u16 mode; - psxRcntUpdate(); - mode = rcnts[index].mode; rcnts[index].mode &= 0xe7ff; @@ -461,19 +480,41 @@ void psxRcntInit() _psxRcntWcount( i, 0 ); } + hSyncCount = 0; + hsync_steps = 1; + psxRcntSet(); } /******************************************************************************/ -s32 psxRcntFreeze( gzFile f, s32 Mode ) +s32 psxRcntFreeze( void *f, s32 Mode ) { + u32 spuSyncCount = 0; + u32 count; + s32 i; + gzfreeze( &rcnts, sizeof(rcnts) ); gzfreeze( &hSyncCount, sizeof(hSyncCount) ); gzfreeze( &spuSyncCount, sizeof(spuSyncCount) ); gzfreeze( &psxNextCounter, sizeof(psxNextCounter) ); gzfreeze( &psxNextsCounter, sizeof(psxNextsCounter) ); + if (Mode == 0) + { + // don't trust things from a savestate + for( i = 0; i < CounterQuantity; ++i ) + { + _psxRcntWmode( i, rcnts[i].mode ); + count = (psxRegs.cycle - rcnts[i].cycleStart) / rcnts[i].rate; + _psxRcntWcount( i, count ); + } + hsync_steps = (psxRegs.cycle - rcnts[3].cycleStart) / rcnts[3].target; + psxRcntSet(); + + base_cycle = 0; + } + return 0; }