psxcounters: avoid excessive recalculations

1 files changed, 6 insertions, 15 deletions

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 2ea7c63..cd99842 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