spu: rework synchronization

[pcsx_rearmed.git] / plugins / dfsound / freeze.c

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 0601bf5..9fa29f0 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -132,9 +132,7 @@ typedef struct
 ////////////////////////////////////////////////////////////////////////\r
 \r
 void LoadStateV5(SPUFreeze_t * pF);                    // newest version\r
-void LoadStateUnknown(SPUFreeze_t * pF);               // unknown format\r
-\r
-extern int lastch;\r
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format\r
 \r
 // we want to retain compatibility between versions,\r
 // so use original channel struct\r
@@ -183,8 +181,10 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  memset(d, 0, sizeof(*d));\r
  if (s->bNew) dwNewChannel |= 1<<ch;\r
  d->iSBPos = s->iSBPos;\r
+ if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;\r
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
+ d->sinc_inv = 0;\r
  memcpy(d->SB, s->SB, sizeof(d->SB));\r
  d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
  d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
@@ -212,11 +212,20 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  else d->ADSRX.EnvelopeVol = 0;\r
 }\r
 \r
+// force load from regArea to variables\r
+static void load_register(unsigned long reg, unsigned int cycles)\r
+{\r
+ unsigned short *r = &regArea[((reg & 0xfff) - 0xc00) >> 1];\r
+ *r ^= 1;\r
+ SPUwriteRegister(reg, *r ^ 1, cycles);\r
+}\r
+\r
 ////////////////////////////////////////////////////////////////////////\r
 // SPUFREEZE: called by main emu on savestate load/save\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)\r
+long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,\r
+ uint32_t cycles)\r
 {\r
  int i;SPUOSSFreeze_t * pFO;\r
 \r
@@ -233,6 +242,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 \r
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye\r
                                                        // save mode:\r
+   do_samples(cycles);\r
+\r
    memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos\r
    memcpy(pF->cSPUPort,regArea,0x200);\r
 \r
@@ -276,26 +287,25 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 \r
  if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
    LoadStateV5(pF);\r
- else LoadStateUnknown(pF);\r
-\r
- lastch = -1;\r
+ else LoadStateUnknown(pF, cycles);\r
 \r
  // repair some globals\r
  for(i=0;i<=62;i+=2)\r
-  SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);\r
- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);\r
+  load_register(H_Reverb+i, cycles);\r
+ load_register(H_SPUReverbAddr, cycles);\r
+ load_register(H_SPUrvolL, cycles);\r
+ load_register(H_SPUrvolR, cycles);\r
 \r
- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));\r
- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);\r
- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);\r
- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);\r
+ load_register(H_SPUctrl, cycles);\r
+ load_register(H_SPUstat, cycles);\r
+ load_register(H_CDLeft, cycles);\r
+ load_register(H_CDRight, cycles);\r
 \r
  // fix to prevent new interpolations from crashing\r
  for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
 \r
  ClearWorkingState();\r
+ cycles_played = cycles;\r
 \r
  return 1;\r
 }\r
@@ -331,7 +341,7 @@ void LoadStateV5(SPUFreeze_t * pF)
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void LoadStateUnknown(SPUFreeze_t * pF)\r
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)\r
 {\r
  int i;\r
 \r
@@ -348,7 +358,7 @@ void LoadStateUnknown(SPUFreeze_t * pF)
 \r
  for(i=0;i<0xc0;i++)\r
   {\r
-   SPUwriteRegister(0x1f801c00+i*2,regArea[i]);\r
+   load_register(0x1f801c00 + i*2, cycles);\r
   }\r
 }\r
 \r