X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxcounters.c;h=cd99842b6bf36357f659d72ee76c0128754f8c70;hp=2ea7c63bc7aaccd6b5a8a32202427e1cd352cd15;hb=95df1a043efd3a11b3cdf90d647fc1b3a96a2c88;hpb=53c361f0abe1fca37806bec2c20afc661c998df6 diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 2ea7c63b..cd99842b 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -194,18 +194,12 @@ void psxRcntReset( u32 index ) if( rcnts[index].counterState == CountToTarget ) { + count = psxRegs.cycle; + count -= rcnts[index].cycleStart; + if( rcnts[index].rate > 1 ) + count /= rcnts[index].rate; if( rcnts[index].mode & RcCountToTarget ) - { - count = psxRegs.cycle; - count -= rcnts[index].cycleStart; - if (rcnts[index].rate > 1) - count /= rcnts[index].rate; count -= rcnts[index].target; - } - else - { - count = _psxRcntRcount( index ); - } _psxRcntWcount( index, count ); @@ -221,8 +215,6 @@ void psxRcntReset( u32 index ) rcnts[index].mode |= RcCountEqTarget; - psxRcntSet(); - if( count < 0xffff ) // special case, overflow too? return; } @@ -249,8 +241,6 @@ void psxRcntReset( u32 index ) rcnts[index].mode |= RcOverflow; } - - psxRcntSet(); } void psxRcntUpdate() @@ -338,9 +328,10 @@ void psxRcntUpdate() base_cycle += hsync_steps * 8791293; rcnts[3].cycle = base_cycle >> 12; base_cycle &= 0xfff; - psxRcntSet(); } + psxRcntSet(); + #ifndef NDEBUG DebugVSync(); #endif