mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-06 15:48:05 -04:00
some audio problems fixed, missing files added
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@31 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
7a93adeb29
commit
abe0ea43b5
9 changed files with 583 additions and 288 deletions
|
|
@ -6,10 +6,11 @@ static unsigned char *mp3_data = (unsigned char *) 0x01000000;
|
|||
YM2612 *ym2612_940;
|
||||
|
||||
// from init.s
|
||||
void wait_irq(void);
|
||||
int wait_get_job(int oldjob);
|
||||
void spend_cycles(int c);
|
||||
void cache_clean(void);
|
||||
void cache_clean_flush(void);
|
||||
void dcache_clean(void);
|
||||
void dcache_clean_flush(void);
|
||||
void drain_wb(void);
|
||||
// this should help to resolve race confition where shared var
|
||||
// is changed by other core just before we update it
|
||||
void set_if_not_changed(int *val, int oldval, int newval);
|
||||
|
|
@ -41,7 +42,6 @@ static void mp3_decode(void)
|
|||
shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);
|
||||
if (err) {
|
||||
if (err == ERR_MP3_INDATA_UNDERFLOW) {
|
||||
shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF
|
||||
set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);
|
||||
return;
|
||||
} else if (err <= -6 && err >= -12) {
|
||||
|
|
@ -56,97 +56,73 @@ static void mp3_decode(void)
|
|||
}
|
||||
|
||||
|
||||
void Main940(int startvector, int pc_at_irq)
|
||||
void Main940(void)
|
||||
{
|
||||
int mix_buffer = shared_data->mix_buffer;
|
||||
int *ym_buffer = shared_data->ym_buffer;
|
||||
int job = 0;
|
||||
ym2612_940 = &shared_data->ym2612;
|
||||
|
||||
// debug
|
||||
shared_ctl->vstarts[startvector]++;
|
||||
shared_ctl->last_irq_pc = pc_at_irq;
|
||||
// asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0");
|
||||
|
||||
|
||||
// for (;;)
|
||||
for (;;)
|
||||
{
|
||||
int job_num = 0;
|
||||
/*
|
||||
while (!shared_ctl->busy)
|
||||
job = wait_get_job(job);
|
||||
|
||||
shared_ctl->lastjob = job;
|
||||
|
||||
switch (job)
|
||||
{
|
||||
//shared_ctl->waitc++;
|
||||
spend_cycles(8*1024);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
if (!shared_ctl->busy)
|
||||
{
|
||||
wait_irq();
|
||||
}
|
||||
shared_ctl->lastbusy = shared_ctl->busy;
|
||||
*/
|
||||
case JOB940_INITALL:
|
||||
/* ym2612 */
|
||||
shared_ctl->writebuff0[0] = shared_ctl->writebuff1[0] = 0xffff;
|
||||
YM2612Init_(shared_ctl->baseclock, shared_ctl->rate);
|
||||
/* Helix mp3 decoder */
|
||||
shared_data->mp3dec = MP3InitDecoder();
|
||||
break;
|
||||
|
||||
for (job_num = 0; job_num < MAX_940JOBS; job_num++)
|
||||
{
|
||||
shared_ctl->lastjob = (job_num << 8) | shared_ctl->jobs[job_num];
|
||||
case JOB940_INVALIDATE_DCACHE:
|
||||
drain_wb();
|
||||
dcache_clean_flush();
|
||||
break;
|
||||
|
||||
switch (shared_ctl->jobs[job_num])
|
||||
{
|
||||
case JOB940_INITALL:
|
||||
/* ym2612 */
|
||||
shared_ctl->writebuff0[0] = shared_ctl->writebuff1[0] = 0xffff;
|
||||
YM2612Init_(shared_ctl->baseclock, shared_ctl->rate);
|
||||
/* Helix mp3 decoder */
|
||||
shared_data->mp3dec = MP3InitDecoder();
|
||||
break;
|
||||
case JOB940_YM2612RESETCHIP:
|
||||
YM2612ResetChip_();
|
||||
break;
|
||||
|
||||
case JOB940_YM2612RESETCHIP:
|
||||
YM2612ResetChip_();
|
||||
break;
|
||||
case JOB940_PICOSTATELOAD:
|
||||
YM2612PicoStateLoad_();
|
||||
break;
|
||||
|
||||
case JOB940_PICOSTATELOAD:
|
||||
YM2612PicoStateLoad_();
|
||||
break;
|
||||
|
||||
case JOB940_YM2612UPDATEONE: {
|
||||
int i, dw, *wbuff;
|
||||
if (shared_ctl->writebuffsel == 1) {
|
||||
wbuff = (int *) shared_ctl->writebuff1;
|
||||
} else {
|
||||
wbuff = (int *) shared_ctl->writebuff0;
|
||||
}
|
||||
|
||||
/* playback all writes */
|
||||
for (i = 2048/2; i > 0; i--) {
|
||||
UINT16 d;
|
||||
dw = *wbuff++;
|
||||
d = dw;
|
||||
if (d == 0xffff) break;
|
||||
YM2612Write_(d >> 8, d);
|
||||
d = (dw>>16);
|
||||
if (d == 0xffff) break;
|
||||
YM2612Write_(d >> 8, d);
|
||||
}
|
||||
|
||||
YM2612UpdateOne_(mix_buffer, shared_ctl->length, shared_ctl->stereo, 1);
|
||||
break;
|
||||
case JOB940_YM2612UPDATEONE: {
|
||||
int i, dw, *wbuff;
|
||||
if (shared_ctl->writebuffsel == 1) {
|
||||
wbuff = (int *) shared_ctl->writebuff1;
|
||||
} else {
|
||||
wbuff = (int *) shared_ctl->writebuff0;
|
||||
}
|
||||
|
||||
case JOB940_MP3DECODE:
|
||||
mp3_decode();
|
||||
break;
|
||||
/* playback all writes */
|
||||
for (i = 2048/2; i > 0; i--) {
|
||||
UINT16 d;
|
||||
dw = *wbuff++;
|
||||
d = dw;
|
||||
if (d == 0xffff) break;
|
||||
YM2612Write_(d >> 8, d);
|
||||
d = (dw>>16);
|
||||
if (d == 0xffff) break;
|
||||
YM2612Write_(d >> 8, d);
|
||||
}
|
||||
|
||||
YM2612UpdateOne_(ym_buffer, shared_ctl->length, shared_ctl->stereo, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
case JOB940_MP3DECODE:
|
||||
mp3_decode();
|
||||
break;
|
||||
}
|
||||
|
||||
cache_clean();
|
||||
// asm volatile ("mov r0, #0" ::: "r0");
|
||||
// asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer, should be done on nonbuffered write */
|
||||
// cache_clean_flush();
|
||||
|
||||
shared_ctl->loopc++;
|
||||
|
||||
// // shared_ctl->busy = 0; // shared mem is not reliable?
|
||||
|
||||
wait_irq();
|
||||
dcache_clean();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
.global code940
|
||||
@ vim:filetype=armasm:
|
||||
|
||||
|
||||
.equ mmsp2_regs, (0xc0000000-0x02000000) @ assume we live @ 0x2000000 bank
|
||||
.equ shared_ctl, 0x00200000 @ this is where shared_ctl struncture is located
|
||||
|
||||
code940: @ interrupt table:
|
||||
|
||||
@ exception table:
|
||||
.global code940
|
||||
code940:
|
||||
b .b_reset @ reset
|
||||
b .b_undef @ undefined instructions
|
||||
b .b_swi @ software interrupt
|
||||
|
|
@ -32,19 +37,23 @@ code940: @ interrupt table:
|
|||
mov r12, #5
|
||||
b .Begin
|
||||
.b_irq:
|
||||
mov r12, #6
|
||||
mov sp, #0x100000 @ reset stack
|
||||
sub sp, sp, #4
|
||||
mov r1, #mmsp2_regs
|
||||
orr r2, r1, #0x3B00
|
||||
orr r2, r2, #0x0046
|
||||
mvn r3, #0
|
||||
strh r3, [r2] @ clear any pending interrupts from the DUALCPU unit
|
||||
orr r2, r1, #0x4500
|
||||
str r3, [r2] @ clear all pending interrupts in irq controller's SRCPND register
|
||||
orr r2, r2, #0x0010
|
||||
str r3, [r2] @ clear all pending interrupts in irq controller's INTPND register
|
||||
b .Enter
|
||||
mov r0, #shared_ctl @ remember where we were when interrupt happened
|
||||
add r0, r0, #0x20
|
||||
str lr, [r0]
|
||||
mov r0, #shared_ctl @ increment exception counter (for debug)
|
||||
add r0, r0, #(6*4)
|
||||
ldr r1, [r0]
|
||||
add r1, r1, #1
|
||||
str r1, [r0]
|
||||
|
||||
bl Main940
|
||||
|
||||
@ we should never get here
|
||||
b .b_reserved
|
||||
|
||||
|
||||
.b_fiq:
|
||||
mov r12, #7
|
||||
b .Begin
|
||||
|
|
@ -81,8 +90,13 @@ code940: @ interrupt table:
|
|||
mcr p15, 0, r0, c6, c4, 0
|
||||
mcr p15, 0, r0, c6, c4, 1
|
||||
|
||||
@ set regions 1 and 4 to be cacheable (so the first 2M and mp3 area will be cacheable)
|
||||
mov r0, #(1<<1)|(1<<4)
|
||||
@ region 5: 4K 0x00000000-0x00001000 (boot code protection region)
|
||||
mov r0, #(0x0b<<1)|1
|
||||
mcr p15, 0, r0, c6, c5, 0
|
||||
mcr p15, 0, r0, c6, c5, 1
|
||||
|
||||
@ set regions 1, 4 and 5 to be cacheable (so the first 2M and mp3 area will be cacheable)
|
||||
mov r0, #(1<<1)|(1<<4)|(1<<5)
|
||||
mcr p15, 0, r0, c2, c0, 0
|
||||
mcr p15, 0, r0, c2, c0, 1
|
||||
|
||||
|
|
@ -90,10 +104,13 @@ code940: @ interrupt table:
|
|||
mov r0, #(1<<1)
|
||||
mcr p15, 0, r0, c3, c0, 0
|
||||
|
||||
@ set protection, allow access only to regions 1 and 2
|
||||
mov r0, #(3<<8)|(3<<6)|(3<<4)|(3<<2)|(0) @ data: [full, full, full, full, no access] for regions [4 3 2 1 0]
|
||||
@ set access protection
|
||||
@ data: [no, full, full, full, full, no access] for regions [5 4 3 2 1 0]
|
||||
mov r0, #(0<<10)|(3<<8)|(3<<6)|(3<<4)|(3<<2)|(0)
|
||||
mcr p15, 0, r0, c5, c0, 0
|
||||
mov r0, #(0<<8)|(0<<6)|(0<<4)|(3<<2)|(0) @ instructions: [no access, no, no, full, no]
|
||||
@ instructions: [full, no access, no, no, full, no]
|
||||
mov r0, #(0<< 6)|(0<<4)|(3<<2)|(0)
|
||||
orr r0, r0, #(3<<10)|(0<<8)
|
||||
mcr p15, 0, r0, c5, c0, 1
|
||||
|
||||
mrc p15, 0, r0, c1, c0, 0 @ fetch current control reg
|
||||
|
|
@ -109,19 +126,74 @@ code940: @ interrupt table:
|
|||
mov r0, #0
|
||||
mcr p15, 0, r0, c7, c6, 0
|
||||
|
||||
.Enter:
|
||||
mov r0, r12
|
||||
mov r1, lr
|
||||
bl Main940
|
||||
@ remember which exception vector we came from (increment counter for debug)
|
||||
mov r0, #shared_ctl
|
||||
add r0, r0, r12, lsl #2
|
||||
ldr r1, [r0]
|
||||
add r1, r1, #1
|
||||
str r1, [r0]
|
||||
|
||||
@ remember last lr (for debug)
|
||||
mov r0, #shared_ctl
|
||||
add r0, r0, #0x20
|
||||
str lr, [r0]
|
||||
|
||||
@ we should never get here
|
||||
@.b_deadloop:
|
||||
@ b .b_deadloop
|
||||
b .b_reserved
|
||||
@ ready to take first job-interrupt
|
||||
wait_for_irq:
|
||||
mrs r0, cpsr
|
||||
bic r0, r0, #0x80
|
||||
msr cpsr_c, r0 @ enable interrupts
|
||||
|
||||
mov r0, #0
|
||||
mcr p15, 0, r0, c7, c0, 4 @ wait for IRQ
|
||||
@ mcr p15, 0, r0, c15, c8, 2
|
||||
nop
|
||||
nop
|
||||
b .b_reserved
|
||||
|
||||
|
||||
|
||||
@ so asm utils are also defined here:
|
||||
@ next job getter
|
||||
.global wait_get_job @ int oldjob
|
||||
|
||||
wait_get_job:
|
||||
mov r3, #mmsp2_regs
|
||||
orr r2, r3, #0x3B00
|
||||
orr r2, r2, #0x0046 @ DUALPEND940 register
|
||||
ldrh r12,[r2]
|
||||
|
||||
tst r0, r0
|
||||
beq wgj_no_old
|
||||
sub r0, r0, #1
|
||||
mov r1, #1
|
||||
mov r1, r1, lsl r0
|
||||
strh r1, [r2] @ clear finished job's pending bit
|
||||
bic r12,r12,r1
|
||||
|
||||
wgj_no_old:
|
||||
tst r12,r12
|
||||
beq wgj_no_jobs
|
||||
mov r0, #0
|
||||
wgj_loop:
|
||||
add r0, r0, #1
|
||||
movs r12,r12,lsr #1
|
||||
bxcs lr
|
||||
b wgj_loop
|
||||
|
||||
wgj_no_jobs:
|
||||
mvn r0, #0
|
||||
orr r2, r3, #0x4500
|
||||
str r0, [r2] @ clear all pending interrupts in irq controller's SRCPND register
|
||||
orr r2, r2, #0x0010
|
||||
str r0, [r2] @ clear all pending interrupts in irq controller's INTPND register
|
||||
b wait_for_irq
|
||||
|
||||
.pool
|
||||
|
||||
|
||||
|
||||
|
||||
@ some asm utils are also defined here:
|
||||
.global spend_cycles @ c
|
||||
|
||||
spend_cycles:
|
||||
|
|
@ -135,16 +207,16 @@ spend_cycles:
|
|||
|
||||
|
||||
@ clean-flush function from ARM940T technical reference manual
|
||||
.global cache_clean_flush
|
||||
.global dcache_clean_flush
|
||||
|
||||
cache_clean_flush:
|
||||
dcache_clean_flush:
|
||||
mov r1, #0 @ init line counter
|
||||
ccf_outer_loop:
|
||||
mov r0, #0 @ segment counter
|
||||
ccf_inner_loop:
|
||||
orr r2, r1, r0 @ make segment and line address
|
||||
mcr p15, 0, r2, c7, c14, 2 @ clean and flush that line
|
||||
add r0, r0, #0x10 @ incremet secment counter
|
||||
add r0, r0, #0x10 @ incremet segment counter
|
||||
cmp r0, #0x40 @ complete all 4 segments?
|
||||
bne ccf_inner_loop
|
||||
add r1, r1, #0x04000000 @ increment line counter
|
||||
|
|
@ -153,17 +225,18 @@ ccf_inner_loop:
|
|||
bx lr
|
||||
|
||||
|
||||
@ clean-only version
|
||||
.global cache_clean
|
||||
|
||||
cache_clean:
|
||||
@ clean-only version
|
||||
.global dcache_clean
|
||||
|
||||
dcache_clean:
|
||||
mov r1, #0 @ init line counter
|
||||
cf_outer_loop:
|
||||
mov r0, #0 @ segment counter
|
||||
cf_inner_loop:
|
||||
orr r2, r1, r0 @ make segment and line address
|
||||
mcr p15, 0, r2, c7, c10, 2 @ clean that line
|
||||
add r0, r0, #0x10 @ incremet secment counter
|
||||
add r0, r0, #0x10 @ incremet segment counter
|
||||
cmp r0, #0x40 @ complete all 4 segments?
|
||||
bne cf_inner_loop
|
||||
add r1, r1, #0x04000000 @ increment line counter
|
||||
|
|
@ -172,31 +245,13 @@ cf_inner_loop:
|
|||
bx lr
|
||||
|
||||
|
||||
.global wait_irq
|
||||
|
||||
wait_irq:
|
||||
mov r0, #mmsp2_regs
|
||||
orr r0, r0, #0x3B00
|
||||
orr r1, r0, #0x0042
|
||||
mov r3, #0
|
||||
strh r3, [r1] @ disable interrupts
|
||||
orr r2, r0, #0x003E
|
||||
strh r3, [r2] @ remove busy flag
|
||||
mov r3, #1
|
||||
strh r3, [r1] @ enable interrupts
|
||||
|
||||
mrs r0, cpsr
|
||||
bic r0, r0, #0x80
|
||||
msr cpsr_c, r0 @ enable interrupts
|
||||
@ drain write buffer
|
||||
.global drain_wb
|
||||
|
||||
drain_wb:
|
||||
mov r0, #0
|
||||
mcr p15, 0, r0, c7, c0, 4 @ wait for IRQ
|
||||
@ mcr p15, 0, r0, c15, c8, 2
|
||||
nop
|
||||
nop
|
||||
b .b_reserved
|
||||
|
||||
.pool
|
||||
mcr p15, 0, r0, c7, c10, 4
|
||||
bx lr
|
||||
|
||||
|
||||
.global set_if_not_changed @ int *val, int oldval, int newval
|
||||
|
|
@ -208,4 +263,10 @@ set_if_not_changed:
|
|||
strne r3, [r0] @ restore value which was changed there by other core
|
||||
bx lr
|
||||
|
||||
@ vim:filetype=armasm:
|
||||
|
||||
|
||||
@ pad the protected region.
|
||||
.rept 1024
|
||||
.long 0
|
||||
.endr
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,33 @@
|
|||
#include "../../../Pico/sound/ym2612.h"
|
||||
#include "../helix/pub/mp3dec.h"
|
||||
|
||||
// max 16 jobs
|
||||
enum _940_job_t {
|
||||
JOB940_INITALL = 1,
|
||||
JOB940_INVALIDATE_DCACHE,
|
||||
JOB940_YM2612RESETCHIP,
|
||||
JOB940_YM2612UPDATEONE,
|
||||
JOB940_PICOSTATELOAD,
|
||||
JOB940_MP3DECODE,
|
||||
JOB940_NUMJOBS
|
||||
JOB940_PICOSTATELOAD,
|
||||
};
|
||||
|
||||
#define MAX_940JOBS 2
|
||||
//#define MAX_940JOBS 2
|
||||
|
||||
typedef struct
|
||||
{
|
||||
YM2612 ym2612; /* current state of the emulated YM2612 */
|
||||
YM2612 ym2612; /* current state of the emulated YM2612 */
|
||||
HMP3Decoder mp3dec; /* mp3 decoder's handle */
|
||||
int mix_buffer[44100/50*2]; /* this is where the YM2612 samples will be mixed to */
|
||||
int ym_buffer[44100/50*2]; /* this is where the YM2612 samples will be mixed to */
|
||||
short mp3_buffer[2][1152*2]; /* buffers for mp3 decoder's output */
|
||||
} _940_data_t;
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int jobs[MAX_940JOBS]; /* jobs for second core */
|
||||
int busy_; /* unused */
|
||||
int vstarts[8]; /* debug: 00: number of starts from each of 8 vectors */
|
||||
int last_lr; /* debug: 20: last exception's lr */
|
||||
// int jobs[MAX_940JOBS]; /* jobs for second core */
|
||||
// int busy_; /* unused */
|
||||
int length; /* number of samples to mix (882 max) */
|
||||
int stereo; /* mix samples as stereo, doubles sample count automatically */
|
||||
int baseclock; /* ym2612 settings */
|
||||
|
|
@ -35,11 +38,8 @@ typedef struct
|
|||
int mp3_len; /* data len of loaded mp3 */
|
||||
int mp3_offs; /* current playback offset (just after last decoded frame) */
|
||||
int mp3_buffsel; /* which output buffer to decode to */
|
||||
int vstarts[8]; /* debug: number of starts from each of 8 vectors */
|
||||
int loopc; /* debug: main loop counter */
|
||||
int loopc; /* debug: main loop counter */
|
||||
int mp3_errors; /* debug: mp3 decoder's error counter */
|
||||
int mp3_lasterr; /* debug: mp3 decoder's last error */
|
||||
int last_irq_pc; /* debug: PC value when IRQ happened */
|
||||
int lastjob; /* debug: last job id */
|
||||
int lastbusy; /* debug: */
|
||||
} _940_ctl_t;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue