psxcounters: handle overflow = target case
authornotaz <notasas@gmail.com>
Mon, 5 Dec 2011 00:34:30 +0000 (02:34 +0200)
committernotaz <notasas@gmail.com>
Mon, 5 Dec 2011 00:34:30 +0000 (02:34 +0200)
otherwise would need multiple calls to psxRcntUpdate() to get
overflow irq, but currently psxRcntUpdate() is only called once.

libpcsxcore/psxcounters.c

index 7317c87..2ea7c63 100644 (file)
@@ -190,6 +190,8 @@ void psxRcntReset( u32 index )
 {
     u32 count;
 
+    rcnts[index].mode |= RcUnknown10;
+
     if( rcnts[index].counterState == CountToTarget )
     {
         if( rcnts[index].mode & RcCountToTarget )
@@ -218,8 +220,14 @@ void psxRcntReset( u32 index )
         }
 
         rcnts[index].mode |= RcCountEqTarget;
+
+        psxRcntSet();
+
+        if( count < 0xffff ) // special case, overflow too?
+            return;
     }
-    else if( rcnts[index].counterState == CountToOverflow )
+
+    if( rcnts[index].counterState == CountToOverflow )
     {
         count  = psxRegs.cycle;
         count -= rcnts[index].cycleStart;
@@ -242,8 +250,6 @@ void psxRcntReset( u32 index )
         rcnts[index].mode |= RcOverflow;
     }
 
-    rcnts[index].mode |= RcUnknown10;
-
     psxRcntSet();
 }