X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=36b8995923829ee677865cdd7b3e1fbe57d3406a;hb=HEAD;hp=58a8347674c059921f86e5f9fedcb82ab6f843ea;hpb=8e1040b6a82ee1802fda83d4de84290a02656cc0;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 58a83476..36b89959 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <assert.h>
 #include "stdafx.h"
 
 #define _IN_FREEZE
@@ -27,6 +28,24 @@
 // freeze structs
 ////////////////////////////////////////////////////////////////////////
 
+typedef struct
+{
+ int            AttackModeExp;
+ int            AttackTime;
+ int            DecayTime;
+ int            SustainLevel;
+ int            SustainModeExp;
+ int            SustainModeDec;
+ int            SustainTime;
+ int            ReleaseModeExp;
+ unsigned int   ReleaseVal;
+ int            ReleaseTime;
+ int            ReleaseStartTime; 
+ int            ReleaseVol; 
+ int            lTime;
+ int            lVolume;
+} ADSRInfo;
+
 typedef struct
 {
  int            State;
@@ -40,9 +59,9 @@ typedef struct
  int            ReleaseModeExp;
  int            ReleaseRate;
  int            EnvelopeVol;
- long           lVolume;
- long           lDummy1;
- long           lDummy2;
+ int            lVolume;
+ int            lDummy1;
+ int            lDummy2;
 } ADSRInfoEx_orig;
 
 typedef struct
@@ -88,7 +107,7 @@ typedef struct
  ADSRInfoEx_orig   ADSRX;                              // next ADSR settings (will be moved to active on sample start)
 } SPUCHAN_orig;
 
