X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=32c07dbde67d28702ef86f91b76a01d534886148;hb=20ed712f92d53fa7d51a4b805af997f5770077ae;hp=d4898b46a2bb48f03e3310f77c13aef6c014c37e;hpb=b34d6a805a50ee4a897b0a53bbc0b89e3eb7f72e;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index d4898b46..32c07dbd 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <assert.h>
 #include "stdafx.h"
 
 #define _IN_FREEZE
@@ -129,6 +130,14 @@ typedef struct
 
  SPUCHAN_orig s_chan[MAXCHAN];   
 
+ uint32_t   cycles_dma_end;
+ uint32_t   decode_dirty_ch;
+ uint32_t   dwNoiseVal;
+ uint32_t   dwNoiseCount;
+ uint32_t   XARepeat;
+ uint32_t   XALastVal;
+ uint32_t   last_keyon_cycles;
+
 } SPUOSSFreeze_t;
 
 ////////////////////////////////////////////////////////////////////////
@@ -145,7 +154,8 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->iSBPos = s->iSBPos;
  d->spos = s->spos;
  d->sinc = s->sinc;
- memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);
+ assert(sizeof(d->SB) >= sizeof(spu.sb[ch]));
+ memcpy(d->SB, &spu.sb[ch], sizeof(spu.sb[ch]));
  d->iStart = (regAreaGetCh(ch, 6) & ~1) << 3;
  d->iCurr = 0; // set by the caller
  d->iLoop = 0; // set by the caller
@@ -159,8 +169,8 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->bIgnoreLoop = (s->prevflags ^ 2) << 1;
  d->iRightVolume = s->iRightVolume;
  d->iRawPitch = s->iRawPitch;
- d->s_1 = spu.SB[ch * SB_SIZE + 27]; // yes it's reversed
- d->s_2 = spu.SB[ch * SB_SIZE + 26];
+ d->s_1 = spu.sb[ch].SB[27]; // yes it's reversed
+ d->s_2 = spu.sb[ch].SB[26];
  d->bRVBActive = s->bRVBActive;
  d->bNoise = s->bNoise;
  d->bFMod = s->bFMod;
@@ -187,7 +197,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->spos = s->spos;
  d->sinc = s->sinc;
  d->sinc_inv = 0;
- memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);
+ memcpy(&spu.sb[ch], s->SB, sizeof(spu.sb[ch]));
  d->pCurr = (void *)((uintptr_t)s->iCurr & 0x7fff0);
  d->pLoop = (void *)((uintptr_t)s->iLoop & 0x7fff0);
  d->bReverb = s->bReverb;
@@ -248,6 +258,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye
                                                        // save mode:
+   regAreaGet(H_SPUctrl) = spu.spuCtrl;
+   regAreaGet(H_SPUstat) = spu.spuStat;
    memcpy(pF->cSPURam,spu.spuMem,0x80000);             // copy common infos
    memcpy(pF->cSPUPort,spu.regArea,0x200);
 
@@ -310,6 +322,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  memcpy(spu.spuMem,pF->cSPURam,0x80000);               // get ram
  memcpy(spu.regArea,pF->cSPUPort,0x200);
  spu.bMemDirty = 1;
+ spu.spuCtrl = regAreaGet(H_SPUctrl);
+ spu.spuStat = regAreaGet(H_SPUstat);
 
  if (!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
    pFO = LoadStateV5(pF, cycles);
@@ -327,20 +341,39 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
   FeedCDDA((void *)pF->xaS.pcm, pFO->cdda_left * 4);
  }
 
+ // not in old savestates
+ spu.cycles_dma_end = 0;
+ spu.decode_dirty_ch = spu.dwChannelsAudible & 0x0a;
+ spu.dwNoiseVal = 0;
+ spu.dwNoiseCount = 0;
+ spu.XARepeat = 0;
+ spu.XALastVal = 0;
+ spu.last_keyon_cycles = cycles - 16*786u;
+ if (pFO && pF->ulFreezeSize >= sizeof(*pF) + sizeof(*pFO)) {
+  spu.cycles_dma_end = pFO->cycles_dma_end;
+  spu.decode_dirty_ch = pFO->decode_dirty_ch;
+  spu.dwNoiseVal = pFO->dwNoiseVal;
+  spu.dwNoiseCount = pFO->dwNoiseCount;
+  spu.XARepeat = pFO->XARepeat;
+  spu.XALastVal = pFO->XALastVal;
+  spu.last_keyon_cycles = pFO->last_keyon_cycles;
+ }
+
  // repair some globals
  for(i=0;i<=62;i+=2)
   load_register(H_Reverb+i, cycles);
  load_register(H_SPUReverbAddr, cycles);
  load_register(H_SPUrvolL, cycles);
  load_register(H_SPUrvolR, cycles);
-
- load_register(H_SPUctrl, cycles);
- load_register(H_SPUstat, cycles);
  load_register(H_CDLeft, cycles);
  load_register(H_CDRight, cycles);
 
+ // reverb
+ spu.rvb->StartAddr = regAreaGet(H_SPUReverbAddr) << 2;
+ if (spu.rvb->CurrAddr < spu.rvb->StartAddr)
+  spu.rvb->CurrAddr = spu.rvb->StartAddr;
  // fix to prevent new interpolations from crashing
- for(i=0;i<MAXCHAN;i++) spu.SB[i * SB_SIZE + 28]=0;
+ spu.interpolation = -1;
 
  ClearWorkingState();
 
@@ -379,6 +412,7 @@ static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles)
    spu.s_chan[i].pCurr+=(uintptr_t)spu.spuMemC;
    spu.s_chan[i].pLoop+=(uintptr_t)spu.spuMemC;
   }
+
  return pFO;
 }