notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
spu: fix saving bug
[pcsx_rearmed.git] / plugins / dfsound / freeze.c
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index cb0d75e..0601bf5 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -22,12 +22,29 @@
 #include "externals.h"\r
 #include "registers.h"\r
 #include "spu.h"\r
-#include "regs.h"\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 // freeze structs\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
+typedef struct\r
+{\r
+ int            AttackModeExp;\r
+ int            AttackTime;\r
+ int            DecayTime;\r
+ int            SustainLevel;\r
+ int            SustainModeExp;\r
+ int            SustainModeDec;\r
+ int            SustainTime;\r
+ int            ReleaseModeExp;\r
+ unsigned int   ReleaseVal;\r
+ int            ReleaseTime;\r
+ int            ReleaseStartTime; \r
+ int            ReleaseVol; \r
+ int            lTime;\r
+ int            lVolume;\r
+} ADSRInfo;\r
+\r
 typedef struct\r
 {\r
  int            State;\r
@@ -41,9 +58,9 @@ typedef struct
  int            ReleaseModeExp;\r
  int            ReleaseRate;\r
  int            EnvelopeVol;\r
- long           lVolume;\r
- long           lDummy1;\r
- long           lDummy2;\r
+ int            lVolume;\r
+ int            lDummy1;\r
+ int            lDummy2;\r
 } ADSRInfoEx_orig;\r
 \r
 typedef struct\r
@@ -59,9 +76,9 @@ typedef struct
  int               SB[32+32];                          // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)\r
  int               sval;\r
 \r
- unsigned char *   pStart;                             // start ptr into sound mem\r
- unsigned char *   pCurr;                              // current pos in sound mem\r
- unsigned char *   pLoop;                              // loop ptr in sound mem\r
+ int               iStart;                             // start ptr into sound mem\r
+ int               iCurr;                              // current pos in sound mem\r
+ int               iLoop;                              // loop ptr in sound mem\r
 \r
  int               bOn;                                // is channel active (sample playing?)\r
  int               bStop;                              // is channel stopped (sample _can_ still be playing, ADSR Release phase)\r
@@ -121,7 +138,7 @@ extern int lastch;
 \r
 // we want to retain compatibility between versions,\r
 // so use original channel struct\r
-static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)\r
+static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)\r
 {\r
  memset(d, 0, sizeof(*d));\r
  d->bNew = !!(dwNewChannel & (1<<ch));\r
@@ -129,27 +146,24 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
  memcpy(d->SB, s->SB, sizeof(d->SB));\r
- d->pStart = s->pStart;\r
- d->pCurr = s->pCurr;\r
- d->pLoop = s->pLoop;\r
+ d->iStart = (regAreaGet(ch,6)&~1)<<3;\r
+ d->iCurr = 0; // set by the caller\r
+ d->iLoop = 0; // set by the caller\r
  d->bOn = !!(dwChannelOn & (1<<ch));\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
- d->iActFreq = s->iActFreq;\r
- d->iUsedFreq = s->iUsedFreq;\r
+ d->iActFreq = 1;\r
+ d->iUsedFreq = 2;\r
  d->iLeftVolume = s->iLeftVolume;\r
- d->bIgnoreLoop = s->bIgnoreLoop;\r
+ // this one is nasty but safe, save compat is important\r
+ d->bIgnoreLoop = (s->prevflags ^ 2) << 1;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
- d->s_1 = s->s_1;\r
- d->s_2 = s->s_2;\r
+ d->s_1 = s->SB[27]; // yes it's reversed\r
+ d->s_2 = s->SB[26];\r
  d->bRVBActive = s->bRVBActive;\r
- d->iRVBOffset = s->iRVBOffset;\r
- d->iRVBRepeat = s->iRVBRepeat;\r
  d->bNoise = s->bNoise;\r
  d->bFMod = s->bFMod;\r
- d->iRVBNum = s->iRVBNum;\r
- d->iOldNoise = s->iOldNoise;\r
  d->ADSRX.State = s->ADSRX.State;\r
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
@@ -164,7 +178,7 @@ static void save_channel(SPUCHAN_orig *d, SPUCHAN *s, int ch)
  d->ADSRX.lVolume = d->bOn; // hmh\r
 }\r
 \r
