{\r
const unsigned long lval=val;\r
//---------------------------------------------//\r
- s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; \r
- s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;\r
- s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;\r
- s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;\r
+ spu.s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0;\r
+ spu.s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;\r
+ spu.s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;\r
+ spu.s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;\r
//---------------------------------------------//\r
}\r
break;\r
const unsigned long lval=val;\r
\r
//----------------------------------------------//\r
- s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;\r
- s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;\r
- s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;\r
- s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;\r
- s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;\r
+ spu.s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;\r
+ spu.s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;\r
+ spu.s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;\r
+ spu.s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;\r
+ spu.s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;\r
//----------------------------------------------//\r
}\r
break;\r
break;\r
//------------------------------------------------//\r
case 14: // loop?\r
- s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);\r
+ spu.s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);\r
goto upd_irq;\r
//------------------------------------------------//\r
}\r
break;\r
//-------------------------------------------------//\r
case H_SPUdata:\r
- spu.spuMem[spu.spuAddr>>1] = val;\r
- spu.spuAddr+=2;\r
- if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
+ *(unsigned short *)(spu.spuMemC + spu.spuAddr) = val;\r
+ spu.spuAddr += 2;\r
+ spu.spuAddr &= 0x7fffe;\r
break;\r
//-------------------------------------------------//\r
case H_SPUctrl:\r
const int ch=(r>>4)-0xc0;\r
if(spu.dwNewChannel&(1<<ch)) return 1; // we are started, but not processed? return 1\r
if((spu.dwChannelOn&(1<<ch)) && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well\r
- !s_chan[ch].ADSRX.EnvelopeVol)\r
+ !spu.s_chan[ch].ADSRX.EnvelopeVol)\r
return 1;\r
- return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);\r
+ return (unsigned short)(spu.s_chan[ch].ADSRX.EnvelopeVol>>16);\r
}\r
\r
case 14: // get loop address\r
{\r
const int ch=(r>>4)-0xc0;\r
- return (unsigned short)((s_chan[ch].pLoop-spu.spuMemC)>>3);\r
+ return (unsigned short)((spu.s_chan[ch].pLoop-spu.spuMemC)>>3);\r
}\r
}\r
}\r
\r
case H_SPUdata:\r
{\r
- unsigned short s=spu.spuMem[spu.spuAddr>>1];\r
- spu.spuAddr+=2;\r
- if(spu.spuAddr>0x7ffff) spu.spuAddr=0;\r
+ unsigned short s = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
+ spu.spuAddr += 2;\r
+ spu.spuAddr &= 0x7fffe;\r
return s;\r
}\r
\r
{\r
if((val&1) && regAreaGet(ch,6)) // mmm... start has to be set before key on !?!\r
{\r
- s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
- s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
+ spu.s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
+ spu.s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
spu.dwNewChannel|=(1<<ch);\r
}\r
}\r
{\r
if(val&1)\r
{\r
- s_chan[ch].ADSRX.State = ADSR_RELEASE;\r
+ spu.s_chan[ch].ADSRX.State = ADSR_RELEASE;\r
\r
// Jungle Book - Rhythm 'n Groove\r
// - turns off buzzing sound (loop hangs)\r
{\r
if(ch>0) \r
{\r
- s_chan[ch].bFMod=1; // --> sound channel\r
- s_chan[ch-1].bFMod=2; // --> freq channel\r
+ spu.s_chan[ch].bFMod=1; // --> sound channel\r
+ spu.s_chan[ch-1].bFMod=2; // --> freq channel\r
}\r
}\r
else\r
{\r
- s_chan[ch].bFMod=0; // --> turn off fmod\r
- if(ch>0&&s_chan[ch-1].bFMod==2)\r
- s_chan[ch-1].bFMod=0;\r
+ spu.s_chan[ch].bFMod=0; // --> turn off fmod\r
+ if(ch>0&&spu.s_chan[ch-1].bFMod==2)\r
+ spu.s_chan[ch-1].bFMod=0;\r
}\r
}\r
}\r
\r
for(ch=start;ch<end;ch++,val>>=1) // loop channels\r
{\r
- s_chan[ch].bNoise=val&1; // -> noise on/off\r
+ spu.s_chan[ch].bNoise=val&1; // -> noise on/off\r
}\r
}\r
\r
}\r
\r
vol&=0x3fff;\r
- s_chan[ch].iLeftVolume=vol; // store volume\r
+ spu.s_chan[ch].iLeftVolume=vol; // store volume\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
vol&=0x3fff;\r
\r
- s_chan[ch].iRightVolume=vol;\r
+ spu.s_chan[ch].iRightVolume=vol;\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
if(val>0x3fff) NP=0x3fff; // get pitch val\r
else NP=val;\r
\r
- s_chan[ch].iRawPitch=NP;\r
- s_chan[ch].sinc=(NP<<4)|8;\r
- s_chan[ch].sinc_inv=0;\r
- if(spu_config.iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag\r
+ spu.s_chan[ch].iRawPitch=NP;\r
+ spu.s_chan[ch].sinc=(NP<<4)|8;\r
+ spu.s_chan[ch].sinc_inv=0;\r
+ if(spu_config.iUseInterpolation==1) spu.s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
for(ch=start;ch<end;ch++,val>>=1) // loop channels\r
{\r
- s_chan[ch].bReverb=val&1; // -> reverb on/off\r
+ spu.s_chan[ch].bReverb=val&1; // -> reverb on/off\r
}\r
}\r
// MAIN infos struct for each channel
-SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling)
REVERBInfo rvb;
#ifdef THREAD_ENABLED
-#include <pthread.h>
-#include <semaphore.h>
-#include <unistd.h>
-
// worker thread state
-static struct {
+static struct spu_worker {
unsigned int pending:1;
unsigned int exit_thread:1;
int ns_to;
int ctrl;
int decode_pos;
int silentch;
- int *sRVBStart;
- unsigned char *ram;
unsigned int chmask;
unsigned int r_chan_end;
unsigned int r_decode_dirty;
- pthread_t thread;
- sem_t sem_avail;
- sem_t sem_done;
struct {
int spos;
int sbpos;
// certain globals (were local before, but with the new timeproc I need em global)
-static const int f[8][2] = { { 0, 0 },
- { 60, 0 },
- { 115, -52 },
- { 98, -55 },
- { 122, -60 } };
+static int iFMod[NSSIZE];
int ChanBuf[NSSIZE];
-int SSumLR[NSSIZE*2];
-int iFMod[NSSIZE];
+int *SSumLR;
#define CDDA_BUFFER_SIZE (16384 * sizeof(uint32_t)) // must be power of 2
INLINE void StartSound(int ch)
{
+ SPUCHAN *s_chan = &spu.s_chan[ch];
+
StartADSR(ch);
StartREVERB(ch);
- s_chan[ch].prevflags=2;
+ s_chan->prevflags=2;
- s_chan[ch].SB[26]=0; // init mixing vars
- s_chan[ch].SB[27]=0;
- s_chan[ch].iSBPos=27;
+ s_chan->SB[26]=0; // init mixing vars
+ s_chan->SB[27]=0;
+ s_chan->iSBPos=27;
- s_chan[ch].SB[28]=0;
- s_chan[ch].SB[29]=0; // init our interpolation helpers
- s_chan[ch].SB[30]=0;
- s_chan[ch].SB[31]=0;
- s_chan[ch].spos=0;
+ s_chan->SB[28]=0;
+ s_chan->SB[29]=0; // init our interpolation helpers
+ s_chan->SB[30]=0;
+ s_chan->SB[31]=0;
+ s_chan->spos=0;
spu.dwNewChannel&=~(1<<ch); // clear new channel bit
spu.dwChannelOn|=1<<ch;
static void decode_block_data(int *dest, const unsigned char *src, int predict_nr, int shift_factor)
{
+ static const int f[16][2] = {
+ { 0, 0 },
+ { 60, 0 },
+ { 115, -52 },
+ { 98, -55 },
+ { 122, -60 }
+ };
int nSample;
int fa, s_1, s_2, d, s;
static int decode_block(int ch, int *SB)
{
+ SPUCHAN *s_chan = &spu.s_chan[ch];
unsigned char *start;
int predict_nr, shift_factor, flags;
int ret = 0;
- start = s_chan[ch].pCurr; // set up the current pos
+ start = s_chan->pCurr; // set up the current pos
if (start == spu.spuMemC) // ?
ret = 1;
- if (s_chan[ch].prevflags & 1) // 1: stop/loop
+ if (s_chan->prevflags & 1) // 1: stop/loop
{
- if (!(s_chan[ch].prevflags & 2))
+ if (!(s_chan->prevflags & 2))
ret = 1;
- start = s_chan[ch].pLoop;
+ start = s_chan->pLoop;
}
else
check_irq(ch, start); // hack, see check_irq below..
- predict_nr = (int)start[0];
+ predict_nr = start[0];
shift_factor = predict_nr & 0xf;
predict_nr >>= 4;
flags = start[1];
if (flags & 4)
- s_chan[ch].pLoop = start; // loop adress
+ s_chan->pLoop = start; // loop adress
start += 16;
if (flags & 1) { // 1: stop/loop
- start = s_chan[ch].pLoop;
+ start = s_chan->pLoop;
check_irq(ch, start); // hack.. :(
}
if (start - spu.spuMemC >= 0x80000)
start = spu.spuMemC;
- s_chan[ch].pCurr = start; // store values for next cycle
- s_chan[ch].prevflags = flags;
+ s_chan->pCurr = start; // store values for next cycle
+ s_chan->prevflags = flags;
return ret;
}
// do block, but ignore sample data
static int skip_block(int ch)
{
- unsigned char *start = s_chan[ch].pCurr;
+ SPUCHAN *s_chan = &spu.s_chan[ch];
+ unsigned char *start = s_chan->pCurr;
int flags;
int ret = 0;
- if (s_chan[ch].prevflags & 1) {
- if (!(s_chan[ch].prevflags & 2))
+ if (s_chan->prevflags & 1) {
+ if (!(s_chan->prevflags & 2))
ret = 1;
- start = s_chan[ch].pLoop;
+ start = s_chan->pLoop;
}
else
check_irq(ch, start);
flags = start[1];
if (flags & 4)
- s_chan[ch].pLoop = start;
+ s_chan->pLoop = start;
start += 16;
if (flags & 1) {
- start = s_chan[ch].pLoop;
+ start = s_chan->pLoop;
check_irq(ch, start);
}
- s_chan[ch].pCurr = start;
- s_chan[ch].prevflags = flags;
+ s_chan->pCurr = start;
+ s_chan->prevflags = flags;
return ret;
}
static int decode_block_work(int ch, int *SB)
{
+ const unsigned char *ram = spu.spuMemC;
int predict_nr, shift_factor, flags;
- const unsigned char *ram = worker->ram;
int start = worker->ch[ch].start;
int loop = worker->ch[ch].loop;
// if irq is going to trigger sooner than in upd_samples, set upd_samples
static void scan_for_irq(int ch, unsigned int *upd_samples)
{
+ SPUCHAN *s_chan = &spu.s_chan[ch];
int pos, sinc, sinc_inv, end;
unsigned char *block;
int flags;
- block = s_chan[ch].pCurr;
- pos = s_chan[ch].spos;
- sinc = s_chan[ch].sinc;
+ block = s_chan->pCurr;
+ pos = s_chan->spos;
+ sinc = s_chan->sinc;
end = pos + *upd_samples * sinc;
- pos += (28 - s_chan[ch].iSBPos) << 16;
+ pos += (28 - s_chan->iSBPos) << 16;
while (pos < end)
{
if (block == spu.pSpuIrq)
flags = block[1];
block += 16;
if (flags & 1) { // 1: stop/loop
- block = s_chan[ch].pLoop;
+ block = s_chan->pLoop;
if (block == spu.pSpuIrq) // hack.. (see decode_block)
break;
}
if (pos < end)
{
- sinc_inv = s_chan[ch].sinc_inv;
+ sinc_inv = s_chan->sinc_inv;
if (sinc_inv == 0)
- sinc_inv = s_chan[ch].sinc_inv = (0x80000000u / (uint32_t)sinc) << 1;
+ sinc_inv = s_chan->sinc_inv = (0x80000000u / (uint32_t)sinc) << 1;
- pos -= s_chan[ch].spos;
+ pos -= s_chan->spos;
*upd_samples = (((uint64_t)pos * sinc_inv) >> 32) + 1;
//xprintf("ch%02d: irq sched: %3d %03d\n",
// ch, *upd_samples, *upd_samples * 60 * 263 / 44100);
}
#define fmod_recv_check \
- if(s_chan[ch].bFMod==1 && iFMod[ns]) \
- sinc = FModChangeFrequency(SB, s_chan[ch].iRawPitch, ns)
+ if(spu.s_chan[ch].bFMod==1 && iFMod[ns]) \
+ sinc = FModChangeFrequency(SB, spu.s_chan[ch].iRawPitch, ns)
make_do_samples(default, fmod_recv_check, ,
- StoreInterpolationVal(SB, sinc, fa, s_chan[ch].bFMod==2),
- ChanBuf[ns] = iGetInterpolationVal(SB, sinc, *spos, s_chan[ch].bFMod==2), )
+ StoreInterpolationVal(SB, sinc, fa, spu.s_chan[ch].bFMod==2),
+ ChanBuf[ns] = iGetInterpolationVal(SB, sinc, *spos, spu.s_chan[ch].bFMod==2), )
make_do_samples(noint, , fa = SB[29], , ChanBuf[ns] = fa, SB[29] = fa)
#define simple_interp_store \
static int do_samples_skip(int ch, int ns_to)
{
+ SPUCHAN *s_chan = &spu.s_chan[ch];
int ret = ns_to, ns, d;
- s_chan[ch].spos += s_chan[ch].iSBPos << 16;
+ s_chan->spos += s_chan->iSBPos << 16;
for (ns = 0; ns < ns_to; ns++)
{
- s_chan[ch].spos += s_chan[ch].sinc;
- while (s_chan[ch].spos >= 28*0x10000)
+ s_chan->spos += s_chan->sinc;
+ while (s_chan->spos >= 28*0x10000)
{
d = skip_block(ch);
if (d && ns < ret)
ret = ns;
- s_chan[ch].spos -= 28*0x10000;
+ s_chan->spos -= 28*0x10000;
}
}
- s_chan[ch].iSBPos = s_chan[ch].spos >> 16;
- s_chan[ch].spos &= 0xffff;
+ s_chan->iSBPos = s_chan->spos >> 16;
+ s_chan->spos &= 0xffff;
return ret;
}
static void do_silent_chans(int ns_to, int silentch)
{
+ unsigned int mask;
+ SPUCHAN *s_chan;
int ch;
- for (ch = 0; ch < MAXCHAN; ch++)
+ mask = silentch & 0xffffff;
+ for (ch = 0; mask != 0; ch++, mask >>= 1)
{
- if (!(silentch & (1<<ch))) continue; // already handled
+ if (!(mask & 1)) continue;
if (spu.dwChannelDead & (1<<ch)) continue;
- if (s_chan[ch].pCurr > spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq)
+
+ s_chan = &spu.s_chan[ch];
+ if (s_chan->pCurr > spu.pSpuIrq && s_chan->pLoop > spu.pSpuIrq)
continue;
- s_chan[ch].spos += s_chan[ch].iSBPos << 16;
- s_chan[ch].iSBPos = 0;
+ s_chan->spos += s_chan->iSBPos << 16;
+ s_chan->iSBPos = 0;
- s_chan[ch].spos += s_chan[ch].sinc * ns_to;
- while (s_chan[ch].spos >= 28 * 0x10000)
+ s_chan->spos += s_chan->sinc * ns_to;
+ while (s_chan->spos >= 28 * 0x10000)
{
- unsigned char *start = s_chan[ch].pCurr;
+ unsigned char *start = s_chan->pCurr;
skip_block(ch);
- if (start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000)
+ if (start == s_chan->pCurr || start - spu.spuMemC < 0x1000)
{
// looping on self or stopped(?)
spu.dwChannelDead |= 1<<ch;
- s_chan[ch].spos = 0;
+ s_chan->spos = 0;
break;
}
- s_chan[ch].spos -= 28 * 0x10000;
+ s_chan->spos -= 28 * 0x10000;
}
}
}
static void do_channels(int ns_to)
{
unsigned int mask;
+ SPUCHAN *s_chan;
int *SB, sinc;
int ch, d;
{
if (!(mask & 1)) continue; // channel not playing? next
- SB = s_chan[ch].SB;
- sinc = s_chan[ch].sinc;
+ s_chan = &spu.s_chan[ch];
+ SB = s_chan->SB;
+ sinc = s_chan->sinc;
- if (s_chan[ch].bNoise)
+ if (s_chan->bNoise)
d = do_samples_noise(ch, ns_to);
- else if (s_chan[ch].bFMod == 2
- || (s_chan[ch].bFMod == 0 && spu_config.iUseInterpolation == 0))
+ else if (s_chan->bFMod == 2
+ || (s_chan->bFMod == 0 && spu_config.iUseInterpolation == 0))
d = do_samples_noint(decode_block, ch, ns_to,
- SB, sinc, &s_chan[ch].spos, &s_chan[ch].iSBPos);
- else if (s_chan[ch].bFMod == 0 && spu_config.iUseInterpolation == 1)
+ SB, sinc, &s_chan->spos, &s_chan->iSBPos);
+ else if (s_chan->bFMod == 0 && spu_config.iUseInterpolation == 1)
d = do_samples_simple(decode_block, ch, ns_to,
- SB, sinc, &s_chan[ch].spos, &s_chan[ch].iSBPos);
+ SB, sinc, &s_chan->spos, &s_chan->iSBPos);
else
d = do_samples_default(decode_block, ch, ns_to,
- SB, sinc, &s_chan[ch].spos, &s_chan[ch].iSBPos);
+ SB, sinc, &s_chan->spos, &s_chan->iSBPos);
- d = MixADSR(&s_chan[ch].ADSRX, d);
+ d = MixADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
spu.dwChannelOn &= ~(1 << ch);
- s_chan[ch].ADSRX.EnvelopeVol = 0;
+ s_chan->ADSRX.EnvelopeVol = 0;
memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
}
spu.decode_dirty_ch |= 1 << ch;
}
- if (s_chan[ch].bFMod == 2) // fmod freq channel
+ if (s_chan->bFMod == 2) // fmod freq channel
memcpy(iFMod, &ChanBuf, ns_to * sizeof(iFMod[0]));
- if (s_chan[ch].bRVBActive)
- mix_chan_rvb(0, ns_to, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, spu.sRVBStart);
+ if (s_chan->bRVBActive)
+ mix_chan_rvb(0, ns_to, s_chan->iLeftVolume, s_chan->iRightVolume, spu.sRVBStart);
else
- mix_chan(0, ns_to, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
+ mix_chan(0, ns_to, s_chan->iLeftVolume, s_chan->iRightVolume);
}
}
#ifdef THREAD_ENABLED
+static void thread_work_start(void);
+static void thread_work_wait_sync(void);
+
static void queue_channel_work(int ns_to, int silentch)
{
+ const SPUCHAN *s_chan;
unsigned int mask;
int ch;
worker->ctrl = spu.spuCtrl;
worker->decode_pos = spu.decode_pos;
worker->silentch = silentch;
- worker->sRVBStart = spu.sRVBStart;
- worker->ram = spu.spuMemC;
mask = worker->chmask = spu.dwChannelOn & 0xffffff;
for (ch = 0; mask != 0; ch++, mask >>= 1)
{
if (!(mask & 1)) continue;
- worker->ch[ch].spos = s_chan[ch].spos;
- worker->ch[ch].sbpos = s_chan[ch].iSBPos;
- worker->ch[ch].sinc = s_chan[ch].sinc;
- worker->ch[ch].adsr = s_chan[ch].ADSRX;
- worker->ch[ch].start = s_chan[ch].pCurr - spu.spuMemC;
- worker->ch[ch].loop = s_chan[ch].pLoop - spu.spuMemC;
- if (s_chan[ch].prevflags & 1)
+ s_chan = &spu.s_chan[ch];
+ worker->ch[ch].spos = s_chan->spos;
+ worker->ch[ch].sbpos = s_chan->iSBPos;
+ worker->ch[ch].sinc = s_chan->sinc;
+ worker->ch[ch].adsr = s_chan->ADSRX;
+ worker->ch[ch].start = s_chan->pCurr - spu.spuMemC;
+ worker->ch[ch].loop = s_chan->pLoop - spu.spuMemC;
+ if (s_chan->prevflags & 1)
worker->ch[ch].start = worker->ch[ch].loop;
worker->ch[ch].ns_to = do_samples_skip(ch, ns_to);
}
worker->pending = 1;
- sem_post(&worker->sem_avail);
+ thread_work_start();
}
static void do_channel_work(void)
unsigned int decode_dirty_ch = 0;
int *SB, sinc, spos, sbpos;
int d, ch, ns_to;
+ SPUCHAN *s_chan;
ns_to = worker->ns_to;
- memset(worker->sRVBStart, 0, ns_to * sizeof(worker->sRVBStart[0]) * 2);
+ memset(spu.sRVBStart, 0, ns_to * sizeof(spu.sRVBStart[0]) * 2);
mask = worker->chmask;
for (ch = 0; mask != 0; ch++, mask >>= 1)
spos = worker->ch[ch].spos;
sbpos = worker->ch[ch].sbpos;
sinc = worker->ch[ch].sinc;
- SB = s_chan[ch].SB;
- if (s_chan[ch].bNoise)
+ s_chan = &spu.s_chan[ch];
+ SB = s_chan->SB;
+
+ if (s_chan->bNoise)
do_lsfr_samples(d, worker->ctrl, &spu.dwNoiseCount, &spu.dwNoiseVal);
- else if (s_chan[ch].bFMod == 2
- || (s_chan[ch].bFMod == 0 && spu_config.iUseInterpolation == 0))
+ else if (s_chan->bFMod == 2
+ || (s_chan->bFMod == 0 && spu_config.iUseInterpolation == 0))
do_samples_noint(decode_block_work, ch, d, SB, sinc, &spos, &sbpos);
- else if (s_chan[ch].bFMod == 0 && spu_config.iUseInterpolation == 1)
+ else if (s_chan->bFMod == 0 && spu_config.iUseInterpolation == 1)
do_samples_simple(decode_block_work, ch, d, SB, sinc, &spos, &sbpos);
else
do_samples_default(decode_block_work, ch, d, SB, sinc, &spos, &sbpos);
if (ch == 1 || ch == 3)
{
- do_decode_bufs((void *)worker->ram, ch/2, ns_to, worker->decode_pos);
+ do_decode_bufs(spu.spuMem, ch/2, ns_to, worker->decode_pos);
decode_dirty_ch |= 1 << ch;
}
- if (s_chan[ch].bFMod == 2) // fmod freq channel
+ if (s_chan->bFMod == 2) // fmod freq channel
memcpy(iFMod, &ChanBuf, ns_to * sizeof(iFMod[0]));
- if (s_chan[ch].bRVBActive)
- mix_chan_rvb(0, ns_to, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, worker->sRVBStart);
+ if (s_chan->bRVBActive)
+ mix_chan_rvb(0, ns_to, s_chan->iLeftVolume, s_chan->iRightVolume, spu.sRVBStart);
else
- mix_chan(0, ns_to, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
+ mix_chan(0, ns_to, s_chan->iLeftVolume, s_chan->iRightVolume);
}
worker->r_chan_end = endmask;
if (!worker->pending)
return;
- sem_wait(&worker->sem_done);
+ thread_work_wait_sync();
worker->pending = 0;
mask = worker->chmask;
if (!(mask & 1)) continue;
// be sure there was no keyoff while thread was working
- if (s_chan[ch].ADSRX.State != ADSR_RELEASE)
- s_chan[ch].ADSRX.State = worker->ch[ch].adsr.State;
- s_chan[ch].ADSRX.EnvelopeVol = worker->ch[ch].adsr.EnvelopeVol;
+ if (spu.s_chan[ch].ADSRX.State != ADSR_RELEASE)
+ spu.s_chan[ch].ADSRX.State = worker->ch[ch].adsr.State;
+ spu.s_chan[ch].ADSRX.EnvelopeVol = worker->ch[ch].adsr.EnvelopeVol;
}
spu.dwChannelOn &= ~worker->r_chan_end;
{
if (spu.dwChannelDead & (1 << ch))
continue;
- if ((unsigned long)(spu.pSpuIrq - s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
- && (unsigned long)(spu.pSpuIrq - s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
+ if ((unsigned long)(spu.pSpuIrq - spu.s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
+ && (unsigned long)(spu.pSpuIrq - spu.s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
continue;
scan_for_irq(ch, &upd_samples);
// to be called after state load
void ClearWorkingState(void)
{
- memset(SSumLR,0,sizeof(SSumLR)); // init some mixing buffers
- memset(iFMod,0,sizeof(iFMod));
+ memset(SSumLR, 0, NSSIZE * 2 * 4); // init some mixing buffers
+ memset(iFMod, 0, sizeof(iFMod));
spu.pS=(short *)spu.pSpuBuffer; // setup soundbuffer pointer
}
int i;
spu.pSpuBuffer = (unsigned char *)malloc(32768); // alloc mixing buffer
- spu.sRVBStart = (int *)malloc(NSSIZE*2*4); // alloc reverb buffer
- memset(spu.sRVBStart,0,NSSIZE*2*4);
+ spu.sRVBStart = calloc(NSSIZE * 2, sizeof(spu.sRVBStart[0]));
+ SSumLR = calloc(NSSIZE * 2, sizeof(SSumLR[0]));
spu.XAStart = // alloc xa buffer
(uint32_t *)malloc(44100 * sizeof(uint32_t));
for(i=0;i<MAXCHAN;i++) // loop sound channels
{
- s_chan[i].ADSRX.SustainLevel = 0xf; // -> init sustain
- s_chan[i].ADSRX.SustainIncrease = 1;
- s_chan[i].pLoop=spu.spuMemC;
- s_chan[i].pCurr=spu.spuMemC;
+ spu.s_chan[i].ADSRX.SustainLevel = 0xf; // -> init sustain
+ spu.s_chan[i].ADSRX.SustainIncrease = 1;
+ spu.s_chan[i].pLoop=spu.spuMemC;
+ spu.s_chan[i].pCurr=spu.spuMemC;
}
ClearWorkingState();
spu.pSpuBuffer = NULL;
free(spu.sRVBStart); // free reverb buffer
spu.sRVBStart = NULL;
+ free(SSumLR);
+ SSumLR = NULL;
free(spu.XAStart); // free XA buffer
spu.XAStart = NULL;
free(spu.CDDAStart); // free CDDA buffer
spu.CDDAStart = NULL;
}
-#ifdef THREAD_ENABLED
+#if defined(C64X_DSP)
+
+/* special code for TI C64x DSP */
+#include "spu_c64x.c"
+
+#elif defined(THREAD_ENABLED)
+
+#include <pthread.h>
+#include <semaphore.h>
+#include <unistd.h>
+
+static struct {
+ pthread_t thread;
+ sem_t sem_avail;
+ sem_t sem_done;
+} t;
+
+/* generic pthread implementation */
+
+static void thread_work_start(void)
+{
+ sem_post(&t.sem_avail);
+}
+
+static void thread_work_wait_sync(void)
+{
+ sem_wait(&t.sem_done);
+}
static void *spu_worker_thread(void *unused)
{
while (1) {
- sem_wait(&worker->sem_avail);
+ sem_wait(&t.sem_avail);
if (worker->exit_thread)
break;
do_channel_work();
- sem_post(&worker->sem_done);
+ sem_post(&t.sem_done);
}
return NULL;
worker = calloc(1, sizeof(*worker));
if (worker == NULL)
return;
- ret = sem_init(&worker->sem_avail, 0, 0);
+ ret = sem_init(&t.sem_avail, 0, 0);
if (ret != 0)
goto fail_sem_avail;
- ret = sem_init(&worker->sem_done, 0, 0);
+ ret = sem_init(&t.sem_done, 0, 0);
if (ret != 0)
goto fail_sem_done;
- ret = pthread_create(&worker->thread, NULL, spu_worker_thread, NULL);
+ ret = pthread_create(&t.thread, NULL, spu_worker_thread, NULL);
if (ret != 0)
goto fail_thread;
return;
fail_thread:
- sem_destroy(&worker->sem_done);
+ sem_destroy(&t.sem_done);
fail_sem_done:
- sem_destroy(&worker->sem_avail);
+ sem_destroy(&t.sem_avail);
fail_sem_avail:
free(worker);
worker = NULL;
if (worker == NULL)
return;
worker->exit_thread = 1;
- sem_post(&worker->sem_avail);
- pthread_join(worker->thread, NULL);
- sem_destroy(&worker->sem_done);
- sem_destroy(&worker->sem_avail);
+ sem_post(&t.sem_avail);
+ pthread_join(t.thread, NULL);
+ sem_destroy(&t.sem_done);
+ sem_destroy(&t.sem_avail);
free(worker);
worker = NULL;
}
// SPUINIT: this func will be called first by the main emu
long CALLBACK SPUinit(void)
{
- spu.spuMemC = (unsigned char *)spu.spuMem; // just small setup
+ spu.spuMemC = calloc(1, 512 * 1024);
memset((void *)&rvb, 0, sizeof(REVERBInfo));
InitADSR();
- spu.spuAddr = 0xffffffff;
+ spu.s_chan = calloc(MAXCHAN+1, sizeof(spu.s_chan[0])); // channel + 1 infos (1 is security for fmod handling)
+
+ spu.spuAddr = 0;
spu.decode_pos = 0;
- memset((void *)s_chan, 0, sizeof(s_chan));
spu.pSpuIrq = spu.spuMemC;
SetupStreams(); // prepare streaming
long CALLBACK SPUshutdown(void)
{
SPUclose();
- RemoveStreams(); // no more streaming
- spu.bSpuInit=0;
exit_spu_thread();
+ free(spu.spuMemC);
+ spu.spuMemC = NULL;
+ free(spu.s_chan);
+ spu.s_chan = NULL;
+
+ RemoveStreams(); // no more streaming
+ spu.bSpuInit=0;
+
return 0;
}
{
int ch = 0, fmod_chans = 0, noise_chans = 0, irq_chans = 0;
+ if (spu.s_chan == NULL)
+ return;
+
for(;ch<MAXCHAN;ch++)
{
if (!(spu.dwChannelOn & (1<<ch)))
continue;
- if (s_chan[ch].bFMod == 2)
+ if (spu.s_chan[ch].bFMod == 2)
fmod_chans |= 1 << ch;
- if (s_chan[ch].bNoise)
+ if (spu.s_chan[ch].bNoise)
noise_chans |= 1 << ch;
- if((spu.spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= spu.pSpuIrq && s_chan[ch].pLoop <= spu.pSpuIrq)
+ if((spu.spuCtrl&CTRL_IRQ) && spu.s_chan[ch].pCurr <= spu.pSpuIrq && spu.s_chan[ch].pLoop <= spu.pSpuIrq)
irq_chans |= 1 << ch;
}
notaz.gp2x.de / pcsx_rearmed.git / commitdiff