-typedef struct
+typedef struct SPUFreeze
 {
  char          szSPUName[8];
  uint32_t ulFreezeVersion;
@@ -101,38 +120,47 @@ typedef struct
 typedef struct
 {
  unsigned short  spuIrq;
+ unsigned short  decode_pos;
  uint32_t   pSpuIrq;
  uint32_t   spuAddr;
- uint32_t   dummy1;
- uint32_t   dummy2;
- uint32_t   dummy3;
+ uint32_t   rvb_cur;
+ uint16_t   xa_left;
+ uint16_t   cdda_left;
+ uint32_t   cycles_played;
 
  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;
 
 ////////////////////////////////////////////////////////////////////////
 
-void LoadStateV5(SPUFreeze_t * pF);                    // newest version
-void LoadStateUnknown(SPUFreeze_t * pF);               // unknown format
-
-extern int lastch;
+static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles);
+static void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format
 
 // we want to retain compatibility between versions,
 // so use original channel struct
 static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
 {
  memset(d, 0, sizeof(*d));
- d->bNew = !!(dwNewChannel & (1<<ch));
+ d->bNew = !!(spu.dwNewChannel & (1<<ch));
  d->iSBPos = s->iSBPos;
  d->spos = s->spos;
  d->sinc = s->sinc;
- memcpy(d->SB, s->SB, sizeof(d->SB));
- d->iStart = (regAreaGet(ch,6)&~1)<<3;
+ 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
- d->bOn = !!(dwChannelOn & (1<<ch));
- d->bStop = s->bStop;
+ d->bOn = !!(spu.dwChannelsAudible & (1<<ch));
+ d->bStop = s->ADSRX.State == ADSR_RELEASE;
  d->bReverb = s->bReverb;
  d->iActFreq = 1;
  d->iUsedFreq = 2;
@@ -141,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 = s->SB[27]; // yes it's reversed
- d->s_2 = s->SB[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;
@@ -163,15 +191,15 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
 static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
 {
  memset(d, 0, sizeof(*d));
- if (s->bNew) dwNewChannel |= 1<<ch;
+ if (s->bNew) spu.dwNewChannel |= 1<<ch;
  d->iSBPos = s->iSBPos;
+ if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;
  d->spos = s->spos;
  d->sinc = s->sinc;
- memcpy(d->SB, s->SB, sizeof(d->SB));
- d->pCurr = (void *)((long)s->iCurr & 0x7fff0);
- d->pLoop = (void *)((long)s->iLoop & 0x7fff0);
- if (s->bOn) dwChannelOn |= 1<<ch;
- d->bStop = s->bStop;
+ d->sinc_inv = 0;
+ 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;
  d->iLeftVolume = s->iLeftVolume;
  d->iRightVolume = s->iRightVolume;
@@ -181,6 +209,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->bFMod = s->bFMod;
  d->prevflags = (s->bIgnoreLoop >> 1) ^ 2;
  d->ADSRX.State = s->ADSRX.State;
+ if (s->bStop) d->ADSRX.State = ADSR_RELEASE;
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;
  d->ADSRX.DecayRate = s->ADSRX.DecayRate;
@@ -191,20 +220,35 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
  d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
  d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
+ if (s->bOn) spu.dwChannelsAudible |= 1<<ch;
+ else d->ADSRX.EnvelopeVol = 0;
+}
+
+// force load from regArea to variables
+static void load_register(unsigned long reg, unsigned int cycles)
+{
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];
+ *r ^= 1;
+ SPUwriteRegister(reg, *r ^ 1, cycles);
 }
 
 ////////////////////////////////////////////////////////////////////////
 // SPUFREEZE: called by main emu on savestate load/save
 ////////////////////////////////////////////////////////////////////////
 
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
+long CALLBACK SPUfreeze(unsigned int ulFreezeMode, SPUFreeze_t * pF,
+ unsigned int cycles)
 {
- int i;SPUOSSFreeze_t * pFO;
+ SPUOSSFreeze_t * pFO = NULL;
+ int i;
 
  if(!pF) return 0;                                     // first check
 
  if(ulFreezeMode)                                      // info or save?
   {//--------------------------------------------------//
+   int xa_left = 0, cdda_left = 0;
+   do_samples(cycles, 1);
+
    if(ulFreezeMode==1)                                 
     memset(pF,0,sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t));
 
@@ -214,34 +258,66 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye
                                                        // save mode:
-   memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos
-   memcpy(pF->cSPUPort,regArea,0x200);
+   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);
 
-   if(xapGlobal && XAPlay!=XAFeed)                     // some xa
+   if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed)         // some xa
     {
-     pF->xaS=*xapGlobal;     
+     xa_left = spu.XAFeed - spu.XAPlay;
+     if (xa_left < 0)
+      xa_left = spu.XAEnd - spu.XAPlay + spu.XAFeed - spu.XAStart;
+     pF->xaS = *spu.xapGlobal;
     }
-   else 
-   memset(&pF->xaS,0,sizeof(xa_decode_t));             // or clean xa
+   else if (spu.CDDAPlay != spu.CDDAFeed)
+    {
+     // abuse the xa struct to store leftover cdda samples
+     unsigned int *p = spu.CDDAPlay;
+     cdda_left = spu.CDDAFeed - spu.CDDAPlay;
+     if (cdda_left < 0)
+      cdda_left = spu.CDDAEnd - spu.CDDAPlay + spu.CDDAFeed - spu.CDDAStart;
+     if (cdda_left > sizeof(pF->xaS.pcm) / 4)
+      cdda_left = sizeof(pF->xaS.pcm) / 4;
+     if (p + cdda_left <= spu.CDDAEnd)
+      memcpy(pF->xaS.pcm, p, cdda_left * 4);
+     else {
+      memcpy(pF->xaS.pcm, p, (spu.CDDAEnd - p) * 4);
+      memcpy((char *)pF->xaS.pcm + (spu.CDDAEnd - p) * 4, spu.CDDAStart,
+             (cdda_left - (spu.CDDAEnd - p)) * 4);
+     }
+     pF->xaS.nsamples = 0;
+    }
+   else
+    memset(&pF->xaS,0,sizeof(xa_decode_t));            // or clean xa
 
    pFO=(SPUOSSFreeze_t *)(pF+1);                       // store special stuff
 
-   pFO->spuIrq=spuIrq;
-   if(pSpuIrq)  pFO->pSpuIrq  = (unsigned long)pSpuIrq-(unsigned long)spuMemC;
+   pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];
+   if(spu.pSpuIrq) pFO->pSpuIrq = spu.pSpuIrq - spu.spuMemC;
 
-   pFO->spuAddr=spuAddr;
+   pFO->spuAddr=spu.spuAddr;
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
+   pFO->decode_pos = spu.decode_pos;
+   pFO->rvb_cur = spu.rvb->CurrAddr;
+   pFO->xa_left = xa_left;
+   pFO->cdda_left = cdda_left;
+   pFO->cycles_played = spu.cycles_played;
+   pFO->cycles_dma_end = spu.cycles_dma_end;
+   pFO->decode_dirty_ch = spu.decode_dirty_ch;
+   pFO->dwNoiseVal = spu.dwNoiseVal;
+   pFO->dwNoiseCount = spu.dwNoiseCount;
+   pFO->XARepeat = spu.XARepeat;
+   pFO->XALastVal = spu.XALastVal;
+   pFO->last_keyon_cycles = spu.last_keyon_cycles;
 
    for(i=0;i<MAXCHAN;i++)
     {
-     if(!(s_chan[i].prevflags&2))
-      dwChannelOn&=~(1<<i);
-
-     save_channel(&pFO->s_chan[i],&s_chan[i],i);
-     if(s_chan[i].pCurr)
-      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;
-     if(s_chan[i].pLoop)
-      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;
+     save_channel(&pFO->s_chan[i],&spu.s_chan[i],i);
+     if(spu.s_chan[i].pCurr)
+      pFO->s_chan[i].iCurr=spu.s_chan[i].pCurr-spu.spuMemC;
+     if(spu.s_chan[i].pLoop)
+      pFO->s_chan[i].iLoop=spu.s_chan[i].pLoop-spu.spuMemC;
     }
 
    return 1;
