X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=b1faacdfa25b5a69468a85fa8af60ef07fe7d60e;hb=dca310c413517d278898b967cfe610574310acd8;hp=360c0cf596c0e2c09fddedf6da85aef855debb82;hpb=b5e5172d049a83251874fb33e65a53c9654dc0bc;p=picodrive.git diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c index 360c0cf..b1faacd 100644 --- a/Pico/cd/Memory.c +++ b/Pico/cd/Memory.c @@ -3,8 +3,6 @@ // (c) Copyright 2007, Grazvydas "notaz" Ignotas -//#define __debug_io - #include "../PicoInt.h" #include "../sound/ym2612.h" @@ -20,15 +18,15 @@ typedef unsigned int u32; #define UTYPES_DEFINED #endif -//#define __debug_io -//#define __debug_io2 - +#ifdef _MSC_VER +#define rdprintf +#define wrdprintf +#else //#define rdprintf dprintf #define rdprintf(...) //#define wrdprintf dprintf #define wrdprintf(...) -#define plprintf dprintf -//#define plprintf(...) +#endif #ifdef EMU_CORE_DEBUG extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16]; @@ -71,7 +69,7 @@ static u32 m68k_reg_read16(u32 a) d = Read_CDC_Host(0); goto end; case 0xA: - dprintf("m68k FIXME: reserved read"); + elprintf(EL_UIO, "m68k FIXME: reserved read"); goto end; case 0xC: d = Pico_mcd->m.timer_stopwatch >> 16; @@ -85,11 +83,10 @@ static u32 m68k_reg_read16(u32 a) goto end; } - dprintf("m68k_regs FIXME invalid read @ %02x", a); + elprintf(EL_UIO, "m68k_regs FIXME invalid read @ %02x", a); end: - // dprintf("ret = %04x", d); return d; } #endif @@ -105,7 +102,7 @@ void m68k_reg_write8(u32 a, u32 d) switch (a) { case 0: d &= 1; - if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { dprintf("m68k: s68k irq 2"); SekInterruptS68k(2); } + if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { elprintf(EL_INTS, "m68k: s68k irq 2"); SekInterruptS68k(2); } return; case 1: d &= 3; @@ -149,7 +146,7 @@ void m68k_reg_write8(u32 a, u32 d) #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - plprintf("s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -169,7 +166,7 @@ void m68k_reg_write8(u32 a, u32 d) #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - plprintf("s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -180,13 +177,13 @@ void m68k_reg_write8(u32 a, u32 d) #ifdef USE_POLL_DETECT if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - plprintf("s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; } - dprintf("m68k FIXME: invalid write? [%02x] %02x", a, d); + elprintf(EL_UIO, "m68k FIXME: invalid write? [%02x] %02x", a, d); } #ifndef _ASM_CD_MEMORY_C @@ -195,6 +192,8 @@ static u32 s68k_poll_detect(u32 a, u32 d) { #ifdef USE_POLL_DETECT + // needed mostly for Cyclone, which doesn't always check it's cycle counter + if (SekIsStoppedS68k()) return d; // polling detection if (a == (s68k_poll_adclk&0xff)) { unsigned int clkdiff = SekCyclesDoneS68k() - (s68k_poll_adclk>>8); @@ -203,7 +202,7 @@ u32 s68k_poll_detect(u32 a, u32 d) //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt); if (s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(1); - plprintf("s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a); + elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x", SekPcS68k, a); } s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a; return d; @@ -374,7 +373,7 @@ void s68k_reg_write8(u32 a, u32 d) if ((a&0x1f0) == 0x10 || (a >= 0x38 && a < 0x42)) { - dprintf("s68k FIXME: invalid write @ %02x?", a); + elprintf(EL_UIO, "s68k FIXME: invalid write @ %02x?", a); return; } @@ -382,35 +381,72 @@ void s68k_reg_write8(u32 a, u32 d) } -#ifndef _ASM_CD_MEMORY_C static u32 OtherRead16End(u32 a, int realsize) { u32 d=0; +#ifndef _ASM_CD_MEMORY_C if ((a&0xffffc0)==0xa12000) { d=m68k_reg_read16(a); goto end; } - dprintf("m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc); + if (a==0x400000) { + if (SRam.data != NULL) d=3; // 64k cart + goto end; + } + + if ((a&0xfe0000)==0x600000) { + if (SRam.data != NULL) { + d=SRam.data[((a>>1)&0xffff)+0x2000]; + if (realsize == 8) d|=d<<8; + } + goto end; + } + if (a==0x7ffffe) { + d=Pico_mcd->m.bcram_reg; + goto end; + } +#endif + + elprintf(EL_UIO, "m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc); + +#ifndef _ASM_CD_MEMORY_C end: +#endif return d; } static void OtherWrite8End(u32 a, u32 d, int realsize) { +#ifndef _ASM_CD_MEMORY_C if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; } - dprintf("m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc); + if ((a&0xfe0000)==0x600000) { + if (SRam.data != NULL && (Pico_mcd->m.bcram_reg&1)) { + SRam.data[((a>>1)&0xffff)+0x2000]=d; + SRam.changed = 1; + } + return; + } + + if (a==0x7fffff) { + Pico_mcd->m.bcram_reg=d; + return; + } +#endif + + elprintf(EL_UIO, "m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc); } +#ifndef _ASM_CD_MEMORY_C #define _CD_MEMORY_C #undef _ASM_MEMORY_C #include "../MemoryCmn.c" #include "cell_map.c" -#endif // !def _ASM_CD_MEMORY_C +#endif // ----------------------------------------------------------------- @@ -419,55 +455,78 @@ static void OtherWrite8End(u32 a, u32 d, int realsize) #ifdef _ASM_CD_MEMORY_C u32 PicoReadM68k8(u32 a); #else -static u32 PicoReadM68k8(u32 a) +u32 PicoReadM68k8(u32 a) { u32 d=0; - if ((a&0xe00000)==0xe00000) { d = *(u8 *)(Pico.ram+((a^1)&0xffff)); goto end; } // Ram - a&=0xffffff; - if (a < 0x20000) { d = *(u8 *)(Pico_mcd->bios+(a^1)); goto end; } // bios + switch (a >> 17) + { + case 0x00>>1: // BIOS: 000000 - 020000 + d = *(u8 *)(Pico_mcd->bios+(a^1)); + break; + case 0x02>>1: // prg RAM + if ((Pico_mcd->m.busreq&3)!=1) { + u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; + d = *(prg_bank+((a^1)&0x1ffff)); + } + break; + case 0x20>>1: // word RAM: 200000 - 220000 + wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc); + a &= 0x1ffff; + if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? + int bank = Pico_mcd->s68k_regs[3]&1; + d = Pico_mcd->word_ram1M[bank][a^1]; + } else { + // allow access in any mode, like Gens does + d = Pico_mcd->word_ram2M[a^1]; + } + wrdprintf("ret = %02x", (u8)d); + break; + case 0x22>>1: // word RAM: 220000 - 240000 + wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc); + if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? + int bank = Pico_mcd->s68k_regs[3]&1; + a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged + d = Pico_mcd->word_ram1M[bank][a^1]; + } else { + // allow access in any mode, like Gens does + d = Pico_mcd->word_ram2M[(a^1)&0x3ffff]; + } + wrdprintf("ret = %02x", (u8)d); + break; + case 0xc0>>1: case 0xc2>>1: case 0xc4>>1: case 0xc6>>1: + case 0xc8>>1: case 0xca>>1: case 0xcc>>1: case 0xce>>1: + case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1: + case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1: + // VDP + if ((a&0xe700e0)==0xc00000) { + d=PicoVideoRead(a); + if ((a&1)==0) d>>=8; + } + break; + case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1: + case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1: + case 0xf0>>1: case 0xf2>>1: case 0xf4>>1: case 0xf6>>1: + case 0xf8>>1: case 0xfa>>1: case 0xfc>>1: case 0xfe>>1: + // RAM: + d = *(u8 *)(Pico.ram+((a^1)&0xffff)); + break; + default: + if ((a&0xff4000)==0xa00000) { d=z80Read8(a); break; } // Z80 Ram + if ((a&0xffffc0)==0xa12000) + rdprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc); - // prg RAM - if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) { - u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; - d = *(prg_bank+((a^1)&0x1ffff)); - goto end; - } + d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8; - // word RAM - if ((a&0xfc0000)==0x200000) { - wrdprintf("m68k_wram r8: [%06x] @%06x", a, SekPc); - if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? - int bank = Pico_mcd->s68k_regs[3]&1; - if (a >= 0x220000) - a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged - else a &= 0x1ffff; - d = Pico_mcd->word_ram1M[bank][a^1]; - } else { - // allow access in any mode, like Gens does - d = Pico_mcd->word_ram2M[(a^1)&0x3ffff]; - } - wrdprintf("ret = %02x", (u8)d); - goto end; + if ((a&0xffffc0)==0xa12000) + rdprintf("ret = %02x", (u8)d); + break; } - if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram - - if ((a&0xffffc0)==0xa12000) - rdprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc); - - d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8; - - if ((a&0xffffc0)==0xa12000) - rdprintf("ret = %02x", (u8)d); - end: - -#ifdef __debug_io - dprintf("r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc); -#endif + elprintf(EL_IO, "r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc); #ifdef EMU_CORE_DEBUG if (a>=Pico.romsize) { lastread_a = a; @@ -486,51 +545,73 @@ static u32 PicoReadM68k16(u32 a) { u32 d=0; - if ((a&0xe00000)==0xe00000) { d=*(u16 *)(Pico.ram+(a&0xfffe)); goto end; } // Ram - a&=0xfffffe; - if (a < 0x20000) { d = *(u16 *)(Pico_mcd->bios+a); goto end; } // bios + switch (a >> 17) + { + case 0x00>>1: // BIOS: 000000 - 020000 + d = *(u16 *)(Pico_mcd->bios+a); + break; + case 0x02>>1: // prg RAM + if ((Pico_mcd->m.busreq&3)!=1) { + u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; + wrdprintf("m68k_prgram r16: [%i,%06x] @%06x", Pico_mcd->s68k_regs[3]>>6, a, SekPc); + d = *(u16 *)(prg_bank+(a&0x1fffe)); + wrdprintf("ret = %04x", d); + } + break; + case 0x20>>1: // word RAM: 200000 - 220000 + wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc); + a &= 0x1fffe; + if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? + int bank = Pico_mcd->s68k_regs[3]&1; + d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a); + } else { + // allow access in any mode, like Gens does + d = *(u16 *)(Pico_mcd->word_ram2M+a); + } + wrdprintf("ret = %04x", d); + break; + case 0x22>>1: // word RAM: 220000 - 240000 + wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc); + if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? + int bank = Pico_mcd->s68k_regs[3]&1; + a = (a&2) | (cell_map(a >> 2) << 2); // cell arranged + d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a); + } else { + // allow access in any mode, like Gens does + d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); + } + wrdprintf("ret = %04x", d); + break; + case 0xc0>>1: case 0xc2>>1: case 0xc4>>1: case 0xc6>>1: + case 0xc8>>1: case 0xca>>1: case 0xcc>>1: case 0xce>>1: + case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1: + case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1: + // VDP + if ((a&0xe700e0)==0xc00000) + d=PicoVideoRead(a); + break; + case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1: + case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1: + case 0xf0>>1: case 0xf2>>1: case 0xf4>>1: case 0xf6>>1: + case 0xf8>>1: case 0xfa>>1: case 0xfc>>1: case 0xfe>>1: + // RAM: + d=*(u16 *)(Pico.ram+(a&0xfffe)); + break; + default: + if ((a&0xffffc0)==0xa12000) + rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc); - // prg RAM - if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) { - u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; - wrdprintf("m68k_prgram r16: [%i,%06x] @%06x", Pico_mcd->s68k_regs[3]>>6, a, SekPc); - d = *(u16 *)(prg_bank+(a&0x1fffe)); - wrdprintf("ret = %04x", d); - goto end; - } + d = OtherRead16(a, 16); - // word RAM - if ((a&0xfc0000)==0x200000) { - wrdprintf("m68k_wram r16: [%06x] @%06x", a, SekPc); - if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? - int bank = Pico_mcd->s68k_regs[3]&1; - if (a >= 0x220000) - a = (a&2) | (cell_map(a >> 2) << 2); // cell arranged - else a &= 0x1fffe; - d = *(u16 *)(Pico_mcd->word_ram1M[bank]+a); - } else { - // allow access in any mode, like Gens does - d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); - } - wrdprintf("ret = %04x", d); - goto end; + if ((a&0xffffc0)==0xa12000) + rdprintf("ret = %04x", d); + break; } - if ((a&0xffffc0)==0xa12000) - rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc); - - d = OtherRead16(a, 16); - if ((a&0xffffc0)==0xa12000) - rdprintf("ret = %04x", d); - - end: - -#ifdef __debug_io - dprintf("r16: %06x, %04x @%06x", a&0xffffff, d, SekPc); -#endif + elprintf(EL_IO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc); #ifdef EMU_CORE_DEBUG if (a>=Pico.romsize) { lastread_a = a; @@ -549,55 +630,82 @@ static u32 PicoReadM68k32(u32 a) { u32 d=0; - if ((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); d = (pm[0]<<16)|pm[1]; goto end; } // Ram - a&=0xfffffe; - 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 && (Pico_mcd->m.busreq&3)!=1) { - 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]; - goto end; - } - - // word RAM - if ((a&0xfc0000)==0x200000) { - wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc); - if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? - int bank = Pico_mcd->s68k_regs[3]&1; - if (a >= 0x220000) { // cell arranged + switch (a >> 17) + { + case 0x00>>1: { // BIOS: 000000 - 020000 + u16 *pm=(u16 *)(Pico_mcd->bios+a); + d = (pm[0]<<16)|pm[1]; + break; + } + case 0x02>>1: // prg RAM + if ((Pico_mcd->m.busreq&3)!=1) { + 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]; + } + break; + case 0x20>>1: // word RAM: 200000 - 220000 + wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc); + a&=0x1fffe; + if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? + int bank = Pico_mcd->s68k_regs[3]&1; + u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+a); + d = (pm[0]<<16)|pm[1]; + } else { + // allow access in any mode, like Gens does + u16 *pm=(u16 *)(Pico_mcd->word_ram2M+a); + d = (pm[0]<<16)|pm[1]; + } + wrdprintf("ret = %08x", d); + break; + case 0x22>>1: // word RAM: 220000 - 240000 + wrdprintf("m68k_wram r32: [%06x] @%06x", a, SekPc); + if (Pico_mcd->s68k_regs[3]&4) { // 1M mode, cell arranged? u32 a1, a2; + int bank = Pico_mcd->s68k_regs[3]&1; 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); } else { - u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; + // allow access in any mode, like Gens does + u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); + d = (pm[0]<<16)|pm[1]; } - } else { - // allow access in any mode, like Gens does - u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); d = (pm[0]<<16)|pm[1]; + wrdprintf("ret = %08x", d); + break; + case 0xc0>>1: case 0xc2>>1: case 0xc4>>1: case 0xc6>>1: + case 0xc8>>1: case 0xca>>1: case 0xcc>>1: case 0xce>>1: + case 0xd0>>1: case 0xd2>>1: case 0xd4>>1: case 0xd6>>1: + case 0xd8>>1: case 0xda>>1: case 0xdc>>1: case 0xde>>1: + // VDP + d = (PicoVideoRead(a)<<16)|PicoVideoRead(a+2); + break; + case 0xe0>>1: case 0xe2>>1: case 0xe4>>1: case 0xe6>>1: + case 0xe8>>1: case 0xea>>1: case 0xec>>1: case 0xee>>1: + case 0xf0>>1: case 0xf2>>1: case 0xf4>>1: case 0xf6>>1: + case 0xf8>>1: case 0xfa>>1: case 0xfc>>1: case 0xfe>>1: { + // RAM: + u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); + d = (pm[0]<<16)|pm[1]; + break; } - wrdprintf("ret = %08x", d); - goto end; - } + default: + if ((a&0xffffc0)==0xa12000) + rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc); - if ((a&0xffffc0)==0xa12000) - rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc); + d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32); - d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32); + if ((a&0xffffc0)==0xa12000) + rdprintf("ret = %08x", d); + break; + } - if ((a&0xffffc0)==0xa12000) - rdprintf("ret = %08x", d); - end: -#ifdef __debug_io - dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc); -#endif + elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc); #ifdef EMU_CORE_DEBUG if (a>=Pico.romsize) { lastread_a = a; @@ -614,11 +722,9 @@ static u32 PicoReadM68k32(u32 a) #ifdef _ASM_CD_MEMORY_C void PicoWriteM68k8(u32 a,u8 d); #else -static void PicoWriteM68k8(u32 a,u8 d) +void PicoWriteM68k8(u32 a,u8 d) { -#ifdef __debug_io - dprintf("w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc); -#endif + elprintf(EL_IO, "w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc); #ifdef EMU_CORE_DEBUG lastwrite_cyc_d[lwp_cyc++&15] = d; #endif @@ -628,8 +734,6 @@ static void PicoWriteM68k8(u32 a,u8 d) return; } - a&=0xffffff; - // prg RAM if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; @@ -637,6 +741,8 @@ static void PicoWriteM68k8(u32 a,u8 d) return; } + a&=0xffffff; + // word RAM if ((a&0xfc0000)==0x200000) { wrdprintf("m68k_wram w8: [%06x] %02x @%06x", a, d, SekPc); @@ -669,9 +775,7 @@ void PicoWriteM68k16(u32 a,u16 d); #else static void PicoWriteM68k16(u32 a,u16 d) { -#ifdef __debug_io - dprintf("w16: %06x, %04x", a&0xffffff, d); -#endif + elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d); #ifdef EMU_CORE_DEBUG lastwrite_cyc_d[lwp_cyc++&15] = d; #endif @@ -681,8 +785,6 @@ static void PicoWriteM68k16(u32 a,u16 d) return; } - a&=0xfffffe; - // prg RAM if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; @@ -691,6 +793,8 @@ static void PicoWriteM68k16(u32 a,u16 d) return; } + a&=0xfffffe; + // word RAM if ((a&0xfc0000)==0x200000) { wrdprintf("m68k_wram w16: [%06x] %04x @%06x", a, d, SekPc); @@ -715,7 +819,7 @@ static void PicoWriteM68k16(u32 a,u16 d) #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; - plprintf("s68k poll release, a=%02x\n", a); + elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a); } #endif return; @@ -725,6 +829,12 @@ static void PicoWriteM68k16(u32 a,u16 d) return; } + // VDP + if ((a&0xe700e0)==0xc00000) { + PicoVideoWrite(a,(u16)d); + return; + } + OtherWrite16(a,d); } #endif @@ -735,9 +845,7 @@ void PicoWriteM68k32(u32 a,u32 d); #else static void PicoWriteM68k32(u32 a,u32 d) { -#ifdef __debug_io - dprintf("w32: %06x, %08x", a&0xffffff, d); -#endif + elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d); #ifdef EMU_CORE_DEBUG lastwrite_cyc_d[lwp_cyc++&15] = d; #endif @@ -750,8 +858,6 @@ static void PicoWriteM68k32(u32 a,u32 d) return; } - a&=0xfffffe; - // prg RAM if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) { u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6]; @@ -760,6 +866,8 @@ static void PicoWriteM68k32(u32 a,u32 d) return; } + a&=0xfffffe; + // word RAM if ((a&0xfc0000)==0x200000) { if (d != 0) // don't log clears @@ -790,6 +898,14 @@ static void PicoWriteM68k32(u32 a,u32 d) if ((a&0x3e) == 0xe) dprintf("m68k FIXME: w32 [%02x]", a&0x3f); } + // VDP + if ((a&0xe700e0)==0xc00000) + { + PicoVideoWrite(a, (u16)(d>>16)); + PicoVideoWrite(a+2,(u16)d); + return; + } + OtherWrite16(a, (u16)(d>>16)); OtherWrite16(a+2,(u16)d); } @@ -845,7 +961,6 @@ static u32 PicoReadS68k8(u32 a) d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff]; if (a&1) d &= 0x0f; else d >>= 4; - dprintf("FIXME: decode"); } else { // allow access in any mode, like Gens does d = Pico_mcd->word_ram2M[(a^1)&0x3ffff]; @@ -868,7 +983,7 @@ static u32 PicoReadS68k8(u32 a) // PCM if ((a&0xff8000)==0xff0000) { - dprintf("s68k_pcm r8: [%06x] @%06x", a, SekPcS68k); + elprintf(EL_IO, "s68k_pcm r8: [%06x] @%06x", a, SekPcS68k); a &= 0x7fff; if (a >= 0x2000) d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff]; @@ -877,7 +992,7 @@ static u32 PicoReadS68k8(u32 a) d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; if (a & 2) d >>= 8; } - dprintf("ret = %02x", (u8)d); + elprintf(EL_IO, "ret = %02x", (u8)d); goto end; } @@ -887,13 +1002,11 @@ static u32 PicoReadS68k8(u32 a) goto end; } - dprintf("s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k); + elprintf(EL_UIO, "s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k); end: -#ifdef __debug_io2 - dprintf("s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k); -#endif + elprintf(EL_IO, "s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k); #ifdef EMU_CORE_DEBUG lastread_a = ab; lastread_d[lrp_cyc++&15] = d; @@ -941,7 +1054,6 @@ static u32 PicoReadS68k16(u32 a) int bank = (Pico_mcd->s68k_regs[3]&1)^1; d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff]; d |= d << 4; d &= ~0xf0; - dprintf("FIXME: decode"); } else { // allow access in any mode, like Gens does d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); @@ -987,13 +1099,11 @@ static u32 PicoReadS68k16(u32 a) goto end; } - dprintf("s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); + elprintf(EL_UIO, "s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); end: -#ifdef __debug_io2 - dprintf("s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); -#endif + elprintf(EL_IO, "s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); #ifdef EMU_CORE_DEBUG lastread_a = ab; lastread_d[lrp_cyc++&15] = d; @@ -1053,11 +1163,12 @@ static u32 PicoReadS68k32(u32 a) // word RAM (1M area) if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff int bank; + u16 *pm; wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k); // if (!(Pico_mcd->s68k_regs[3]&4)) // dprintf("s68k_wram1M FIXME: wrong mode"); bank = (Pico_mcd->s68k_regs[3]&1)^1; - u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; + pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; wrdprintf("ret = %08x", d); goto end; } @@ -1097,13 +1208,11 @@ static u32 PicoReadS68k32(u32 a) goto end; } - dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); + elprintf(EL_UIO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); end: -#ifdef __debug_io2 - dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); -#endif + elprintf(EL_IO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); #ifdef EMU_CORE_DEBUG if (ab > 0x78) { // not vectors and stuff lastread_a = ab; @@ -1173,9 +1282,7 @@ 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 + elprintf(EL_IO, "s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); a&=0xffffff; @@ -1243,7 +1350,7 @@ static void PicoWriteS68k8(u32 a,u8 d) return; } - dprintf("s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); + elprintf(EL_UIO, "s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); } #endif @@ -1253,9 +1360,7 @@ 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); -#endif + elprintf(EL_IO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); a&=0xfffffe; @@ -1333,7 +1438,7 @@ static void PicoWriteS68k16(u32 a,u16 d) return; } - dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); + elprintf(EL_UIO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); } #endif @@ -1343,9 +1448,7 @@ 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); -#endif + elprintf(EL_IO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); a&=0xfffffe; @@ -1435,7 +1538,7 @@ static void PicoWriteS68k32(u32 a,u32 d) return; } - dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); + elprintf(EL_UIO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); } #endif @@ -1463,7 +1566,7 @@ static __inline int PicoMemBaseM68k(u32 pc) } // Error - Program Counter is invalid - dprintf("m68k FIXME: unhandled jump to %06x", pc); + elprintf(EL_ANOMALY, "m68k FIXME: unhandled jump to %06x", pc); return (int)Pico_mcd->bios; } @@ -1494,7 +1597,7 @@ static __inline int PicoMemBaseS68k(u32 pc) } // Error - Program Counter is invalid - dprintf("s68k FIXME: unhandled jump to %06x", pc); + elprintf(EL_ANOMALY, "s68k FIXME: unhandled jump to %06x", pc); return (int)Pico_mcd->prg_ram; } @@ -1535,7 +1638,10 @@ void PicoMemResetCD(int r3) PICO_INTERNAL void PicoMemSetupCD(void) { - dprintf("PicoMemSetupCD()"); + // additional handlers for common code + PicoRead16Hook = OtherRead16End; + PicoWrite8Hook = OtherWrite8End; + #ifdef EMU_C68K // Setup m68k memory callbacks: PicoCpuCM68k.checkpc=PicoCheckPcM68k; @@ -1634,7 +1740,7 @@ unsigned int m68k_read_pcrelative_CD8 (unsigned int a) int bank = (Pico_mcd->s68k_regs[3]&1)^1; return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff)); } - dprintf("s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a); + elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a); } else { if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram if(a<0x20000) return *(u8 *)(Pico.rom+(a^1)); // Bios @@ -1646,7 +1752,7 @@ unsigned int m68k_read_pcrelative_CD8 (unsigned int a) return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff)); } } - dprintf("m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a); + elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a); } return 0;//(u8) lastread_d; } @@ -1661,7 +1767,7 @@ unsigned int m68k_read_pcrelative_CD16(unsigned int a) int bank = (Pico_mcd->s68k_regs[3]&1)^1; return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); } - dprintf("s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a); + elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a); } else { if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram if(a<0x20000) return *(u16 *)(Pico.rom+(a&~1)); // Bios @@ -1673,7 +1779,7 @@ unsigned int m68k_read_pcrelative_CD16(unsigned int a) return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); } } - dprintf("m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a); + elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a); } return 0; } @@ -1690,7 +1796,7 @@ unsigned int m68k_read_pcrelative_CD32(unsigned int a) pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); return (pm[0]<<16)|pm[1]; } - dprintf("s68k_read_pcrelative_CD32 FIXME: can't handle %06x", a); + elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD32 FIXME: can't handle %06x", a); } else { if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram if(a<0x20000) { u16 *pm=(u16 *)(Pico.rom+(a&~1)); return (pm[0]<<16)|pm[1]; } @@ -1703,7 +1809,7 @@ unsigned int m68k_read_pcrelative_CD32(unsigned int a) return (pm[0]<<16)|pm[1]; } } - dprintf("m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a); + elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a); } return 0; }