-static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)\r
+static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)\r
 {\r
  memset(d, 0, sizeof(*d));\r
  if (s->bNew) dwNewChannel |= 1<<ch;\r
@@ -172,27 +186,17 @@ static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
  d->spos = s->spos;\r
  d->sinc = s->sinc;\r
  memcpy(d->SB, s->SB, sizeof(d->SB));\r
- d->pStart = s->pStart;\r
- d->pCurr = s->pCurr;\r
- d->pLoop = s->pLoop;\r
- if (s->bOn) dwChannelOn |= 1<<ch;\r
+ d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
+ d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
- d->iActFreq = s->iActFreq;\r
- d->iUsedFreq = s->iUsedFreq;\r
  d->iLeftVolume = s->iLeftVolume;\r
- d->bIgnoreLoop = s->bIgnoreLoop;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
- d->s_1 = s->s_1;\r
- d->s_2 = s->s_2;\r
  d->bRVBActive = s->bRVBActive;\r
- d->iRVBOffset = s->iRVBOffset;\r
- d->iRVBRepeat = s->iRVBRepeat;\r
  d->bNoise = s->bNoise;\r
  d->bFMod = s->bFMod;\r
- d->iRVBNum = s->iRVBNum;\r
- d->iOldNoise = s->iOldNoise;\r
+ d->prevflags = (s->bIgnoreLoop >> 1) ^ 2;\r
  d->ADSRX.State = s->ADSRX.State;\r
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
@@ -204,6 +208,8 @@ static void load_channel(SPUCHAN *d, SPUCHAN_orig *s, int ch)
  d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
  d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
  d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
+ if (s->bOn) dwChannelOn |= 1<<ch;\r
+ else d->ADSRX.EnvelopeVol = 0;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -227,8 +233,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 \r
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye\r
                                                        // save mode:\r
-   RemoveTimer();                                      // stop timer\r
-\r
    memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos\r
    memcpy(pF->cSPUPort,regArea,0x200);\r
 \r
@@ -250,24 +254,18 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
    for(i=0;i<MAXCHAN;i++)\r
     {\r
      save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
-     if(pFO->s_chan[i].pStart)\r
-      pFO->s_chan[i].pStart-=(unsigned long)spuMemC;\r
-     if(pFO->s_chan[i].pCurr)\r
-      pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;\r
-     if(pFO->s_chan[i].pLoop)\r
-      pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;\r
+     if(s_chan[i].pCurr)\r
+      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r
+     if(s_chan[i].pLoop)\r
+      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;\r
     }\r
 \r
-   SetupTimer();                                       // sound processing on again\r
-\r
    return 1;\r
    //--------------------------------------------------//\r
   }\r
                                                        \r
  if(ulFreezeMode!=0) return 0;                         // bad mode? bye\r
 \r
- RemoveTimer();                                        // we stop processing while doing the save!\r
-\r
  memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram\r
  memcpy(regArea,pF->cSPUPort,0x200);\r
 \r
@@ -297,7 +295,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
  // fix to prevent new interpolations from crashing\r
  for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
 \r
- SetupTimer();                                         // start sound processing again\r
+ ClearWorkingState();\r
 \r
  return 1;\r
 }\r
@@ -311,7 +309,7 @@ void LoadStateV5(SPUFreeze_t * pF)
  pFO=(SPUOSSFreeze_t *)(pF+1);\r
 \r
  spuIrq = pFO->spuIrq;\r
- if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;\r
+ if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;\r
 \r
  if(pFO->spuAddr)\r
   {\r
@@ -321,11 +319,11 @@ void LoadStateV5(SPUFreeze_t * pF)
 \r
  dwNewChannel=0;\r
  dwChannelOn=0;\r
+ dwChannelDead=0;\r
  for(i=0;i<MAXCHAN;i++)\r
   {\r
    load_channel(&s_chan[i],&pFO->s_chan[i],i);\r
 \r
-   s_chan[i].pStart+=(unsigned long)spuMemC;\r
    s_chan[i].pCurr+=(unsigned long)spuMemC;\r
    s_chan[i].pLoop+=(unsigned long)spuMemC;\r
   }\r
@@ -341,12 +339,11 @@ void LoadStateUnknown(SPUFreeze_t * pF)
   {\r
    s_chan[i].bStop=0;\r
    s_chan[i].pLoop=spuMemC;\r
-   s_chan[i].pStart=spuMemC;\r
-   s_chan[i].pLoop=spuMemC;\r
   }\r
 \r
  dwNewChannel=0;\r
  dwChannelOn=0;\r
+ dwChannelDead=0;\r
  pSpuIrq=0;\r
 \r
  for(i=0;i<0xc0;i++)\r
ARM optimized PCSX fork