@@ -250,90 +326,126 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
                                                        
  if(ulFreezeMode!=0) return 0;                         // bad mode? bye
 
- memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram
- memcpy(regArea,pF->cSPUPort,0x200);
-
- if(pF->xaS.nsamples<=4032)                            // start xa again
-  SPUplayADPCMchannel(&pF->xaS);
-
- xapGlobal=0;
-
- if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
-   LoadStateV5(pF);
- else LoadStateUnknown(pF);
-
- lastch = -1;
+ 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);
+ else LoadStateUnknown(pF, cycles);
+
+ spu.XAPlay = spu.XAFeed = spu.XAStart;
+ spu.CDDAPlay = spu.CDDAFeed = spu.CDDAStart;
+ spu.cdClearSamples = 512;
+ if (pFO && pFO->xa_left && pF->xaS.nsamples) {        // start xa again
+  FeedXA(&pF->xaS);
+  spu.XAPlay = spu.XAFeed - pFO->xa_left;
+  if (spu.XAPlay < spu.XAStart)
+   spu.XAPlay = spu.XAStart;
+ }
+ else if (pFO && pFO->cdda_left) {                     // start cdda again
+  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)
-  SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);
- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);
- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);
- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);
-
- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));
- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);
- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);
- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);
-
+  load_register(H_Reverb+i, cycles);
+ load_register(H_SPUReverbAddr, cycles);
+ load_register(H_SPUrvolL, cycles);
+ load_register(H_SPUrvolR, 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++) s_chan[i].SB[28]=0;
+ spu.interpolation = -1;
 
  ClearWorkingState();
 
+ if (spu.spuCtrl & CTRL_IRQ)
+  schedule_next_irq();
+
  return 1;
 }
 
 ////////////////////////////////////////////////////////////////////////
 
-void LoadStateV5(SPUFreeze_t * pF)
+static SPUOSSFreeze_t * LoadStateV5(SPUFreeze_t * pF, uint32_t cycles)
 {
  int i;SPUOSSFreeze_t * pFO;
 
  pFO=(SPUOSSFreeze_t *)(pF+1);
 
- spuIrq = pFO->spuIrq;
- if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;
+ spu.pSpuIrq = spu.spuMemC + ((spu.regArea[(H_SPUirqAddr - 0x0c00) / 2] << 3) & ~0xf);
 
  if(pFO->spuAddr)
   {
-   spuAddr = pFO->spuAddr;
-   if (spuAddr == 0xbaadf00d) spuAddr = 0;
+   if (pFO->spuAddr == 0xbaadf00d) spu.spuAddr = 0;
+   else spu.spuAddr = pFO->spuAddr & 0x7fffe;
   }
+ spu.decode_pos = pFO->decode_pos & 0x1ff;
+ spu.rvb->CurrAddr = pFO->rvb_cur;
+ spu.cycles_played = pFO->cycles_played ? pFO->cycles_played : cycles;
 
- dwNewChannel=0;
- dwChannelOn=0;
- dwChannelDead=0;
+ spu.dwNewChannel=0;
+ spu.dwChannelsAudible=0;
+ spu.dwChannelDead=0;
  for(i=0;i<MAXCHAN;i++)
   {
-   load_channel(&s_chan[i],&pFO->s_chan[i],i);
+   load_channel(&spu.s_chan[i],&pFO->s_chan[i],i);
 
-   s_chan[i].pCurr+=(unsigned long)spuMemC;
-   s_chan[i].pLoop+=(unsigned long)spuMemC;
+   spu.s_chan[i].pCurr+=(uintptr_t)spu.spuMemC;
+   spu.s_chan[i].pLoop+=(uintptr_t)spu.spuMemC;
   }
+
+ return pFO;
 }
 
 ////////////////////////////////////////////////////////////////////////
 
-void LoadStateUnknown(SPUFreeze_t * pF)
+static void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
 {
  int i;
 
  for(i=0;i<MAXCHAN;i++)
   {
-   s_chan[i].bStop=0;
-   s_chan[i].pLoop=spuMemC;
+   spu.s_chan[i].pLoop=spu.spuMemC;
   }
 
- dwNewChannel=0;
- dwChannelOn=0;
- dwChannelDead=0;
- pSpuIrq=0;
+ spu.dwNewChannel=0;
+ spu.dwChannelsAudible=0;
+ spu.dwChannelDead=0;
+ spu.pSpuIrq=spu.spuMemC;
+ spu.cycles_played = cycles;
 
  for(i=0;i<0xc0;i++)
   {
-   SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
+   load_register(0x1f801c00 + i*2, cycles);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////
+// vim:shiftwidth=1:expandtab