X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=1a1bb840941f53e4eb6b0a57f48238b674a7c5c8;hb=48e8482fc2d74c9b96e581241390bade986acb22;hp=df015ddd615c18db8471efda549dd0171f4b44c1;hpb=913ef4b7a30287581cce120a643fbed1b4a418b3;p=picodrive.git diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c index df015dd..1a1bb84 100644 --- a/Pico/cd/Memory.c +++ b/Pico/cd/Memory.c @@ -19,21 +19,22 @@ #include "gfx_cd.h" #include "pcm.h" -#include "cell_map.c" - typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; //#define __debug_io //#define __debug_io2 + //#define rdprintf dprintf #define rdprintf(...) +//#define wrdprintf dprintf #define wrdprintf(...) // ----------------------------------------------------------------- +#ifndef _ASM_CD_MEMORY_C static u32 m68k_reg_read16(u32 a) { u32 d=0; @@ -61,8 +62,8 @@ static u32 m68k_reg_read16(u32 a) dprintf("m68k FIXME: reserved read"); goto end; case 0xC: - dprintf("m68k stopwatch timer read"); d = Pico_mcd->m.timer_stopwatch >> 16; + dprintf("m68k stopwatch timer read (%04x)", d); goto end; } @@ -79,8 +80,12 @@ end: // dprintf("ret = %04x", d); return d; } +#endif -static void m68k_reg_write8(u32 a, u32 d) +#ifndef _ASM_CD_MEMORY_C +static +#endif +void m68k_reg_write8(u32 a, u32 d) { a &= 0x3f; // dprintf("m68k_regs w%2i: [%02x] %02x @%06x", realsize, a, d, SekPc); @@ -97,26 +102,38 @@ static void m68k_reg_write8(u32 a, u32 d) if ( (Pico_mcd->m.busreq&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1); if ((Pico_mcd->m.state_flags&1) && (d&3)==1) { SekResetS68k(); // S68k comes out of RESET or BRQ state - Pico_mcd->m.state_flags&=~1; - dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft); + Pico_mcd->m.state_flags&=~1; + dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft); } Pico_mcd->m.busreq = d; return; case 2: Pico_mcd->s68k_regs[2] = d; // really use s68k side register return; - case 3: + case 3: { + u32 dold = Pico_mcd->s68k_regs[3]&0x1f; dprintf("m68k_regs w3: %02x @%06x", (u8)d, SekPc); d &= 0xc2; - if ((Pico_mcd->s68k_regs[3]>>6) != ((d>>6)&3)) + if ((dold>>6) != ((d>>6)&3)) dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3)); //if ((Pico_mcd->s68k_regs[3]&4) != (d&4)) dprintf("m68k: ram mode %i mbit", (d&4) ? 1 : 2); //if ((Pico_mcd->s68k_regs[3]&2) != (d&2)) dprintf("m68k: %s", (d&4) ? ((d&2) ? "word swap req" : "noop?") : // ((d&2) ? "word ram to s68k" : "word ram to m68k")); - d |= Pico_mcd->s68k_regs[3]&0x1d; - if (!(d & 4) && (d & 2)) d &= ~1; // return word RAM to s68k in 2M mode - Pico_mcd->s68k_regs[3] = d; // really use s68k side register + if (dold & 4) { + d ^= 2; // writing 0 to DMNA actually sets it, 1 does nothing + } else { + //dold &= ~2; // ?? + if (d & 2) dold &= ~1; // return word RAM to s68k in 2M mode + } + Pico_mcd->s68k_regs[3] = d | dold; // really use s68k side register + +/* + d |= Pico_mcd->s68k_regs[3]&0x1d; + if (!(d & 4) && (d & 2)) d &= ~1; // return word RAM to s68k in 2M mode + Pico_mcd->s68k_regs[3] = d; // really use s68k side register +*/ return; + } case 6: Pico_mcd->bios[0x72 + 1] = d; // simple hint vector changer return; @@ -150,7 +167,10 @@ static void m68k_reg_write8(u32 a, u32 d) } -static u32 s68k_reg_read16(u32 a) +#ifndef _ASM_CD_MEMORY_C +static +#endif +u32 s68k_reg_read16(u32 a) { u32 d=0; @@ -162,7 +182,7 @@ static u32 s68k_reg_read16(u32 a) goto end; case 2: d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0x1f); - dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPc); + dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k); goto end; case 6: d = CDC_Read_Reg(); @@ -171,11 +191,11 @@ static u32 s68k_reg_read16(u32 a) d = Read_CDC_Host(1); // Gens returns 0 here on byte reads goto end; case 0xC: - dprintf("s68k stopwatch timer read"); d = Pico_mcd->m.timer_stopwatch >> 16; + dprintf("s68k stopwatch timer read (%04x)", d); goto end; case 0x30: - dprintf("s68k int3 timer read"); + dprintf("s68k int3 timer read (%02x%02x)", Pico_mcd->s68k_regs[30], Pico_mcd->s68k_regs[31]); break; case 0x34: // fader d = 0; // no busy bit @@ -203,11 +223,15 @@ end: return d; } -static void s68k_reg_write8(u32 a, u32 d) +#ifndef _ASM_CD_MEMORY_C +static +#endif +void s68k_reg_write8(u32 a, u32 d) { //dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k); // TODO: review against Gens + // Warning: d might have upper bits set switch (a) { case 2: return; // only m68k can change WP @@ -215,20 +239,37 @@ static void s68k_reg_write8(u32 a, u32 d) int dold = Pico_mcd->s68k_regs[3]; dprintf("s68k_regs w3: %02x @%06x", (u8)d, SekPc); d &= 0x1d; + d |= dold&0xc2; if (d&4) { - d |= dold&0xc2; - if ((d ^ dold) & 5) d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit + if ((d ^ dold) & 5) { + d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit +#ifdef _ASM_CD_MEMORY_C + PicoMemResetCD(d); +#endif + } +#ifdef _ASM_CD_MEMORY_C + if ((d ^ dold) & 0x1d) + PicoMemResetCDdecode(d); +#endif if (!(dold & 4)) { dprintf("wram mode 2M->1M"); wram_2M_to_1M(Pico_mcd->word_ram2M); - } + } } else { - d |= Pico_mcd->s68k_regs[3]&0xc3; - if (d&1) d &= ~2; // return word RAM to m68k in 2M mode if (dold & 4) { dprintf("wram mode 1M->2M"); + if (!(d&1)) { // it didn't set the ret bit, which means it doesn't want to give WRAM to m68k + d &= ~3; + d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode + } wram_1M_to_2M(Pico_mcd->word_ram2M); - } +#ifdef _ASM_CD_MEMORY_C + PicoMemResetCD(d); +#endif + } + else + d |= dold&1; + if (d&1) d &= ~2; // return word RAM to m68k in 2M mode } break; } @@ -256,7 +297,7 @@ static void s68k_reg_write8(u32 a, u32 d) return; case 0x31: dprintf("s68k set int3 timer: %02x", d); - Pico_mcd->m.timer_int3 = d << 16; + Pico_mcd->m.timer_int3 = (d & 0xff) << 16; break; case 0x33: // IRQ mask dprintf("s68k irq mask: %02x", d); @@ -293,7 +334,7 @@ static void s68k_reg_write8(u32 a, u32 d) } - +#ifndef _ASM_CD_MEMORY_C static u32 OtherRead16End(u32 a, int realsize) { u32 d=0; @@ -320,12 +361,17 @@ static void OtherWrite8End(u32 a, u32 d, int realsize) #undef _ASM_MEMORY_C #include "../MemoryCmn.c" - +#include "cell_map.c" +#endif // !def _ASM_CD_MEMORY_C // ----------------------------------------------------------------- // Read Rom and read Ram -u8 PicoReadM68k8(u32 a) +//u8 PicoReadM68k8_(u32 a); +#ifdef _ASM_CD_MEMORY_C +u8 PicoReadM68k8(u32 a); +#else +static u8 PicoReadM68k8(u32 a) { u32 d=0; @@ -336,28 +382,12 @@ u8 PicoReadM68k8(u32 a) if (a < 0x20000) { d = *(u8 *)(Pico_mcd->bios+(a^1)); goto end; } // bios // prg RAM - if ((a&0xfe0000)==0x020000) { + if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; d = *(prg_bank+((a^1)&0x1ffff)); goto end; } -#if 0 - if (a == 0x200000 && SekPc == 0xff0b66 && Pico.m.frame_count > 1000) - { - int i; - FILE *ff; - unsigned short *ram = (unsigned short *) Pico.ram; - // unswap and dump RAM - for (i = 0; i < 0x10000/2; i++) - ram[i] = (ram[i]>>8) | (ram[i]<<8); - ff = fopen("ram.bin", "wb"); - fwrite(ram, 1, 0x10000, ff); - fclose(ff); - exit(0); - } -#endif - // word RAM if ((a&0xfc0000)==0x200000) { wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc); @@ -392,9 +422,13 @@ u8 PicoReadM68k8(u32 a) #endif return (u8)d; } +#endif -u16 PicoReadM68k16(u32 a) +#ifdef _ASM_CD_MEMORY_C +u16 PicoReadM68k16(u32 a); +#else +static u16 PicoReadM68k16(u32 a) { u16 d=0; @@ -405,7 +439,7 @@ u16 PicoReadM68k16(u32 a) if (a < 0x20000) { d = *(u16 *)(Pico_mcd->bios+a); goto end; } // bios // prg RAM - if ((a&0xfe0000)==0x020000) { + if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; d = *(u16 *)(prg_bank+(a&0x1fffe)); goto end; @@ -443,9 +477,13 @@ u16 PicoReadM68k16(u32 a) #endif return d; } +#endif -u32 PicoReadM68k32(u32 a) +#ifdef _ASM_CD_MEMORY_C +u32 PicoReadM68k32(u32 a); +#else +static u32 PicoReadM68k32(u32 a) { u32 d=0; @@ -456,7 +494,7 @@ u32 PicoReadM68k32(u32 a) if (a < 0x20000) { u16 *pm=(u16 *)(Pico_mcd->bios+a); d = (pm[0]<<16)|pm[1]; goto end; } // bios // prg RAM - if ((a&0xfe0000)==0x020000) { + if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; u16 *pm=(u16 *)(prg_bank+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; @@ -471,10 +509,10 @@ u32 PicoReadM68k32(u32 a) if (a >= 0x220000) { // cell arranged u32 a1, a2; a1 = (a&2) | (cell_map(a >> 2) << 2); - if (a&2) a2 = cell_map((a+2) >> 2) << 2; - else a2 = a1 + 2; - d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16; - d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2); + if (a&2) a2 = cell_map((a+2) >> 2) << 2; + else a2 = a1 + 2; + d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) << 16; + d |= *(u16 *)(Pico_mcd->word_ram1M[bank]+a2); } else { u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; } @@ -500,12 +538,16 @@ u32 PicoReadM68k32(u32 a) #endif return d; } +#endif // ----------------------------------------------------------------- // Write Ram -void PicoWriteM68k8(u32 a,u8 d) +#ifdef _ASM_CD_MEMORY_C +void PicoWriteM68k8(u32 a,u8 d); +#else +static void PicoWriteM68k8(u32 a,u8 d) { #ifdef __debug_io dprintf("w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc); @@ -522,7 +564,7 @@ void PicoWriteM68k8(u32 a,u8 d) a&=0xffffff; // prg RAM - if ((a&0xfe0000)==0x020000) { + if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; *(u8 *)(prg_bank+((a^1)&0x1ffff))=d; return; @@ -549,9 +591,13 @@ void PicoWriteM68k8(u32 a,u8 d) OtherWrite8(a,d,8); } +#endif -void PicoWriteM68k16(u32 a,u16 d) +#ifdef _ASM_CD_MEMORY_C +void PicoWriteM68k16(u32 a,u16 d); +#else +static void PicoWriteM68k16(u32 a,u16 d) { #ifdef __debug_io dprintf("w16: %06x, %04x", a&0xffffff, d); @@ -566,7 +612,7 @@ void PicoWriteM68k16(u32 a,u16 d) a&=0xfffffe; // prg RAM - if ((a&0xfe0000)==0x020000) { + if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; *(u16 *)(prg_bank+(a&0x1fffe))=d; return; @@ -593,9 +639,13 @@ void PicoWriteM68k16(u32 a,u16 d) OtherWrite16(a,d); } +#endif -void PicoWriteM68k32(u32 a,u32 d) +#ifdef _ASM_CD_MEMORY_C +void PicoWriteM68k32(u32 a,u32 d); +#else +static void PicoWriteM68k32(u32 a,u32 d) { #ifdef __debug_io dprintf("w32: %06x, %08x", a&0xffffff, d); @@ -612,7 +662,7 @@ void PicoWriteM68k32(u32 a,u32 d) a&=0xfffffe; // prg RAM - if ((a&0xfe0000)==0x020000) { + if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; u16 *pm=(u16 *)(prg_bank+(a&0x1fffe)); pm[0]=(u16)(d>>16); pm[1]=(u16)d; @@ -628,10 +678,10 @@ void PicoWriteM68k32(u32 a,u32 d) if (a >= 0x220000) { // cell arranged u32 a1, a2; a1 = (a&2) | (cell_map(a >> 2) << 2); - if (a&2) a2 = cell_map((a+2) >> 2) << 2; - else a2 = a1 + 2; - *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) = d >> 16; - *(u16 *)(Pico_mcd->word_ram1M[bank]+a2) = d; + if (a&2) a2 = cell_map((a+2) >> 2) << 2; + else a2 = a1 + 2; + *(u16 *)(Pico_mcd->word_ram1M[bank]+a1) = d >> 16; + *(u16 *)(Pico_mcd->word_ram1M[bank]+a2) = d; } else { u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); pm[0]=(u16)(d>>16); pm[1]=(u16)d; @@ -650,12 +700,15 @@ void PicoWriteM68k32(u32 a,u32 d) OtherWrite16(a, (u16)(d>>16)); OtherWrite16(a+2,(u16)d); } +#endif // ----------------------------------------------------------------- - -u8 PicoReadS68k8(u32 a) +#ifdef _ASM_CD_MEMORY_C +u8 PicoReadS68k8(u32 a); +#else +static u8 PicoReadS68k8(u32 a) { u32 d=0; @@ -698,11 +751,11 @@ u8 PicoReadS68k8(u32 a) } // word RAM (1M area) - if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff + if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; wrdprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k); - if (!(Pico_mcd->s68k_regs[3]&4)) - dprintf("s68k_wram1M FIXME: wrong mode"); +// if (!(Pico_mcd->s68k_regs[3]&4)) +// dprintf("s68k_wram1M FIXME: wrong mode"); bank = !(Pico_mcd->s68k_regs[3]&1); d = Pico_mcd->word_ram1M[bank][(a^1)&0x1ffff]; wrdprintf("ret = %02x", (u8)d); @@ -739,9 +792,14 @@ u8 PicoReadS68k8(u32 a) #endif return (u8)d; } +#endif -u16 PicoReadS68k16(u32 a) +//u16 PicoReadS68k16_(u32 a); +#ifdef _ASM_CD_MEMORY_C +u16 PicoReadS68k16(u32 a); +#else +static u16 PicoReadS68k16(u32 a) { u32 d=0; @@ -781,11 +839,11 @@ u16 PicoReadS68k16(u32 a) } // word RAM (1M area) - if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff + if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; wrdprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k); - if (!(Pico_mcd->s68k_regs[3]&4)) - dprintf("s68k_wram1M FIXME: wrong mode"); +// if (!(Pico_mcd->s68k_regs[3]&4)) +// dprintf("s68k_wram1M FIXME: wrong mode"); bank = !(Pico_mcd->s68k_regs[3]&1); d = *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); wrdprintf("ret = %04x", d); @@ -794,17 +852,17 @@ u16 PicoReadS68k16(u32 a) // bram if ((a&0xff0000)==0xfe0000) { - dprintf("s68k_bram r16: [%06x] @%06x", a, SekPcS68k); + dprintf("FIXME: s68k_bram r16: [%06x] @%06x", a, SekPcS68k); a = (a>>1)&0x1fff; d = Pico_mcd->bram[a++]; // Gens does little endian here, and so do we.. - d|= Pico_mcd->bram[a++] << 8; + d|= Pico_mcd->bram[a++] << 8; // This is most likely wrong dprintf("ret = %04x", d); goto end; } // PCM if ((a&0xff8000)==0xff0000) { - dprintf("s68k_pcm r16: [%06x] @%06x", a, SekPcS68k); + dprintf("FIXME: s68k_pcm r16: [%06x] @%06x", a, SekPcS68k); a &= 0x7fff; if (a >= 0x2000) d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff]; @@ -826,9 +884,13 @@ u16 PicoReadS68k16(u32 a) #endif return d; } +#endif -u32 PicoReadS68k32(u32 a) +#ifdef _ASM_CD_MEMORY_C +u32 PicoReadS68k32(u32 a); +#else +static u32 PicoReadS68k32(u32 a) { u32 d=0; @@ -871,11 +933,11 @@ u32 PicoReadS68k32(u32 a) } // word RAM (1M area) - if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff + if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k); - if (!(Pico_mcd->s68k_regs[3]&4)) - dprintf("s68k_wram1M FIXME: wrong mode"); +// if (!(Pico_mcd->s68k_regs[3]&4)) +// dprintf("s68k_wram1M FIXME: wrong mode"); bank = !(Pico_mcd->s68k_regs[3]&1); u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; wrdprintf("ret = %08x", d); @@ -884,7 +946,7 @@ u32 PicoReadS68k32(u32 a) // PCM if ((a&0xff8000)==0xff0000) { - dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k); + dprintf("FIXME: s68k_pcm r32: [%06x] @%06x", a, SekPcS68k); a &= 0x7fff; if (a >= 0x2000) { a >>= 1; @@ -907,7 +969,7 @@ u32 PicoReadS68k32(u32 a) // bram if ((a&0xff0000)==0xfe0000) { - dprintf("s68k_bram r32: [%06x] @%06x", a, SekPcS68k); + dprintf("FIXME: s68k_bram r32: [%06x] @%06x", a, SekPcS68k); a = (a>>1)&0x1fff; d = Pico_mcd->bram[a++] << 16; // middle endian? TODO: verify against Fusion.. d|= Pico_mcd->bram[a++] << 24; @@ -926,17 +988,87 @@ u32 PicoReadS68k32(u32 a) #endif return d; } +#endif + + +/* check: jaguar xj 220 (draws entire world using decode) */ +static void decode_write8(u32 a, u8 d, int r3) +{ + u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff); + u8 oldmask = (a&1) ? 0xf0 : 0x0f; + + r3 &= 0x18; + d &= 0x0f; + if (!(a&1)) d <<= 4; + + //dprintf("FIXME: decode, r3 = %02x", r3); + + if (r3 == 8) { + if ((!(*pd & (~oldmask))) && d) goto do_it; + } else if (r3 > 8) { + if (d) goto do_it; + } else { + goto do_it; + } + + return; +do_it: + *pd = d | (*pd & oldmask); +} + + +static void decode_write16(u32 a, u16 d, int r3) +{ + u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff); + + //if ((a & 0x3ffff) < 0x28000) return; + + r3 &= 0x18; + d &= 0x0f0f; + d |= d >> 4; + + if (r3 == 8) { + u8 dold = *pd; + if (!(dold & 0xf0)) dold |= d & 0xf0; + if (!(dold & 0x0f)) dold |= d & 0x0f; + *pd = dold; + } else if (r3 > 8) { + u8 dold = *pd; + if (!(d & 0xf0)) d |= dold & 0xf0; + if (!(d & 0x0f)) d |= dold & 0x0f; + *pd = d; + } else { + *pd = d; + } + + //dprintf("FIXME: decode"); +} // ----------------------------------------------------------------- -void PicoWriteS68k8(u32 a,u8 d) +//void PicoWriteS68k8_(u32 a,u8 d); +//void PicoWriteS68k8__(u32 a,u8 d); +#ifdef _ASM_CD_MEMORY_C +void PicoWriteS68k8(u32 a,u8 d); +#else +static void PicoWriteS68k8(u32 a,u8 d) { #ifdef __debug_io2 dprintf("s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); #endif a&=0xffffff; +#if 0 + PicoWriteS68k8_(a, d); +/* if ((a&0xfc0000)!=0x080000) { + PicoWriteS68k8_(a, d); + return; + } + printf("r3: %02x\n", Pico_mcd->s68k_regs[3]); + PicoWriteS68k8__(a,d);*/ + return; +#endif // prg RAM if (a < 0x80000) { @@ -950,20 +1082,17 @@ void PicoWriteS68k8(u32 a,u8 d) a &= 0x1ff; rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k); if (a >= 0x58 && a < 0x68) - gfx_cd_write(a&~1, (d<<8)|d); + gfx_cd_write16(a&~1, (d<<8)|d); else s68k_reg_write8(a,d); return; } // word RAM (2M area) if ((a&0xfc0000)==0x080000) { // 080000-0bffff + int r3 = Pico_mcd->s68k_regs[3]; wrdprintf("s68k_wram2M w8: [%06x] %02x @%06x", a, d, SekPcS68k); - if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode? - int bank = !(Pico_mcd->s68k_regs[3]&1); - if (a&1) d &= 0x0f; - else d >>= 4; - Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff]=d; - dprintf("FIXME: decode"); + if (r3 & 4) { // 1M decode mode? + decode_write8(a, d, r3); } else { // allow access in any mode, like Gens does *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff))=d; @@ -972,12 +1101,13 @@ void PicoWriteS68k8(u32 a,u8 d) } // word RAM (1M area) - if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff + if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff + // Wing Commander tries to write here in wrong mode int bank; if (d) wrdprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k); - if (!(Pico_mcd->s68k_regs[3]&4)) - dprintf("s68k_wram1M FIXME: wrong mode"); +// if (!(Pico_mcd->s68k_regs[3]&4)) +// dprintf("s68k_wram1M FIXME: wrong mode"); bank = !(Pico_mcd->s68k_regs[3]&1); *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff))=d; return; @@ -1002,9 +1132,13 @@ void PicoWriteS68k8(u32 a,u8 d) dprintf("s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); } +#endif -void PicoWriteS68k16(u32 a,u16 d) +#ifdef _ASM_CD_MEMORY_C +void PicoWriteS68k16(u32 a,u16 d); +#else +static void PicoWriteS68k16(u32 a,u16 d) { #ifdef __debug_io2 dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); @@ -1023,11 +1157,11 @@ void PicoWriteS68k16(u32 a,u16 d) a &= 0x1fe; rdprintf("s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k); if (a >= 0x58 && a < 0x68) - gfx_cd_write(a, d); + gfx_cd_write16(a, d); else { if (a == 0xe) { // special case, 2 byte writes would be handled differently Pico_mcd->s68k_regs[0xf] = d; - return; + return; } s68k_reg_write8(a, d>>8); s68k_reg_write8(a+1,d&0xff); @@ -1037,12 +1171,10 @@ void PicoWriteS68k16(u32 a,u16 d) // word RAM (2M area) if ((a&0xfc0000)==0x080000) { // 080000-0bffff + int r3 = Pico_mcd->s68k_regs[3]; wrdprintf("s68k_wram2M w16: [%06x] %04x @%06x", a, d, SekPcS68k); - if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode? - int bank = !(Pico_mcd->s68k_regs[3]&1); - d &= ~0xf0; d |= d >> 8; - Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff] = d; - dprintf("FIXME: decode"); + if (r3 & 4) { // 1M decode mode? + decode_write16(a, d, r3); } else { // allow access in any mode, like Gens does *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe))=d; @@ -1051,12 +1183,12 @@ void PicoWriteS68k16(u32 a,u16 d) } // word RAM (1M area) - if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff + if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; if (d) wrdprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k); - if (!(Pico_mcd->s68k_regs[3]&4)) - dprintf("s68k_wram1M FIXME: wrong mode"); +// if (!(Pico_mcd->s68k_regs[3]&4)) +// dprintf("s68k_wram1M FIXME: wrong mode"); bank = !(Pico_mcd->s68k_regs[3]&1); *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe))=d; return; @@ -1084,9 +1216,13 @@ void PicoWriteS68k16(u32 a,u16 d) dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); } +#endif -void PicoWriteS68k32(u32 a,u32 d) +#ifdef _ASM_CD_MEMORY_C +void PicoWriteS68k32(u32 a,u32 d); +#else +static void PicoWriteS68k32(u32 a,u32 d) { #ifdef __debug_io2 dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); @@ -1106,8 +1242,8 @@ void PicoWriteS68k32(u32 a,u32 d) a &= 0x1fe; rdprintf("s68k_regs w32: [%02x] %08x @ %06x", a, d, SekPcS68k); if (a >= 0x58 && a < 0x68) { - gfx_cd_write(a, d>>16); - gfx_cd_write(a+2, d&0xffff); + gfx_cd_write16(a, d>>16); + gfx_cd_write16(a+2, d&0xffff); } else { s68k_reg_write8(a, d>>24); s68k_reg_write8(a+1,(d>>16)&0xff); @@ -1119,14 +1255,11 @@ void PicoWriteS68k32(u32 a,u32 d) // word RAM (2M area) if ((a&0xfc0000)==0x080000) { // 080000-0bffff + int r3 = Pico_mcd->s68k_regs[3]; wrdprintf("s68k_wram2M w32: [%06x] %08x @%06x", a, d, SekPcS68k); - if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode? - int bank = !(Pico_mcd->s68k_regs[3]&1); - a >>= 1; - d &= 0x0f0f0f0f; d |= d >> 4; - Pico_mcd->word_ram1M[bank][((a+0)^1)&0x1ffff] = d >> 16; - Pico_mcd->word_ram1M[bank][((a+1)^1)&0x1ffff] = d; - dprintf("FIXME: decode"); + if (r3 & 4) { // 1M decode mode? + decode_write16(a , d >> 16, r3); + decode_write16(a+2, d , r3); } else { // allow access in any mode, like Gens does u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); @@ -1136,13 +1269,13 @@ void PicoWriteS68k32(u32 a,u32 d) } // word RAM (1M area) - if ((a&0xfe0000)==0x0c0000) { // 0c0000-0dffff + if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; u16 *pm; if (d) wrdprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k); - if (!(Pico_mcd->s68k_regs[3]&4)) - dprintf("s68k_wram1M FIXME: wrong mode"); +// if (!(Pico_mcd->s68k_regs[3]&4)) +// dprintf("s68k_wram1M FIXME: wrong mode"); bank = !(Pico_mcd->s68k_regs[3]&1); pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); pm[0]=(u16)(d>>16); pm[1]=(u16)d; @@ -1178,7 +1311,7 @@ void PicoWriteS68k32(u32 a,u32 d) dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); } - +#endif // -----------------------------------------------------------------