psxcounters: avoid update on each hsync

no useful work is done on hsync, no reason to interrupt the recompiler
that often, set up events as needed.

diff --git a/frontend/plugin.c b/frontend/plugin.c
index fa4cf21..853fb15 100644 (file)
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -75,7 +75,7 @@ extern void GPUreadDataMem(uint32_t *, int);
 extern long GPUdmaChain(uint32_t *,uint32_t);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
 extern long GPUdmaChain(uint32_t *,uint32_t);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);

-extern void GPUvBlank(int, uint32_t *);
+extern void GPUvBlank(int, uint32_t *, uint32_t *);

 extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 
 
 extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 
 

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index c724031..42028ea 100644 (file)
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -94,7 +94,7 @@ typedef long (CALLBACK* GPUfreeze)(uint32_t, GPUFreeze_t *);
 typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);\r
 typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);\r
 typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));\r
 typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);\r
 typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);\r
 typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));\r

-typedef void (CALLBACK* GPUvBlank)(int, uint32_t *);\r
+typedef void (CALLBACK* GPUvBlank)(int, uint32_t *, uint32_t *);\r

 \r
 // GPU function pointers\r
 extern GPUupdateLace    GPU_updateLace;\r
 \r
 // GPU function pointers\r
 extern GPUupdateLace    GPU_updateLace;\r

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index fc4c5b1..865b3d8 100644 (file)
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -78,6 +78,8 @@ static Rcnt rcnts[ CounterQuantity ];
 
 static u32 hSyncCount = 0;
 static u32 spuSyncCount = 0;
 
 static u32 hSyncCount = 0;
 static u32 spuSyncCount = 0;

+static u32 hsync_steps = 0;
+static u32 gpu_wants_hcnt = 0;

 
 u32 psxNextCounter = 0, psxNextsCounter = 0;
 
 
 u32 psxNextCounter = 0, psxNextsCounter = 0;
 


@@ -140,7 +142,8 @@ u32 _psxRcntRcount( u32 index )
 
     count  = psxRegs.cycle;
     count -= rcnts[index].cycleStart;
 
     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 > 0xffff )
     {


@@ -192,7 +195,8 @@ void psxRcntReset( u32 index )
         {
             count  = psxRegs.cycle;
             count -= rcnts[index].cycleStart;
         {
             count  = psxRegs.cycle;
             count -= rcnts[index].cycleStart;

-            count /= rcnts[index].rate;
+            if (rcnts[index].rate > 1)
+                count /= rcnts[index].rate;

             count -= rcnts[index].target;
         }
         else
             count -= rcnts[index].target;
         }
         else


@@ -218,7 +222,8 @@ void psxRcntReset( u32 index )
     {
         count  = psxRegs.cycle;
         count -= rcnts[index].cycleStart;
     {
         count  = psxRegs.cycle;
         count -= rcnts[index].cycleStart;

-        count /= rcnts[index].rate;
+        if (rcnts[index].rate > 1)
+            count /= rcnts[index].rate;

         count -= 0xffff;
 
         _psxRcntWcount( index, count );
         count -= 0xffff;
 
         _psxRcntWcount( index, count );


@@ -268,10 +273,11 @@ void psxRcntUpdate()
     // rcnt base.
     if( cycle - rcnts[3].cycleStart >= rcnts[3].cycle )
     {
     // 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, next_lace;

 
 

-        spuSyncCount++;
-        hSyncCount++;
+        spuSyncCount += hsync_steps;
+        hSyncCount += hsync_steps;

 
         // Update spu.
         if( spuSyncCount >= SpuUpdInterval[Config.PsxType] )
 
         // Update spu.
         if( spuSyncCount >= SpuUpdInterval[Config.PsxType] )


@@ -287,7 +293,7 @@ void psxRcntUpdate()
         // VSync irq.
         if( hSyncCount == VBlankStart[Config.PsxType] )
         {
         // VSync irq.
         if( hSyncCount == VBlankStart[Config.PsxType] )
         {

-            GPU_vBlank( 1, &hSyncCount );
+            GPU_vBlank( 1, &hSyncCount, &gpu_wants_hcnt );

             
             // For the best times. :D
             //setIrq( 0x01 );
             
             // For the best times. :D
             //setIrq( 0x01 );


@@ -298,15 +304,32 @@ void psxRcntUpdate()
         {
             hSyncCount = 0;
 
         {
             hSyncCount = 0;
 

-            GPU_vBlank( 0, &hSyncCount );
+            GPU_vBlank( 0, &hSyncCount, &gpu_wants_hcnt );

             setIrq( 0x01 );
 
             EmuUpdate();
             GPU_updateLace();
         }
             setIrq( 0x01 );
 
             EmuUpdate();
             GPU_updateLace();
         }

+
+        // Schedule next call, in hsyncs
+        hsync_steps = SpuUpdInterval[Config.PsxType] - spuSyncCount;
+        next_vsync = VBlankStart[Config.PsxType] - hSyncCount; // ok to overflow
+        next_lace = HSyncTotal[Config.PsxType] - hSyncCount;
+        if( next_vsync && next_vsync < hsync_steps )
+            hsync_steps = next_vsync;
+        if( next_lace && next_lace < hsync_steps )
+            hsync_steps = next_lace;
+        if( gpu_wants_hcnt )
+            hsync_steps = 1;
+
+        rcnts[3].cycleStart = cycle - leftover_cycles;
+        rcnts[3].cycle = hsync_steps * rcnts[3].target;
+        psxRcntSet();

     }
 
     }
 

+#ifndef NDEBUG

     DebugVSync();
     DebugVSync();

+#endif

 }
 
 /******************************************************************************/
 }
 
 /******************************************************************************/


@@ -464,6 +487,7 @@ void psxRcntInit()
 
     hSyncCount = 0;
     spuSyncCount = 0;
 
     hSyncCount = 0;
     spuSyncCount = 0;

+    hsync_steps = 1;

 
     psxRcntSet();
 }
 
     psxRcntSet();
 }


@@ -478,6 +502,9 @@ s32 psxRcntFreeze( gzFile f, s32 Mode )
     gzfreeze( &psxNextCounter, sizeof(psxNextCounter) );
     gzfreeze( &psxNextsCounter, sizeof(psxNextsCounter) );
 
     gzfreeze( &psxNextCounter, sizeof(psxNextCounter) );
     gzfreeze( &psxNextsCounter, sizeof(psxNextsCounter) );
 

+    if (Mode == 0)
+        hsync_steps = (psxRegs.cycle - rcnts[3].cycleStart) / rcnts[3].target;
+

     return 0;
 }
 
     return 0;
 }