memory refactoring (mostly for cd) + ARM mem asm update

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@780 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-09-16 21:34:35 +00:00
parent 5e89f0f5ae
commit 0ace9b9aac
10 changed files with 677 additions and 2770 deletions

View file

@ -272,18 +272,10 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
readend:
if (PicoAHW & PAHW_MCD)
{
/* after load events */
if (Pico_mcd->s68k_regs[3] & 4) // 1M mode?
wram_2M_to_1M(Pico_mcd->word_ram2M);
PicoMemRemapCD(Pico_mcd->s68k_regs[3]);
#ifdef _ASM_CD_MEMORY_C
if (Pico_mcd->s68k_regs[3] & 4)
PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
#endif
PicoMemStateLoaded();
if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
cdda_start_play();
// restore hint vector
*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
// must unpack after other CD stuff is loaded
PicoAreaUnpackCpu(buff_s68k, 1);