notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spu: cleanup some irq hacks
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
spu.c
diff --git
a/plugins/dfsound/spu.c
b/plugins/dfsound/spu.c
index
8681d35
..
f4426ab
100644
(file)
--- a/
plugins/dfsound/spu.c
+++ b/
plugins/dfsound/spu.c
@@
-35,7
+35,7
@@
#include "arm_features.h"
#endif
#include "arm_features.h"
#endif
-#ifdef
__ARM_ARCH_7A__
+#ifdef
HAVE_ARMV7
#define ssat32_to_16(v) \
asm("ssat %0,#16,%1" : "=r" (v) : "r" (v))
#else
#define ssat32_to_16(v) \
asm("ssat %0,#16,%1" : "=r" (v) : "r" (v))
#else
@@
-247,9
+247,12
@@
static void StartSoundMain(int ch)
s_chan->iSBPos=27;
s_chan->spos=0;
s_chan->iSBPos=27;
s_chan->spos=0;
+ s_chan->pCurr = spu.spuMemC + ((regAreaGetCh(ch, 6) & ~1) << 3);
+
spu.dwNewChannel&=~(1<<ch); // clear new channel bit
spu.dwNewChannel&=~(1<<ch); // clear new channel bit
- spu.dwChannelOn|=1<<ch;
spu.dwChannelDead&=~(1<<ch);
spu.dwChannelDead&=~(1<<ch);
+ if (s_chan->iRawPitch)
+ spu.dwChannelsAudible|=1<<ch;
}
static void StartSound(int ch)
}
static void StartSound(int ch)
@@
-423,8
+426,8
@@
static int decode_block(void *unused, int ch, int *SB)
start = s_chan->pLoop;
}
start = s_chan->pLoop;
}
- else
- check_irq(ch, start); // hack, see check_irq below..
+
+ check_irq(ch, start);
predict_nr = start[0];
shift_factor = predict_nr & 0xf;
predict_nr = start[0];
shift_factor = predict_nr & 0xf;
@@
-433,19
+436,11
@@
static int decode_block(void *unused, int ch, int *SB)
decode_block_data(SB, start + 2, predict_nr, shift_factor);
flags = start[1];
decode_block_data(SB, start + 2, predict_nr, shift_factor);
flags = start[1];
- if (flags & 4)
+ if (flags & 4
&& !s_chan->bIgnoreLoop
)
s_chan->pLoop = start; // loop adress
start += 16;
s_chan->pLoop = start; // loop adress
start += 16;
- if (flags & 1) { // 1: stop/loop
- start = s_chan->pLoop;
- check_irq(ch, start); // hack.. :(
- }
-
- if (start - spu.spuMemC >= 0x80000)
- start = spu.spuMemC;
-
s_chan->pCurr = start; // store values for next cycle
s_chan->prevflags = flags;
s_chan->pCurr = start; // store values for next cycle
s_chan->prevflags = flags;
@@
-466,20
+461,15
@@
static int skip_block(int ch)
start = s_chan->pLoop;
}
start = s_chan->pLoop;
}
- else
-
check_irq(ch, start);
+
+ check_irq(ch, start);
flags = start[1];
flags = start[1];
- if (flags & 4)
+ if (flags & 4
&& !s_chan->bIgnoreLoop
)
s_chan->pLoop = start;
start += 16;
s_chan->pLoop = start;
start += 16;
- if (flags & 1) {
- start = s_chan->pLoop;
- check_irq(ch, start);
- }
-
s_chan->pCurr = start;
s_chan->prevflags = flags;
s_chan->pCurr = start;
s_chan->prevflags = flags;
@@
-508,8
+498,6
@@
static void scan_for_irq(int ch, unsigned int *upd_samples)
block += 16;
if (flags & 1) { // 1: stop/loop
block = s_chan->pLoop;
block += 16;
if (flags & 1) { // 1: stop/loop
block = s_chan->pLoop;
- if (block == spu.pSpuIrq) // hack.. (see decode_block)
- break;
}
pos += 28 << 16;
}
}
pos += 28 << 16;
}
@@
-774,7
+762,7
@@
static void do_channels(int ns_to)
StartSound(ch);
}
StartSound(ch);
}
- mask = spu.dwChannel
On
& 0xffffff;
+ mask = spu.dwChannel
sAudible
& 0xffffff;
for (ch = 0; mask != 0; ch++, mask >>= 1) // loop em all...
{
if (!(mask & 1)) continue; // channel not playing? next
for (ch = 0; mask != 0; ch++, mask >>= 1) // loop em all...
{
if (!(mask & 1)) continue; // channel not playing? next
@@
-798,7
+786,8
@@
static void do_channels(int ns_to)
d = MixADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
d = MixADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
- spu.dwChannelOn &= ~(1 << ch);
+ spu.dwChannelsAudible &= ~(1 << ch);
+ s_chan->ADSRX.State = ADSR_RELEASE;
s_chan->ADSRX.EnvelopeVol = 0;
memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
}
s_chan->ADSRX.EnvelopeVol = 0;
memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
}
@@
-818,12
+807,8
@@
static void do_channels(int ns_to)
}
if (spu.rvb->StartAddr) {
}
if (spu.rvb->StartAddr) {
- if (do_rvb) {
- if (unlikely(spu.rvb->dirty))
- REVERBPrep();
-
+ if (do_rvb)
REVERBDo(spu.SSumLR, RVB, ns_to, spu.rvb->CurrAddr);
REVERBDo(spu.SSumLR, RVB, ns_to, spu.rvb->CurrAddr);
- }
spu.rvb->CurrAddr += ns_to / 2;
while (spu.rvb->CurrAddr >= 0x40000)
spu.rvb->CurrAddr += ns_to / 2;
while (spu.rvb->CurrAddr >= 0x40000)
@@
-846,6
+831,7
@@
static struct spu_worker {
unsigned int i_ready;
unsigned int i_reaped;
unsigned int last_boot_cnt; // dsp
unsigned int i_ready;
unsigned int i_reaped;
unsigned int last_boot_cnt; // dsp
+ unsigned int ram_dirty;
};
// aligning for C64X_DSP
unsigned int _pad0[128/4];
};
// aligning for C64X_DSP
unsigned int _pad0[128/4];
@@
-938,7
+924,7
@@
static void queue_channel_work(int ns_to, unsigned int silentch)
StartSoundMain(ch);
}
StartSoundMain(ch);
}
- mask = work->channels_on = spu.dwChannel
On
& 0xffffff;
+ mask = work->channels_on = spu.dwChannel
sAudible
& 0xffffff;
spu.decode_dirty_ch |= mask & 0x0a;
for (ch = 0; mask != 0; ch++, mask >>= 1)
spu.decode_dirty_ch |= mask & 0x0a;
for (ch = 0; mask != 0; ch++, mask >>= 1)
@@
-963,18
+949,15
@@
static void queue_channel_work(int ns_to, unsigned int silentch)
// note: d is not accurate on skip
d = SkipADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
// note: d is not accurate on skip
d = SkipADSR(&s_chan->ADSRX, d);
if (d < ns_to) {
- spu.dwChannel
On
&= ~(1 << ch);
+ spu.dwChannel
sAudible
&= ~(1 << ch);
s_chan->ADSRX.EnvelopeVol = 0;
}
}
work->rvb_addr = 0;
if (spu.rvb->StartAddr) {
s_chan->ADSRX.EnvelopeVol = 0;
}
}
work->rvb_addr = 0;
if (spu.rvb->StartAddr) {
- if (spu_config.iUseReverb) {
- if (unlikely(spu.rvb->dirty))
- REVERBPrep();
+ if (spu_config.iUseReverb)
work->rvb_addr = spu.rvb->CurrAddr;
work->rvb_addr = spu.rvb->CurrAddr;
- }
spu.rvb->CurrAddr += ns_to / 2;
while (spu.rvb->CurrAddr >= 0x40000)
spu.rvb->CurrAddr += ns_to / 2;
while (spu.rvb->CurrAddr >= 0x40000)
@@
-989,9
+972,9
@@
static void do_channel_work(struct work_item *work)
{
unsigned int mask;
unsigned int decode_dirty_ch = 0;
{
unsigned int mask;
unsigned int decode_dirty_ch = 0;
+ const SPUCHAN *s_chan;
int *SB, sinc, spos, sbpos;
int d, ch, ns_to;
int *SB, sinc, spos, sbpos;
int d, ch, ns_to;
- SPUCHAN *s_chan;
ns_to = work->ns_to;
ns_to = work->ns_to;
@@
-1057,8
+1040,12
@@
static void sync_worker_thread(int force)
struct work_item *work;
int done, used_space;
struct work_item *work;
int done, used_space;
+ // rvb offsets will change, thread may be using them
+ force |= spu.rvb->dirty && spu.rvb->StartAddr;
+
done = thread_get_i_done() - worker->i_reaped;
used_space = worker->i_ready - worker->i_reaped;
done = thread_get_i_done() - worker->i_reaped;
used_space = worker->i_ready - worker->i_reaped;
+
//printf("done: %d use: %d dsp: %u/%u\n", done, used_space,
// worker->boot_cnt, worker->i_done);
//printf("done: %d use: %d dsp: %u/%u\n", done, used_space,
// worker->boot_cnt, worker->i_done);
@@
-1105,7
+1092,7
@@
void do_samples(unsigned int cycles_to, int do_direct)
return;
}
return;
}
- silentch = ~(spu.dwChannel
On
| spu.dwNewChannel) & 0xffffff;
+ silentch = ~(spu.dwChannel
sAudible
| spu.dwNewChannel) & 0xffffff;
do_direct |= (silentch == 0xffffff);
if (worker != NULL)
do_direct |= (silentch == 0xffffff);
if (worker != NULL)
@@
-1150,6
+1137,9
@@
void do_samples(unsigned int cycles_to, int do_direct)
}
}
}
}
+ if (unlikely(spu.rvb->dirty))
+ REVERBPrep();
+
if (do_direct || worker == NULL || !spu_config.iUseThread) {
do_channels(ns_to);
do_samples_finish(spu.SSumLR, ns_to, silentch, spu.decode_pos);
if (do_direct || worker == NULL || !spu_config.iUseThread) {
do_channels(ns_to);
do_samples_finish(spu.SSumLR, ns_to, silentch, spu.decode_pos);
@@
-1170,7
+1160,8
@@
void do_samples(unsigned int cycles_to, int do_direct)
static void do_samples_finish(int *SSumLR, int ns_to,
int silentch, int decode_pos)
{
static void do_samples_finish(int *SSumLR, int ns_to,
int silentch, int decode_pos)
{
- int volmult = spu_config.iVolume;
+ int vol_l = ((int)regAreaGet(H_SPUmvolL) << 17) >> 17;
+ int vol_r = ((int)regAreaGet(H_SPUmvolR) << 17) >> 17;
int ns;
int d;
int ns;
int d;
@@
-1187,23
+1178,28
@@
static void do_samples_finish(int *SSumLR, int ns_to,
}
MixXA(SSumLR, ns_to, decode_pos);
}
MixXA(SSumLR, ns_to, decode_pos);
-
- if((spu.spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
+
+ vol_l = vol_l * spu_config.iVolume >> 10;
+ vol_r = vol_r * spu_config.iVolume >> 10;
+
+ if (!(spu.spuCtrl & 0x4000) || !(vol_l | vol_r))
{
{
+ // muted? (rare)
memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
+ memset(SSumLR, 0, ns_to * 2 * sizeof(SSumLR[0]));
spu.pS += ns_to * 2;
}
else
for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
spu.pS += ns_to * 2;
}
else
for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * vol
mult >> 10
;
+ d = d * vol
_l >> 15
;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * vol
mult >> 10
;
+ d = d * vol
_r >> 15
;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
@@
-1227,6
+1223,8
@@
void schedule_next_irq(void)
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;
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;
+ if (spu.s_chan[ch].sinc == 0)
+ continue;
scan_for_irq(ch, &upd_samples);
}
scan_for_irq(ch, &upd_samples);
}
@@
-1252,7
+1250,7
@@
void schedule_next_irq(void)
void CALLBACK SPUasync(unsigned int cycle, unsigned int flags)
{
void CALLBACK SPUasync(unsigned int cycle, unsigned int flags)
{
- do_samples(cycle,
0
);
+ do_samples(cycle,
spu_config.iUseFixedUpdates
);
if (spu.spuCtrl & CTRL_IRQ)
schedule_next_irq();
if (spu.spuCtrl & CTRL_IRQ)
schedule_next_irq();
@@
-1285,20
+1283,26
@@
void CALLBACK SPUupdate(void)
// XA AUDIO
// XA AUDIO
-void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap)
+void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap
, unsigned int cycle, int is_start
)
{
if(!xap) return;
{
if(!xap) return;
- if(!xap->freq) return; // no xa freq ? bye
+ if(!xap->freq) return; // no xa freq ? bye
+
+ if (is_start)
+ do_samples(cycle, 1); // catch up to prevent source underflows later
- FeedXA(xap);
// call main XA feeder
+ FeedXA(xap); // call main XA feeder
}
// CDDA AUDIO
}
// CDDA AUDIO
-int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes)
+int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes
, unsigned int cycle, int is_start
)
{
if (!pcm) return -1;
if (nbytes<=0) return -1;
{
if (!pcm) return -1;
if (nbytes<=0) return -1;
+ if (is_start)
+ do_samples(cycle, 1); // catch up to prevent source underflows later
+
return FeedCDDA((unsigned char *)pcm, nbytes);
}
return FeedCDDA((unsigned char *)pcm, nbytes);
}
@@
-1315,14
+1319,12
@@
static void SetupStreams(void)
spu.pSpuBuffer = (unsigned char *)malloc(32768); // alloc mixing buffer
spu.SSumLR = calloc(NSSIZE * 2, sizeof(spu.SSumLR[0]));
spu.pSpuBuffer = (unsigned char *)malloc(32768); // alloc mixing buffer
spu.SSumLR = calloc(NSSIZE * 2, sizeof(spu.SSumLR[0]));
- spu.XAStart = // alloc xa buffer
- (uint32_t *)malloc(44100 * sizeof(uint32_t));
+ spu.XAStart = malloc(44100 * sizeof(uint32_t)); // alloc xa buffer
spu.XAEnd = spu.XAStart + 44100;
spu.XAPlay = spu.XAStart;
spu.XAFeed = spu.XAStart;
spu.XAEnd = spu.XAStart + 44100;
spu.XAPlay = spu.XAStart;
spu.XAFeed = spu.XAStart;
- spu.CDDAStart = // alloc cdda buffer
- (uint32_t *)malloc(CDDA_BUFFER_SIZE);
+ spu.CDDAStart = malloc(CDDA_BUFFER_SIZE); // alloc cdda buffer
spu.CDDAEnd = spu.CDDAStart + 16384;
spu.CDDAPlay = spu.CDDAStart;
spu.CDDAFeed = spu.CDDAStart;
spu.CDDAEnd = spu.CDDAStart + 16384;
spu.CDDAPlay = spu.CDDAStart;
spu.CDDAFeed = spu.CDDAStart;
@@
-1488,6
+1490,7
@@
long CALLBACK SPUinit(void)
spu.s_chan[i].ADSRX.SustainIncrease = 1;
spu.s_chan[i].pLoop = spu.spuMemC;
spu.s_chan[i].pCurr = spu.spuMemC;
spu.s_chan[i].ADSRX.SustainIncrease = 1;
spu.s_chan[i].pLoop = spu.spuMemC;
spu.s_chan[i].pCurr = spu.spuMemC;
+ spu.s_chan[i].bIgnoreLoop = 0;
}
spu.bSpuInit=1; // flag: we are inited
}
spu.bSpuInit=1; // flag: we are inited
@@
-1576,7
+1579,7
@@
void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
spu.irqCallback = callback;
}
spu.irqCallback = callback;
}
-void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(
unsigned short,unsigned
short))
+void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(
short,
short))
{
spu.cddavCallback = CDDAVcallback;
}
{
spu.cddavCallback = CDDAVcallback;
}
@@
-1619,7
+1622,7
@@
void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int
for(;ch<MAXCHAN;ch++)
{
for(;ch<MAXCHAN;ch++)
{
- if (!(spu.dwChannel
On
& (1<<ch)))
+ if (!(spu.dwChannel
sAudible
& (1<<ch)))
continue;
if (spu.s_chan[ch].bFMod == 2)
fmod_chans |= 1 << ch;
continue;
if (spu.s_chan[ch].bFMod == 2)
fmod_chans |= 1 << ch;
@@
-1629,8
+1632,8
@@
void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int
irq_chans |= 1 << ch;
}
irq_chans |= 1 << ch;
}
- *chans_out = spu.dwChannel
On
;
- *run_chans = ~spu.dwChannel
On
& ~spu.dwChannelDead & irq_chans;
+ *chans_out = spu.dwChannel
sAudible
;
+ *run_chans = ~spu.dwChannel
sAudible
& ~spu.dwChannelDead & irq_chans;
*fmod_chans_out = fmod_chans;
*noise_chans_out = noise_chans;
}
*fmod_chans_out = fmod_chans;
*noise_chans_out = noise_chans;
}