notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cdrom: change pause timing again
[pcsx_rearmed.git] / plugins / dfsound / freeze.c
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index d4898b4..36b8995 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -15,6 +15,7 @@
  *                                                                         *\r
  ***************************************************************************/\r
 \r
+#include <assert.h>\r
 #include "stdafx.h"\r
 \r
 #define _IN_FREEZE\r
@@ -106,7 +107,7 @@ typedef struct
  ADSRInfoEx_orig   ADSRX;                              // next ADSR settings (will be moved to active on sample start)\r
 } SPUCHAN_orig;\r
 \r
-typedef struct\r
+typedef struct SPUFreeze\r
 {\r
  char          szSPUName[8];\r
  uint32_t ulFreezeVersion;\r
@@ -129,6 +130,14 @@ typedef struct
 \r
  SPUCHAN_orig s_chan[MAXCHAN];   \r
 \r
+ uint32_t   cycles_dma_end;\r
+ uint32_t   decode_dirty_ch;\r
+ uint32_t   dwNoiseVal;\r
+ uint32_t   dwNoiseCount;\r
+ uint32_t   XARepeat;\r
+ uint32_t   XALastVal;\r
+ uint32_t   last_keyon_cycles;\r
+\r
 } SPUOSSFreeze_t;\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -145,7 +154,8 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->iSBPos = s->iSBPos;\r
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
- memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);\r
+ assert(sizeof(d->SB) >= sizeof(spu.sb[ch]));\r
+ memcpy(d->SB, &spu.sb[ch], sizeof(spu.sb[ch]));\r
  d->iStart = (regAreaGetCh(ch, 6) & ~1) << 3;\r
  d->iCurr = 0; // set by the caller\r
  d->iLoop = 0; // set by the caller\r
@@ -159,8 +169,8 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->bIgnoreLoop = (s->prevflags ^ 2) << 1;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
- d->s_1 = spu.SB[ch * SB_SIZE + 27]; // yes it's reversed\r
- d->s_2 = spu.SB[ch * SB_SIZE + 26];\r
+ d->s_1 = spu.sb[ch].SB[27]; // yes it's reversed\r
+ d->s_2 = spu.sb[ch].SB[26];\r
  d->bRVBActive = s->bRVBActive;\r
  d->bNoise = s->bNoise;\r
  d->bFMod = s->bFMod;\r
@@ -187,7 +197,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
  d->sinc_inv = 0;\r
- memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);\r
+ memcpy(&spu.sb[ch], s->SB, sizeof(spu.sb[ch]));\r
  d->pCurr = (void *)((uintptr_t)s->iCurr & 0x7fff0);\r
  d->pLoop = (void *)((uintptr_t)s->iLoop & 0x7fff0);\r
  d->bReverb = s->bReverb;\r
@@ -226,8 +236,8 @@ static void load_register(unsigned long reg, unsigned int cycles)
 // SPUFREEZE: called by main emu on savestate load/save\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,\r
- uint32_t cycles)\r
+long CALLBACK SPUfreeze(unsigned int ulFreezeMode, SPUFreeze_t * pF,\r
+ unsigned int cycles)\r
 {\r
  SPUOSSFreeze_t * pFO = NULL;\r
  int i;\r
@@ -248,6 +258,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 \r
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye\r
                                                        // save mode:\r
+   regAreaGet(H_SPUctrl) = spu.spuCtrl;\r
+   regAreaGet(H_SPUstat) = spu.spuStat;\r
    memcpy(pF->cSPURam,spu.spuMem,0x80000);             // copy common infos\r
    memcpy(pF->cSPUPort,spu.regArea,0x200);\r
 \r
@@ -291,6 +303,13 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
    pFO->xa_left = xa_left;\r
    pFO->cdda_left = cdda_left;\r
    pFO->cycles_played = spu.cycles_played;\r
+   pFO->cycles_dma_end = spu.cycles_dma_end;\r
+   pFO->decode_dirty_ch = spu.decode_dirty_ch;\r
+   pFO->dwNoiseVal = spu.dwNoiseVal;\r
+   pFO->dwNoiseCount = spu.dwNoiseCount;\r
+   pFO->XARepeat = spu.XARepeat;\r
+   pFO->XALastVal = spu.XALastVal;\r
+   pFO->last_keyon_cycles = spu.last_keyon_cycles;\r
 \r
    for(i=0;i<MAXCHAN;i++)\r
     {\r
@@ -310,6 +329,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  memcpy(spu.spuMem,pF->cSPURam,0x80000);               // get ram\r
  memcpy(spu.regArea,pF->cSPUPort,0x200);\r
  spu.bMemDirty = 1;\r
+ spu.spuCtrl = regAreaGet(H_SPUctrl);\r
+ spu.spuStat = regAreaGet(H_SPUstat);\r
 \r
  if (!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
    pFO = LoadStateV5(pF, cycles);\r
@@ -317,6 +338,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 \r
  spu.XAPlay = spu.XAFeed = spu.XAStart;\r
  spu.CDDAPlay = spu.CDDAFeed = spu.CDDAStart;\r
+ spu.cdClearSamples = 512;\r
  if (pFO && pFO->xa_left && pF->xaS.nsamples) {        // start xa again\r
   FeedXA(&pF->xaS);\r
   spu.XAPlay = spu.XAFeed - pFO->xa_left;\r
@@ -327,20 +349,39 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
   FeedCDDA((void *)pF->xaS.pcm, pFO->cdda_left * 4);\r
  }\r
 \r
+ // not in old savestates\r
+ spu.cycles_dma_end = 0;\r
+ spu.decode_dirty_ch = spu.dwChannelsAudible & 0x0a;\r
+ spu.dwNoiseVal = 0;\r
+ spu.dwNoiseCount = 0;\r
+ spu.XARepeat = 0;\r
+ spu.XALastVal = 0;\r
+ spu.last_keyon_cycles = cycles - 16*786u;\r
+ if (pFO && pF->ulFreezeSize >= sizeof(*pF) + sizeof(*pFO)) {\r
+  spu.cycles_dma_end = pFO->cycles_dma_end;\r
+  spu.decode_dirty_ch = pFO->decode_dirty_ch;\r
+  spu.dwNoiseVal = pFO->dwNoiseVal;\r
+  spu.dwNoiseCount = pFO->dwNoiseCount;\r
+  spu.XARepeat = pFO->XARepeat;\r
+  spu.XALastVal = pFO->XALastVal;\r
+  spu.last_keyon_cycles = pFO->last_keyon_cycles;\r
+ }\r
+\r
  // repair some globals\r
  for(i=0;i<=62;i+=2)\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
- 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
+ // reverb\r
+ spu.rvb->StartAddr = regAreaGet(H_SPUReverbAddr) << 2;\r
+ if (spu.rvb->CurrAddr < spu.rvb->StartAddr)\r
+  spu.rvb->CurrAddr = spu.rvb->StartAddr;\r
  // fix to prevent new interpolations from crashing\r
- for(i=0;i<MAXCHAN;i++) spu.SB[i * SB_SIZE + 28]=0;\r
+ spu.interpolation = -1;\r
 \r
  ClearWorkingState();\r
 \r
@@ -379,6 +420,7 @@ static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles)
    spu.s_chan[i].pCurr+=(uintptr_t)spu.spuMemC;\r
    spu.s_chan[i].pLoop+=(uintptr_t)spu.spuMemC;\r
   }\r
+\r
  return pFO;\r
 }\r
 \r
ARM optimized PCSX fork