X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxcounters.c;h=177ccb75214ab42a44622069fa8e4e17a01b17ac;hp=865b3d8ffbf705832f175bf85f48babb908d824e;hb=2aa6a3a0cd427c289fd906c5ada5b8e718da6c31;hpb=61ef5cf48ec7019f10f83017667e681ff8288509

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 865b3d8f..177ccb75 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -26,13 +26,6 @@
 
 /******************************************************************************/
 
-typedef struct Rcnt
-{
-    u16 mode, target;
-    u32 rate, irq, counterState, irqState;
-    u32 cycle, cycleStart;
-} Rcnt;
-
 enum
 {
     Rc0Gate           = 0x0001, // 0    not implemented
@@ -68,18 +61,20 @@ static const u32 CountToTarget    = 1;
 static const u32 FrameRate[]      = { 60, 50 };
 static const u32 VBlankStart[]    = { 240, 256 };
 static const u32 HSyncTotal[]     = { 263, 313 };
-static const u32 SpuUpdInterval[] = { 23, 22 };
+static const u32 SpuUpdInterval[] = { 32, 32 };
 
-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;
 static u32 hsync_steps = 0;
 static u32 gpu_wants_hcnt = 0;
+static u32 base_cycle = 0;
 
 u32 psxNextCounter = 0, psxNextsCounter = 0;
 
@@ -92,8 +87,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;
@@ -106,6 +102,7 @@ void verboseLog( s32 level, const char *str, ... )
         printf( "%s", buf );
         fflush( stdout );
     }
+#endif
 }
 
 /******************************************************************************/
@@ -180,6 +177,9 @@ void psxRcntSet()
             psxNextCounter = countToUpdate;
         }
     }
+
+    psxRegs.interrupt |= (1 << PSXINT_RCNT);
+    new_dyna_set_event(PSXINT_RCNT, psxNextCounter);
 }
 
 /******************************************************************************/
@@ -323,7 +323,14 @@ void psxRcntUpdate()
             hsync_steps = 1;
 
         rcnts[3].cycleStart = cycle - leftover_cycles;
-        rcnts[3].cycle = hsync_steps * rcnts[3].target;
+        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();
     }
 
@@ -338,8 +345,6 @@ void psxRcntWcount( u32 index, u32 value )
 {
     verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value );
 
-    psxRcntUpdate();
-
     _psxRcntWcount( index, value );
     psxRcntSet();
 }
@@ -348,8 +353,6 @@ void psxRcntWmode( u32 index, u32 value )
 {
     verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value );
 
-    psxRcntUpdate();
-
     rcnts[index].mode = value;
     rcnts[index].irqState = 0;
 
@@ -401,8 +404,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 ) );
@@ -415,8 +416,6 @@ u32 psxRcntRcount( u32 index )
 {
     u32 count;
 
-    psxRcntUpdate();
-
     count = _psxRcntRcount( index );
 
     // Parasite Eve 2 fix.
@@ -440,8 +439,6 @@ u32 psxRcntRmode( u32 index )
 {
     u16 mode;
 
-    psxRcntUpdate();
-
     mode = rcnts[index].mode;
     rcnts[index].mode &= 0xe7ff;
 
@@ -505,6 +502,8 @@ s32 psxRcntFreeze( gzFile f, s32 Mode )
     if (Mode == 0)
         hsync_steps = (psxRegs.cycle - rcnts[3].cycleStart) / rcnts[3].target;
 
+    base_cycle = 0;
+
     return 0;
 }