RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

full ym2612 save/load for 940

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@495 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-06-25 21:53:53 +00:00
parent eaa9417a9b
commit e4fb433cd6
8 changed files with 126 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

39
platform/gp2x/code940/940.c
View file

@ -18,6 +18,8 @@ void drain_wb(void);
// is changed by other core just before we update it
void set_if_not_changed(int *val, int oldval, int newval);
void _memcpy(void *dst, const void *src, int count);
// asm volatile ("mov r0, #0" ::: "r0");
// asm volatile ("mcr p15, 0, r0, c7, c6, 0" ::: "r0"); /* flush dcache */
// asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer */
@ -58,6 +60,26 @@ static void mp3_decode(void)
set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, readPtr - mp3_data);
}
static void ym_flush_writes(void)
{
UINT16 *wbuff;
int i;
if (shared_ctl->writebuffsel == 1) {
wbuff = shared_ctl->writebuff1;
} else {
wbuff = shared_ctl->writebuff0;
}
/* playback all writes */
for (i = 2048; i > 0; i--) {
UINT16 d = *wbuff++;
if (d == 0xffff) break;
if (d == 0xfffe) continue;
YM2612Write_(d >> 8, d);
}
}
static void ym_update(int *ym_buffer)
{
int i, dw;
@ -86,7 +108,8 @@ static void ym_update(int *ym_buffer)
YM2612Write_(d >> 8, d);
}
if (two_upds) {
if (two_upds)
{
int len1 = shared_ctl->length / 2;
shared_ctl->ym_active_chs =
YM2612UpdateOne_(ym_buffer, len1, shared_ctl->stereo, 1);
@ -145,6 +168,20 @@ void Main940(void)
YM2612PicoStateLoad_();
break;
case JOB940_PICOSTATESAVE2:
YM2612PicoStateSave2(0, 0);
_memcpy(shared_ctl->writebuff0, ym2612_940->REGS, 0x200);
break;
case JOB940_PICOSTATELOAD2_PREP:
ym_flush_writes();
break;
case JOB940_PICOSTATELOAD2:
_memcpy(ym2612_940->REGS, shared_ctl->writebuff0, 0x200);
YM2612PicoStateLoad2(0, 0);
break;
case JOB940_YM2612UPDATEONE:
ym_update(ym_buffer);
break;

5
platform/gp2x/code940/940shared.h
View file

@ -1,7 +1,7 @@
#include "../../../Pico/sound/ym2612.h"
#include "../../common/helix/pub/mp3dec.h"
// max 16 jobs
// max 16 jobs, lower num means higher prio
enum _940_job_t {
JOB940_INITALL = 1,
JOB940_INVALIDATE_DCACHE,
@ -9,6 +9,9 @@ enum _940_job_t {
JOB940_YM2612UPDATEONE,
JOB940_MP3DECODE,
JOB940_PICOSTATELOAD,
JOB940_PICOSTATESAVE2,
JOB940_PICOSTATELOAD2_PREP,
JOB940_PICOSTATELOAD2,
};
//#define MAX_940JOBS 2

26
platform/gp2x/code940/Makefile
View file

@ -18,16 +18,16 @@ AS = $(CROSS)as
LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
BIN = pico940_v2.bin
BIN = pico940_v3.bin
all: $(BIN)
.c.o:
@echo $<
@echo ">>>" $<
$(GCC) $(COPT) $(DEFINC) -c $< -o $@
.s.o:
@echo $<
@echo ">>>" $<
$(GCC) $(COPT) $(DEFINC) -c $< -o $@
@ -44,23 +44,23 @@ OBJS940 += uClibc/s_scalbn.o uClibc/s_copysign.o uClibc/k_sin.o uClibc/k_cos.o u
OBJS940 += uClibc/e_rem_pio2.o uClibc/k_rem_pio2.o uClibc/e_log.o uClibc/wrappers.o
$(BIN) : code940.gpe
@echo $@
@$(OBJCOPY) -O binary $< $@
@echo ">>>" $@
$(OBJCOPY) -O binary $< $@
code940.gpe : $(OBJS940) ../../common/helix/helix_mp3.a
@echo $@
@$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map
@echo ">>>" $@
$(LD) -static -e code940 -Ttext 0x0 $^ -L$(lgcc_path) -lgcc -o $@ -Map code940.map
940ym2612.o : ../../../Pico/sound/ym2612.c
@echo $@
@$(GCC) $(COPT) -Os $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
@echo ">>>" $@
$(GCC) $(COPT) -Os $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
mix.o : ../../../Pico/sound/mix.s
@echo $@
@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
@echo ">>>" $@
$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
misc.o : ../../../Pico/Misc.s
@echo $@
@$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
@echo ">>>" $@
$(GCC) $(COPT) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@
../../common/helix/helix_mp3.a:
@make -C ../../common/helix/

21
platform/gp2x/code940/memcpy.s
View file

@ -36,33 +36,23 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/* This was modified by Jay Monkman <jmonkman@smoothsmoothie.com> to
* save and restore r12. This is necessary for RTEMS.
*/
/* #include <machine/asm.h>*/
#define ENTRY(_LABEL) \
.global _LABEL; _LABEL:
.globl memcpy
.globl _memcpy
memcpy:
@ ENTRY(gp2x_memcpy)
stmfd sp!, {r0, r12, lr}
@ bl _gp2x_memcpy
stmfd sp!, {r0, lr}
bl _memcpy
ldmfd sp!, {r0, r12, pc}
ldmfd sp!, {r0, pc}
.globl memmove
memmove:
@ ENTRY(gp2x_memmove)
stmfd sp!, {r0, r12, lr}
@ bl _gp2x_memcpy
stmfd sp!, {r0, lr}
bl _memcpy
ldmfd sp!, {r0, r12, pc}
ldmfd sp!, {r0, pc}
@ -101,7 +91,6 @@ ldmfd sp!, {r0, r12, pc}
_memcpy:
@ ENTRY(_gp2x_memcpy)
/* Determine copy direction */
cmp r1, r0
bcc Lmemcpy_backwards