X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmemory.c;h=b8998f83d5206381863770ddcb5e0908d046f42d;hb=5e89f0f5aebedc086888415e063b9883fc4a9e92;hp=4e56bf7a5adc499415acd19d1c4accca6f944f73;hpb=07ceafdb04502be69d06c3b54437fd4e8b88dfbe;p=picodrive.git diff --git a/pico/cd/memory.c b/pico/cd/memory.c index 4e56bf7..b8998f8 100644 --- a/pico/cd/memory.c +++ b/pico/cd/memory.c @@ -1,48 +1,29 @@ // Memory I/O handlers for Sega/Mega CD. -// Loosely based on Gens code. -// (c) Copyright 2007, Grazvydas "notaz" Ignotas - +// (c) Copyright 2007-2009, Grazvydas "notaz" Ignotas #include "../pico_int.h" - -#include "../sound/ym2612.h" -#include "../sound/sn76496.h" +#include "../memory.h" #include "gfx_cd.h" #include "pcm.h" -#ifndef UTYPES_DEFINED -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -#define UTYPES_DEFINED -#endif - -#ifdef _MSC_VER -#define rdprintf -#define wrdprintf -#define r3printf -#else -//#define rdprintf dprintf -#define rdprintf(...) -//#define wrdprintf dprintf -#define wrdprintf(...) -//#define r3printf elprintf -#define r3printf(...) -#endif +unsigned long s68k_read8_map [0x1000000 >> M68K_MEM_SHIFT]; +unsigned long s68k_read16_map [0x1000000 >> M68K_MEM_SHIFT]; +unsigned long s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT]; +unsigned long s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT]; -#ifdef EMU_CORE_DEBUG -extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16]; -extern int lrp_cyc, lwp_cyc; -#undef USE_POLL_DETECT -#endif +MAKE_68K_READ8(s68k_read8, s68k_read8_map) +MAKE_68K_READ16(s68k_read16, s68k_read16_map) +MAKE_68K_READ32(s68k_read32, s68k_read16_map) +MAKE_68K_WRITE8(s68k_write8, s68k_write8_map) +MAKE_68K_WRITE16(s68k_write16, s68k_write16_map) +MAKE_68K_WRITE32(s68k_write32, s68k_write16_map) // ----------------------------------------------------------------- // poller detection #define POLL_LIMIT 16 #define POLL_CYCLES 124 -// int m68k_poll_addr, m68k_poll_cnt; unsigned int s68k_poll_adclk, s68k_poll_cnt; #ifndef _ASM_CD_MEMORY_C @@ -50,7 +31,6 @@ static u32 m68k_reg_read16(u32 a) { u32 d=0; a &= 0x3e; - // dprintf("m68k_regs r%2i: [%02x] @%06x", realsize&~1, a+(realsize&1), SekPc); switch (a) { case 0: @@ -58,7 +38,7 @@ static u32 m68k_reg_read16(u32 a) goto end; case 2: d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7); - r3printf(EL_STATUS, "m68k_regs r3: %02x @%06x", (u8)d, SekPc); + elprintf(EL_CDREG3, "m68k_regs r3: %02x @%06x", (u8)d, SekPc); goto end; case 4: d = Pico_mcd->s68k_regs[4]<<8; @@ -74,7 +54,7 @@ static u32 m68k_reg_read16(u32 a) goto end; case 0xC: d = Pico_mcd->m.timer_stopwatch >> 16; - dprintf("m68k stopwatch timer read (%04x)", d); + elprintf(EL_CDREGS, "m68k stopwatch timer read (%04x)", d); goto end; } @@ -97,8 +77,8 @@ static #endif void m68k_reg_write8(u32 a, u32 d) { + u32 dold; a &= 0x3f; - // dprintf("m68k_regs w%2i: [%02x] %02x @%06x", realsize, a, d, SekPc); switch (a) { case 0: @@ -113,20 +93,21 @@ void m68k_reg_write8(u32 a, u32 d) 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); + elprintf(EL_CDREGS, "m68k: resetting s68k, cycles=%i", SekCyclesLeft); } + if (!(d & 1)) + d |= 2; // verified: reset also gives bus + if ((d ^ Pico_mcd->m.busreq) & 2) + PicoMemRemapCD(Pico_mcd->s68k_regs[3]); Pico_mcd->m.busreq = d; return; case 2: - dprintf("m68k: prg wp=%02x", d); + elprintf(EL_CDREGS, "m68k: prg wp=%02x", d); Pico_mcd->s68k_regs[2] = d; // really use s68k side register return; - case 3: { - u32 dold = Pico_mcd->s68k_regs[3]&0x1f; - r3printf(EL_STATUS, "m68k_regs w3: %02x @%06x", (u8)d, SekPc); - d &= 0xc2; - if ((dold>>6) != ((d>>6)&3)) - dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3)); + case 3: + dold = Pico_mcd->s68k_regs[3]; + elprintf(EL_CDREG3, "m68k_regs w3: %02x @%06x", (u8)d, SekPc); //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")); @@ -139,7 +120,11 @@ void m68k_reg_write8(u32 a, u32 d) SekEndRun(20+16+10+12+16); } } - Pico_mcd->s68k_regs[3] = d | dold; // really use s68k side register + Pico_mcd->s68k_regs[3] = (d & 0xc2) | (dold & 0x1f); + if ((d ^ dold) & 0xc0) { + elprintf(EL_CDREGS, "m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3)); + PicoMemRemapCD(Pico_mcd->s68k_regs[3]); + } #ifdef USE_POLL_DETECT if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) { SekSetStopS68k(0); s68k_poll_adclk = 0; @@ -147,13 +132,13 @@ void m68k_reg_write8(u32 a, u32 d) } #endif return; - } case 6: Pico_mcd->bios[0x72 + 1] = d; // simple hint vector changer return; case 7: Pico_mcd->bios[0x72] = d; - dprintf("hint vector set to %08x", PicoRead32(0x70)); + elprintf(EL_CDREGS, "hint vector set to %04x%04x", + ((u16 *)Pico_mcd->bios)[0x70/2], ((u16 *)Pico_mcd->bios)[0x72/2]); return; case 0xf: d = (d << 1) | ((d >> 7) & 1); // rol8 1 (special case) @@ -229,14 +214,12 @@ u32 s68k_reg_read16(u32 a) { u32 d=0; - // dprintf("s68k_regs r%2i: [%02x] @ %06x", realsize&~1, a+(realsize&1), SekPcS68k); - switch (a) { case 0: return ((Pico_mcd->s68k_regs[0]&3)<<8) | 1; // ver = 0, not in reset state case 2: d = (Pico_mcd->s68k_regs[2]<<8) | (Pico_mcd->s68k_regs[3]&0x1f); - r3printf(EL_STATUS, "s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k); + elprintf(EL_CDREG3, "s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k); return s68k_poll_detect(a, d); case 6: return CDC_Read_Reg(); @@ -244,10 +227,10 @@ u32 s68k_reg_read16(u32 a) return Read_CDC_Host(1); // Gens returns 0 here on byte reads case 0xC: d = Pico_mcd->m.timer_stopwatch >> 16; - dprintf("s68k stopwatch timer read (%04x)", d); + elprintf(EL_CDREGS, "s68k stopwatch timer read (%04x)", d); return d; case 0x30: - dprintf("s68k int3 timer read (%02x)", Pico_mcd->s68k_regs[31]); + elprintf(EL_CDREGS, "s68k int3 timer read (%02x)", Pico_mcd->s68k_regs[31]); return Pico_mcd->s68k_regs[31]; case 0x34: // fader return 0; // no busy bit @@ -278,42 +261,40 @@ static #endif void s68k_reg_write8(u32 a, u32 d) { - //dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k); - // Warning: d might have upper bits set switch (a) { case 2: return; // only m68k can change WP case 3: { int dold = Pico_mcd->s68k_regs[3]; - r3printf(EL_STATUS, "s68k_regs w3: %02x @%06x", (u8)d, SekPcS68k); + elprintf(EL_CDREG3, "s68k_regs w3: %02x @%06x", (u8)d, SekPcS68k); d &= 0x1d; - d |= dold&0xc2; - if (d&4) + d |= dold & 0xc2; + if (d & 4) { if ((d ^ dold) & 5) { d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit - PicoMemResetCD(d); + PicoMemRemapCD(d); } #ifdef _ASM_CD_MEMORY_C if ((d ^ dold) & 0x1d) PicoMemResetCDdecode(d); #endif if (!(dold & 4)) { - r3printf(EL_STATUS, "wram mode 2M->1M"); + elprintf(EL_CDREG3, "wram mode 2M->1M"); wram_2M_to_1M(Pico_mcd->word_ram2M); } } else { if (dold & 4) { - r3printf(EL_STATUS, "wram mode 1M->2M"); + elprintf(EL_CDREG3, "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); - PicoMemResetCD(d); + PicoMemRemapCD(d); } // s68k can only set RET, writing 0 has no effect else if ((dold ^ d) & d & 1) { // RET being set @@ -326,7 +307,7 @@ void s68k_reg_write8(u32 a, u32 d) break; } case 4: - dprintf("s68k CDC dest: %x", d&7); + elprintf(EL_CDREGS, "s68k CDC dest: %x", d&7); Pico_mcd->s68k_regs[4] = (Pico_mcd->s68k_regs[4]&0xC0) | (d&7); // CDC mode return; case 5: @@ -336,22 +317,22 @@ void s68k_reg_write8(u32 a, u32 d) CDC_Write_Reg(d); return; case 0xa: - dprintf("s68k set CDC dma addr"); + elprintf(EL_CDREGS, "s68k set CDC dma addr"); break; case 0xc: case 0xd: - dprintf("s68k set stopwatch timer"); + elprintf(EL_CDREGS, "s68k set stopwatch timer"); Pico_mcd->m.timer_stopwatch = 0; return; case 0xe: Pico_mcd->s68k_regs[0xf] = (d>>1) | (d<<7); // ror8 1, Gens note: Dragons lair return; case 0x31: - dprintf("s68k set int3 timer: %02x", d); + elprintf(EL_CDREGS, "s68k set int3 timer: %02x", d); Pico_mcd->m.timer_int3 = (d & 0xff) << 16; break; case 0x33: // IRQ mask - dprintf("s68k irq mask: %02x", d); + elprintf(EL_CDREGS, "s68k irq mask: %02x", d); if ((d&(1<<4)) && (Pico_mcd->s68k_regs[0x37]&4) && !(Pico_mcd->s68k_regs[0x33]&(1<<4))) { CDD_Export_Status(); } @@ -384,438 +365,141 @@ void s68k_reg_write8(u32 a, u32 d) Pico_mcd->s68k_regs[a] = (u8) d; } +// ----------------------------------------------------------------- +// Main 68k +// ----------------------------------------------------------------- + +#ifndef _ASM_CD_MEMORY_C +#include "cell_map.c" +#endif -static u32 OtherRead16End(u32 a, int realsize) +// WORD RAM, cell aranged area (220000 - 23ffff) +static u32 PicoReadM68k8_cell(u32 a) { - u32 d=0; + int bank = Pico_mcd->s68k_regs[3] & 1; + a = (a&3) | (cell_map(a >> 2) << 2); // cell arranged + return Pico_mcd->word_ram1M[bank][a ^ 1]; +} -#ifndef _ASM_CD_MEMORY_C - if ((a&0xffffc0)==0xa12000) { - d=m68k_reg_read16(a); - goto end; - } +static u32 PicoReadM68k16_cell(u32 a) +{ + int bank = Pico_mcd->s68k_regs[3] & 1; + a = (a&2) | (cell_map(a >> 2) << 2); + return *(u16 *)(Pico_mcd->word_ram1M[bank] + a); +} - if (a==0x400000) { - if (SRam.data != NULL) d=3; // 64k cart - goto end; - } +static void PicoWriteM68k8_cell(u32 a, u32 d) +{ + int bank = Pico_mcd->s68k_regs[3] & 1; + a = (a&3) | (cell_map(a >> 2) << 2); + Pico_mcd->word_ram1M[bank][a ^ 1] = d; +} - if ((a&0xfe0000)==0x600000) { - if (SRam.data != NULL) { - d=SRam.data[((a>>1)&0xffff)+0x2000]; - if (realsize == 8) d|=d<<8; - } - goto end; +static void PicoWriteM68k16_cell(u32 a, u32 d) +{ + int bank = Pico_mcd->s68k_regs[3] & 1; + a = (a&3) | (cell_map(a >> 2) << 2); + *(u16 *)(Pico_mcd->word_ram1M[bank] + a) = d; +} + +// RAM cart (40000 - 7fffff, optional) +static u32 PicoReadM68k8_ramc(u32 a) +{ + u32 d = 0; + if (a == 0x400001) { + if (SRam.data != NULL) + d = 3; // 64k cart + return d; } - if (a==0x7ffffe) { - d=Pico_mcd->m.bcram_reg; - goto end; + if ((a & 0xfe0000) == 0x600000) { + if (SRam.data != NULL) + d = SRam.data[((a >> 1) & 0xffff) + 0x2000]; + return d; } -#endif - elprintf(EL_UIO, "m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc); + if (a == 0x7fffff) + return Pico_mcd->m.bcram_reg; -#ifndef _ASM_CD_MEMORY_C -end: -#endif + elprintf(EL_UIO, "m68k unmapped r8 [%06x] @%06x", a, SekPc); return d; } - -static void OtherWrite8End(u32 a, u32 d, int realsize) +static u32 PicoReadM68k16_ramc(u32 a) { -#ifndef _ASM_CD_MEMORY_C - if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; } + elprintf(EL_ANOMALY, "ramcart r16: [%06x] @%06x", a, SekPcS68k); + return PicoReadM68k8_ramc(a + 1); +} - if ((a&0xfe0000)==0x600000) { - if (SRam.data != NULL && (Pico_mcd->m.bcram_reg&1)) { - SRam.data[((a>>1)&0xffff)+0x2000]=d; +static void PicoWriteM68k8_ramc(u32 a, u32 d) +{ + 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; + 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); + elprintf(EL_UIO, "m68k unmapped w8 [%06x] %02x @%06x", a, d & 0xff, SekPc); } -#ifndef _ASM_CD_MEMORY_C -#define _CD_MEMORY_C -#undef _ASM_MEMORY_C -#include "../memory_cmn.c" -#include "cell_map.c" -#endif - - -// ----------------------------------------------------------------- -// Read Rom and read Ram - -#ifdef _ASM_CD_MEMORY_C -u32 PicoReadM68k8(u32 a); -#else -u32 PicoReadM68k8(u32 a) +static void PicoWriteM68k16_ramc(u32 a, u32 d) { - u32 d=0; - - a&=0xffffff; - - 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=PicoVideoRead8(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 = *(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); - - d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8; - - if ((a&0xffffc0)==0xa12000) - rdprintf("ret = %02x", (u8)d); - break; - } - - - elprintf(EL_IO, "r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc); -#ifdef EMU_CORE_DEBUG - if (a>=Pico.romsize) { - lastread_a = a; - lastread_d[lrp_cyc++&15] = d; - } -#endif - return d; + elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x", a, d, SekPcS68k); + PicoWriteM68k8_ramc(a + 1, d); } -#endif - -#ifdef _ASM_CD_MEMORY_C -u32 PicoReadM68k16(u32 a); -#else -static u32 PicoReadM68k16(u32 a) +// IO/control/cd registers (a10000 - ...) +static u32 PicoReadM68k8_io(u32 a) { - u32 d=0; - - a&=0xfffffe; - - 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); - - d = OtherRead16(a, 16); - - if ((a&0xffffc0)==0xa12000) - rdprintf("ret = %04x", d); - break; + u32 d; + if ((a & 0xff00) == 0x2000) { // a12000 - a120ff + d = m68k_reg_read16(a); // TODO: m68k_reg_read8 + if (!(a & 1)) + d >>= 8; + d &= 0xff; + elprintf(EL_CDREGS, "m68k_regs r8: [%02x] %02x @%06x", a & 0x3f, d, SekPc); + return d; } - - elprintf(EL_IO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc); -#ifdef EMU_CORE_DEBUG - if (a>=Pico.romsize) { - lastread_a = a; - lastread_d[lrp_cyc++&15] = d; - } -#endif - return d; + // fallback to default MD handler + return PicoRead8_io(a); } -#endif - -#ifdef _ASM_CD_MEMORY_C -u32 PicoReadM68k32(u32 a); -#else -static u32 PicoReadM68k32(u32 a) +static u32 PicoReadM68k16_io(u32 a) { - u32 d=0; - - a&=0xfffffe; - - 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 { - // 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; - } - default: - if ((a&0xffffc0)==0xa12000) - rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc); - - d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32); - - if ((a&0xffffc0)==0xa12000) - rdprintf("ret = %08x", d); - break; + u32 d; + if ((a & 0xff00) == 0x2000) { + d = m68k_reg_read16(a); + elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x", a & 0x3f, d, SekPc); + return d; } - - elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc); -#ifdef EMU_CORE_DEBUG - if (a>=Pico.romsize) { - lastread_a = a; - lastread_d[lrp_cyc++&15] = d; - } -#endif - return d; + return PicoRead16_io(a); } -#endif - - -// ----------------------------------------------------------------- -#ifdef _ASM_CD_MEMORY_C -void PicoWriteM68k8(u32 a,u8 d); -#else -void PicoWriteM68k8(u32 a,u8 d) +static void PicoWriteM68k8_io(u32 a, u32 d) { - elprintf(EL_IO, "w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc); -#ifdef EMU_CORE_DEBUG - lastwrite_cyc_d[lwp_cyc++&15] = d; -#endif - - if ((a&0xe00000)==0xe00000) { // Ram - *(u8 *)(Pico.ram+((a^1)&0xffff)) = d; - return; - } - - // 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]; - *(u8 *)(prg_bank+((a^1)&0x1ffff))=d; - return; - } - - a&=0xffffff; - - // word RAM - if ((a&0xfc0000)==0x200000) { - wrdprintf("m68k_wram w8: [%06x] %02x @%06x", a, d, 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; - *(u8 *)(Pico_mcd->word_ram1M[bank]+(a^1))=d; - } else { - // allow access in any mode, like Gens does - *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff))=d; - } - return; - } - - if ((a&0xffffc0)==0xa12000) { - rdprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc); + if ((a & 0xff00) == 0x2000) { // a12000 - a120ff + elprintf(EL_CDREGS, "m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc); m68k_reg_write8(a, d); return; } - OtherWrite8(a,d); + PicoWrite16_io(a, d); } -#endif - -#ifdef _ASM_CD_MEMORY_C -void PicoWriteM68k16(u32 a,u16 d); -#else -static void PicoWriteM68k16(u32 a,u16 d) +static void PicoWriteM68k16_io(u32 a, u32 d) { - elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d); -#ifdef EMU_CORE_DEBUG - lastwrite_cyc_d[lwp_cyc++&15] = d; -#endif - - if ((a&0xe00000)==0xe00000) { // Ram - *(u16 *)(Pico.ram+(a&0xfffe))=d; - return; - } - - // 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 w16: [%i,%06x] %04x @%06x", Pico_mcd->s68k_regs[3]>>6, a, d, SekPc); - *(u16 *)(prg_bank+(a&0x1fffe))=d; - return; - } - - a&=0xfffffe; - - // word RAM - if ((a&0xfc0000)==0x200000) { - wrdprintf("m68k_wram w16: [%06x] %04x @%06x", a, d, 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; - *(u16 *)(Pico_mcd->word_ram1M[bank]+a)=d; - } else { - // allow access in any mode, like Gens does - *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe))=d; - } - return; - } - - // regs - if ((a&0xffffc0)==0xa12000) { - rdprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc); + if ((a & 0xff00) == 0x2000) { // a12000 - a120ff + elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc); +/* TODO FIXME? if (a == 0xe) { // special case, 2 byte writes would be handled differently Pico_mcd->s68k_regs[0xe] = d >> 8; #ifdef USE_POLL_DETECT @@ -826,434 +510,95 @@ static void PicoWriteM68k16(u32 a,u16 d) #endif return; } - m68k_reg_write8(a, d>>8); - m68k_reg_write8(a+1,d&0xff); - return; - } - - // VDP - if ((a&0xe700e0)==0xc00000) { - PicoVideoWrite(a,(u16)d); - return; - } - - OtherWrite16(a,d); -} -#endif - - -#ifdef _ASM_CD_MEMORY_C -void PicoWriteM68k32(u32 a,u32 d); -#else -static void PicoWriteM68k32(u32 a,u32 d) -{ - elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d); -#ifdef EMU_CORE_DEBUG - lastwrite_cyc_d[lwp_cyc++&15] = d; -#endif - - if ((a&0xe00000)==0xe00000) - { - // Ram: - u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; - return; - } - - // 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)); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; - return; - } - - a&=0xfffffe; - - // word RAM - if ((a&0xfc0000)==0x200000) { - if (d != 0) // don't log clears - wrdprintf("m68k_wram w32: [%06x] %08x @%06x", a, d, SekPc); - if (Pico_mcd->s68k_regs[3]&4) { // 1M mode? - int bank = Pico_mcd->s68k_regs[3]&1; - 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; - } else { - u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; - } - } else { - // allow access in any mode, like Gens does - u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; - } - return; - } - - if ((a&0xffffc0)==0xa12000) { - rdprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc); - 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); +*/ + m68k_reg_write8(a, d >> 8); + m68k_reg_write8(a + 1, d & 0xff); return; } - OtherWrite16(a, (u16)(d>>16)); - OtherWrite16(a+2,(u16)d); + PicoWrite16_io(a, d); } -#endif - // ----------------------------------------------------------------- -// S68k +// Sub 68k // ----------------------------------------------------------------- -#ifdef _ASM_CD_MEMORY_C -u32 PicoReadS68k8(u32 a); -#else -static u32 PicoReadS68k8(u32 a) +static u32 s68k_unmapped_read8(u32 a) { - u32 d=0; - -#ifdef EMU_CORE_DEBUG - u32 ab=a&0xfffffe; -#endif - a&=0xffffff; - - // prg RAM - if (a < 0x80000) { - d = *(Pico_mcd->prg_ram+(a^1)); - goto end; - } - - // regs - if ((a&0xfffe00) == 0xff8000) { - a &= 0x1ff; - rdprintf("s68k_regs r8: [%02x] @ %06x", a, SekPcS68k); - if (a >= 0x0e && a < 0x30) { - d = Pico_mcd->s68k_regs[a]; - s68k_poll_detect(a, d); - rdprintf("ret = %02x", (u8)d); - goto end; - } - else if (a >= 0x58 && a < 0x68) - d = gfx_cd_read(a&~1); - else d = s68k_reg_read16(a&~1); - if ((a&1)==0) d>>=8; - rdprintf("ret = %02x", (u8)d); - goto end; - } - - // word RAM (2M area) - if ((a&0xfc0000)==0x080000) { // 080000-0bffff - // test: batman returns - wrdprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k); - if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode? - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff]; - if (a&1) d &= 0x0f; - else d >>= 4; - } else { - // allow access in any mode, like Gens does - d = Pico_mcd->word_ram2M[(a^1)&0x3ffff]; - } - wrdprintf("ret = %02x", (u8)d); - goto end; - } - - // word RAM (1M area) - 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"); - bank = (Pico_mcd->s68k_regs[3]&1)^1; - d = Pico_mcd->word_ram1M[bank][(a^1)&0x1ffff]; - wrdprintf("ret = %02x", (u8)d); - goto end; - } - - // PCM - if ((a&0xff8000)==0xff0000) { - 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]; - else if (a >= 0x20) { - a &= 0x1e; - d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; - if (a & 2) d >>= 8; - } - elprintf(EL_IO, "ret = %02x", (u8)d); - goto end; - } - - // bram - if ((a&0xff0000)==0xfe0000) { - d = Pico_mcd->bram[(a>>1)&0x1fff]; - goto end; - } - - elprintf(EL_UIO, "s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k); - - end: - - 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; -#endif - return d; + elprintf(EL_UIO, "s68k unmapped r8 [%06x] @%06x", a, SekPc); + return 0; } -#endif - -#ifdef _ASM_CD_MEMORY_C -u32 PicoReadS68k16(u32 a); -#else -static u32 PicoReadS68k16(u32 a) +static u32 s68k_unmapped_read16(u32 a) { - u32 d=0; - -#ifdef EMU_CORE_DEBUG - u32 ab=a&0xfffffe; -#endif - a&=0xfffffe; - - // prg RAM - if (a < 0x80000) { - wrdprintf("s68k_prgram r16: [%06x] @%06x", a, SekPcS68k); - d = *(u16 *)(Pico_mcd->prg_ram+a); - wrdprintf("ret = %04x", d); - goto end; - } - - // regs - if ((a&0xfffe00) == 0xff8000) { - a &= 0x1fe; - rdprintf("s68k_regs r16: [%02x] @ %06x", a, SekPcS68k); - if (a >= 0x58 && a < 0x68) - d = gfx_cd_read(a); - else d = s68k_reg_read16(a); - rdprintf("ret = %04x", d); - goto end; - } - - // word RAM (2M area) - if ((a&0xfc0000)==0x080000) { // 080000-0bffff - wrdprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k); - if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode? - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff]; - d |= d << 4; d &= ~0xf0; - } else { - // allow access in any mode, like Gens does - d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); - } - wrdprintf("ret = %04x", d); - goto end; - } - - // word RAM (1M area) - 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"); - bank = (Pico_mcd->s68k_regs[3]&1)^1; - d = *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - wrdprintf("ret = %04x", d); - goto end; - } - - // bram - if ((a&0xff0000)==0xfe0000) { - 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; // This is most likely wrong - dprintf("ret = %04x", d); - goto end; - } - - // PCM - if ((a&0xff8000)==0xff0000) { - 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]; - else if (a >= 0x20) { - a &= 0x1e; - d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; - if (a & 2) d >>= 8; - } - dprintf("ret = %04x", d); - goto end; - } + elprintf(EL_UIO, "s68k unmapped r16 [%06x] @%06x", a, SekPc); + return 0; +} - elprintf(EL_UIO, "s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); +static void s68k_unmapped_write8(u32 a, u32 d) +{ + elprintf(EL_UIO, "s68k unmapped w8 [%06x] %02x @%06x", a, d & 0xff, SekPc); +} - end: +static void s68k_unmapped_write16(u32 a, u32 d) +{ + elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc); +} - 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; -#endif +// decode (080000 - 0bffff, in 1M mode) +static u32 PicoReadS68k8_dec(u32 a) +{ + u32 d, bank; + bank = (Pico_mcd->s68k_regs[3] & 1) ^ 1; + d = Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; + if (a & 1) + d &= 0x0f; + else + d >>= 4; return d; } -#endif - -#ifdef _ASM_CD_MEMORY_C -u32 PicoReadS68k32(u32 a); -#else -static u32 PicoReadS68k32(u32 a) +static u32 PicoReadS68k16_dec(u32 a) { - u32 d=0; - -#ifdef EMU_CORE_DEBUG - u32 ab=a&0xfffffe; -#endif - a&=0xfffffe; - - // prg RAM - if (a < 0x80000) { - u16 *pm=(u16 *)(Pico_mcd->prg_ram+a); - d = (pm[0]<<16)|pm[1]; - goto end; - } - - // regs - if ((a&0xfffe00) == 0xff8000) { - a &= 0x1fe; - rdprintf("s68k_regs r32: [%02x] @ %06x", a, SekPcS68k); - if (a >= 0x58 && a < 0x68) - d = (gfx_cd_read(a)<<16)|gfx_cd_read(a+2); - else d = (s68k_reg_read16(a)<<16)|s68k_reg_read16(a+2); - rdprintf("ret = %08x", d); - goto end; - } - - // word RAM (2M area) - if ((a&0xfc0000)==0x080000) { // 080000-0bffff - wrdprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k); - if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode? - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - a >>= 1; - d = Pico_mcd->word_ram1M[bank][((a+0)^1)&0x1ffff] << 16; - d |= Pico_mcd->word_ram1M[bank][((a+1)^1)&0x1ffff]; - d |= d << 4; d &= 0x0f0f0f0f; - } 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); - goto end; - } - - // 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; - pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1]; - wrdprintf("ret = %08x", d); - goto end; - } - - // PCM - if ((a&0xff8000)==0xff0000) { - dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k); - a &= 0x7fff; - if (a >= 0x2000) { - a >>= 1; - d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][a&0xfff] << 16; - d |= Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a+1)&0xfff]; - } else if (a >= 0x20) { - a &= 0x1e; - if (a & 2) { - a >>= 2; - d = (Pico_mcd->pcm.ch[a].addr >> (PCM_STEP_SHIFT-8)) & 0xff0000; - d |= (Pico_mcd->pcm.ch[(a+1)&7].addr >> PCM_STEP_SHIFT) & 0xff; - } else { - d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; - d = ((d<<16)&0xff0000) | ((d>>8)&0xff); // PCM chip is LE - } - } - dprintf("ret = %08x", d); - goto end; - } - - // bram - if ((a&0xff0000)==0xfe0000) { - 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; - d|= Pico_mcd->bram[a++]; - d|= Pico_mcd->bram[a++] << 8; - dprintf("ret = %08x", d); - goto end; - } - - elprintf(EL_UIO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); - - end: - - 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; - lastread_d[lrp_cyc++&15] = d; - } -#endif + u32 d, bank; + bank = (Pico_mcd->s68k_regs[3] & 1) ^ 1; + d = Pico_mcd->word_ram1M[bank][((a >> 1) ^ 1) & 0x1ffff]; + d |= d << 4; + d &= ~0xf0; return d; } -#endif - -#ifndef _ASM_CD_MEMORY_C /* check: jaguar xj 220 (draws entire world using decode) */ -static void decode_write8(u32 a, u8 d, int r3) +static void PicoWriteS68k8_dec(u32 a, u32 d) { - u8 *pd = Pico_mcd->word_ram1M[(r3 & 1)^1] + (((a>>1)^1)&0x1ffff); - u8 oldmask = (a&1) ? 0xf0 : 0x0f; + u8 r3 = Pico_mcd->s68k_regs[3]; + u8 *pd = &Pico_mcd->word_ram1M[(r3 & 1) ^ 1][((a >> 1) ^ 1) & 0x1ffff]; + u8 oldmask = (a & 1) ? 0xf0 : 0x0f; r3 &= 0x18; d &= 0x0f; - if (!(a&1)) d <<= 4; + if (!(a & 1)) + d <<= 4; if (r3 == 8) { - if ((!(*pd & (~oldmask))) && d) goto do_it; + if ((!(*pd & (~oldmask))) && d) + goto do_it; } else if (r3 > 8) { - if (d) goto do_it; - } else { + 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) +static void PicoWriteS68k16_dec(u32 a, u32 d) { - u8 *pd = Pico_mcd->word_ram1M[(r3 & 1)^1] + (((a>>1)^1)&0x1ffff); + u8 r3 = Pico_mcd->s68k_regs[3]; + u8 *pd = &Pico_mcd->word_ram1M[(r3 & 1) ^ 1][((a >> 1) ^ 1) & 0x1ffff]; //if ((a & 0x3ffff) < 0x28000) return; @@ -1275,350 +620,212 @@ static void decode_write16(u32 a, u16 d, int r3) *pd = d; } } -#endif -// ----------------------------------------------------------------- +// backup RAM (fe0000 - feffff) +static u32 PicoReadS68k8_bram(u32 a) +{ + return Pico_mcd->bram[(a>>1)&0x1fff]; +} -#ifdef _ASM_CD_MEMORY_C -void PicoWriteS68k8(u32 a,u8 d); -#else -static void PicoWriteS68k8(u32 a,u8 d) +static u32 PicoReadS68k16_bram(u32 a) { - elprintf(EL_IO, "s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); + u32 d; + elprintf(EL_ANOMALY, "FIXME: s68k_bram r16: [%06x] @%06x", a, SekPcS68k); + a = (a >> 1) & 0x1fff; + d = Pico_mcd->bram[a++]; + d|= Pico_mcd->bram[a++] << 8; // probably wrong, TODO: verify + return d; +} - a&=0xffffff; +static void PicoWriteS68k8_bram(u32 a, u32 d) +{ + Pico_mcd->bram[(a >> 1) & 0x1fff] = d; + SRam.changed = 1; +} -#ifdef EMU_CORE_DEBUG - lastwrite_cyc_d[lwp_cyc++&15] = d; -#endif +static void PicoWriteS68k16_bram(u32 a, u32 d) +{ + elprintf(EL_ANOMALY, "s68k_bram w16: [%06x] %04x @%06x", a, d, SekPcS68k); + a = (a >> 1) & 0x1fff; + Pico_mcd->bram[a++] = d; + Pico_mcd->bram[a++] = d >> 8; // TODO: verify.. + SRam.changed = 1; +} - // prg RAM - if (a < 0x80000) { - u8 *pm=(u8 *)(Pico_mcd->prg_ram+(a^1)); - if (a >= (Pico_mcd->s68k_regs[2]<<8)) *pm=d; - return; - } +// PCM and registers (ff0000 - ffffff) +static u32 PicoReadS68k8_pr(u32 a) +{ + u32 d = 0; // regs - if ((a&0xfffe00) == 0xff8000) { + if ((a & 0xfe00) == 0x8000) { a &= 0x1ff; - rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k); - if (a >= 0x58 && a < 0x68) - 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 (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; + elprintf(EL_CDREGS, "s68k_regs r8: [%02x] @ %06x", a, SekPcS68k); + if (a >= 0x0e && a < 0x30) { + d = Pico_mcd->s68k_regs[a]; + s68k_poll_detect(a, d); + elprintf(EL_CDREGS, "ret = %02x", (u8)d); + return d; } - return; - } - - // word RAM (1M area) - 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"); - bank = (Pico_mcd->s68k_regs[3]&1)^1; - *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff))=d; - return; + else if (a >= 0x58 && a < 0x68) + d = gfx_cd_read(a & ~1); + else d = s68k_reg_read16(a & ~1); + if (!(a & 1)) + d >>= 8; + elprintf(EL_CDREGS, "ret = %02x", (u8)d); + return d & 0xff; } // PCM - if ((a&0xff8000)==0xff0000) { + if ((a & 0x8000) == 0x0000) { a &= 0x7fff; if (a >= 0x2000) - Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d; - else if (a < 0x12) - pcm_write(a>>1, d); - return; - } - - // bram - if ((a&0xff0000)==0xfe0000) { - Pico_mcd->bram[(a>>1)&0x1fff] = d; - SRam.changed = 1; - return; + d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a >> 1) & 0xfff]; + else if (a >= 0x20) { + a &= 0x1e; + d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; + if (a & 2) + d >>= 8; + } + return d & 0xff; } - elprintf(EL_UIO, "s68k w8 : %06x, %02x @%06x", a&0xffffff, d, SekPcS68k); + return s68k_unmapped_read8(a); } -#endif - -#ifdef _ASM_CD_MEMORY_C -void PicoWriteS68k16(u32 a,u16 d); -#else -static void PicoWriteS68k16(u32 a,u16 d) +static u32 PicoReadS68k16_pr(u32 a) { - elprintf(EL_IO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); - - a&=0xfffffe; - -#ifdef EMU_CORE_DEBUG - lastwrite_cyc_d[lwp_cyc++&15] = d; -#endif - - // prg RAM - if (a < 0x80000) { - wrdprintf("s68k_prgram w16: [%06x] %04x @%06x", a, d, SekPcS68k); - if (a >= (Pico_mcd->s68k_regs[2]<<8)) // needed for Dungeon Explorer - *(u16 *)(Pico_mcd->prg_ram+a)=d; - return; - } + u32 d = 0; // regs - if ((a&0xfffe00) == 0xff8000) { + if ((a & 0xfe00) == 0x8000) { a &= 0x1fe; - rdprintf("s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k); - if (a >= 0x58 && a < 0x68) - 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; - } - s68k_reg_write8(a, d>>8); - s68k_reg_write8(a+1,d&0xff); - } - return; + elprintf(EL_CDREGS, "s68k_regs r16: [%02x] @ %06x", a, SekPcS68k); + if (0x58 <= a && a < 0x68) + d = gfx_cd_read(a); + else d = s68k_reg_read16(a); + elprintf(EL_CDREGS, "ret = %04x", d); + return 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 (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; + // PCM + if ((a & 0x8000) == 0x0000) { + //elprintf(EL_ANOMALY, "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]; + else if (a >= 0x20) { + a &= 0x1e; + d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT; + if (a & 2) d >>= 8; } - return; + elprintf(EL_CDREGS, "ret = %04x", d); + return d; } - // word RAM (1M area) - 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"); - bank = (Pico_mcd->s68k_regs[3]&1)^1; - *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe))=d; + return s68k_unmapped_read16(a); +} + +static void PicoWriteS68k8_pr(u32 a, u32 d) +{ + // regs + if ((a & 0xfe00) == 0x8000) { + a &= 0x1ff; + elprintf(EL_CDREGS, "s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k); + if (0x58 <= a && a < 0x68) + gfx_cd_write16(a&~1, (d<<8)|d); + else s68k_reg_write8(a,d); return; } // PCM - if ((a&0xff8000)==0xff0000) { + if ((a & 0x8000) == 0x0000) { a &= 0x7fff; if (a >= 0x2000) Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d; else if (a < 0x12) - pcm_write(a>>1, d & 0xff); - return; - } - - // bram - if ((a&0xff0000)==0xfe0000) { - dprintf("s68k_bram w16: [%06x] %04x @%06x", a, d, SekPcS68k); - a = (a>>1)&0x1fff; - Pico_mcd->bram[a++] = d; // Gens does little endian here, an so do we.. - Pico_mcd->bram[a++] = d >> 8; - SRam.changed = 1; + pcm_write(a>>1, d); return; } - elprintf(EL_UIO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k); + s68k_unmapped_write8(a, d); } -#endif - -#ifdef _ASM_CD_MEMORY_C -void PicoWriteS68k32(u32 a,u32 d); -#else -static void PicoWriteS68k32(u32 a,u32 d) +static void PicoWriteS68k16_pr(u32 a, u32 d) { - elprintf(EL_IO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); - - a&=0xfffffe; - -#ifdef EMU_CORE_DEBUG - lastwrite_cyc_d[lwp_cyc++&15] = d; -#endif - - // prg RAM - if (a < 0x80000) { - if (a >= (Pico_mcd->s68k_regs[2]<<8)) { - u16 *pm=(u16 *)(Pico_mcd->prg_ram+a); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; - } - return; - } - // regs - if ((a&0xfffe00) == 0xff8000) { + if ((a & 0xfe00) == 0x8000) { a &= 0x1fe; - rdprintf("s68k_regs w32: [%02x] %08x @ %06x", a, d, SekPcS68k); - if (a >= 0x58 && a < 0x68) { - gfx_cd_write16(a, d>>16); - gfx_cd_write16(a+2, d&0xffff); - } else { - if ((a&0x1fe) == 0xe) dprintf("s68k FIXME: w32 [%02x]", a&0x3f); - s68k_reg_write8(a, d>>24); - s68k_reg_write8(a+1,(d>>16)&0xff); - s68k_reg_write8(a+2,(d>>8) &0xff); - s68k_reg_write8(a+3, d &0xff); - } - return; - } - - // 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 (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)); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; + elprintf(EL_CDREGS, "s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k); + if (a >= 0x58 && a < 0x68) + gfx_cd_write16(a, d); + else { + if (a == 0xe) { + // special case, 2 byte writes would be handled differently + // TODO: verify + Pico_mcd->s68k_regs[0xf] = d; + return; + } + s68k_reg_write8(a, d >> 8); + s68k_reg_write8(a + 1, d & 0xff); } return; } - // word RAM (1M area) - 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"); - bank = (Pico_mcd->s68k_regs[3]&1)^1; - pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - pm[0]=(u16)(d>>16); pm[1]=(u16)d; - return; - } - // PCM - if ((a&0xff8000)==0xff0000) { + if ((a & 0x8000) == 0x0000) { a &= 0x7fff; - if (a >= 0x2000) { - a >>= 1; - Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][a&0xfff] = (d >> 16); - Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a+1)&0xfff] = d; - } else if (a < 0x12) { - a >>= 1; - pcm_write(a, (d>>16) & 0xff); - pcm_write(a+1, d & 0xff); - } - return; - } - - // bram - if ((a&0xff0000)==0xfe0000) { - dprintf("s68k_bram w32: [%06x] %08x @%06x", a, d, SekPcS68k); - a = (a>>1)&0x1fff; - Pico_mcd->bram[a++] = d >> 16; // middle endian? verify? - Pico_mcd->bram[a++] = d >> 24; - Pico_mcd->bram[a++] = d; - Pico_mcd->bram[a++] = d >> 8; - SRam.changed = 1; + if (a >= 0x2000) + Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d; + else if (a < 0x12) + pcm_write(a>>1, d & 0xff); return; } - elprintf(EL_UIO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k); + s68k_unmapped_write16(a, d); } -#endif - // ----------------------------------------------------------------- - -#ifdef EMU_C68K -static __inline int PicoMemBaseM68k(u32 pc) -{ - if ((pc&0xe00000)==0xe00000) - return (int)Pico.ram-(pc&0xff0000); // Program Counter in Ram - - if (pc < 0x20000) - return (int)Pico_mcd->bios; // Program Counter in BIOS - - if ((pc&0xfc0000)==0x200000) - { - if (!(Pico_mcd->s68k_regs[3]&4)) - return (int)Pico_mcd->word_ram2M - 0x200000; // Program Counter in Word Ram - if (pc < 0x220000) { - int bank = Pico_mcd->s68k_regs[3]&1; - return (int)Pico_mcd->word_ram1M[bank] - 0x200000; - } - } - - // Error - Program Counter is invalid - elprintf(EL_ANOMALY, "m68k FIXME: unhandled jump to %06x", pc); - - return (int)Pico_mcd->bios; -} - - -static u32 PicoCheckPcM68k(u32 pc) -{ - pc-=PicoCpuCM68k.membase; // Get real pc - pc&=0xfffffe; - - PicoCpuCM68k.membase=PicoMemBaseM68k(pc); - - return PicoCpuCM68k.membase+pc; -} - - -static __inline int PicoMemBaseS68k(u32 pc) +// TODO: probably split +void PicoMemRemapCD(int r3) { - if (pc < 0x80000) // PRG RAM - return (int)Pico_mcd->prg_ram; - - if ((pc&0xfc0000)==0x080000) // WORD RAM 2M area (assume we are in the right mode..) - return (int)Pico_mcd->word_ram2M - 0x080000; - - if ((pc&0xfe0000)==0x0c0000) { // word RAM 1M area - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - return (int)Pico_mcd->word_ram1M[bank] - 0x0c0000; + void *bank; + + // PRG RAM + if (Pico_mcd->m.busreq & 2) { + bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3] >> 6]; + cpu68k_map_all_ram(0x020000, 0x03ffff, bank, 0); + } + else { + m68k_map_unmap(0x020000, 0x03ffff); + } + + // WORD RAM + if (!(r3 & 4)) { + // 2M mode. XXX: allowing access in all cases for simplicity + bank = Pico_mcd->word_ram2M; + cpu68k_map_all_ram(0x200000, 0x23ffff, bank, 0); + cpu68k_map_all_ram(0x080000, 0x0bffff, bank, 1); + // TODO: handle 0x0c0000 + } + else { + bank = Pico_mcd->word_ram1M[r3 & 1]; + cpu68k_map_all_ram(0x200000, 0x21ffff, bank, 0); + bank = Pico_mcd->word_ram1M[(r3 & 1) ^ 1]; + cpu68k_map_all_ram(0x0c0000, 0x0effff, bank, 1); + // "cell arrange" on m68k + cpu68k_map_set(m68k_read8_map, 0x220000, 0x23ffff, PicoReadM68k8_cell, 1); + cpu68k_map_set(m68k_read16_map, 0x220000, 0x23ffff, PicoReadM68k16_cell, 1); + cpu68k_map_set(m68k_write8_map, 0x220000, 0x23ffff, PicoWriteM68k8_cell, 1); + cpu68k_map_set(m68k_write16_map, 0x220000, 0x23ffff, PicoWriteM68k16_cell, 1); + // "decode format" on s68k + cpu68k_map_set(s68k_read8_map, 0x080000, 0x0bffff, PicoReadS68k8_dec, 1); + cpu68k_map_set(s68k_read16_map, 0x080000, 0x0bffff, PicoReadS68k16_dec, 1); + cpu68k_map_set(s68k_write8_map, 0x080000, 0x0bffff, PicoWriteS68k8_dec, 1); + cpu68k_map_set(s68k_write16_map, 0x080000, 0x0bffff, PicoWriteS68k16_dec, 1); } - // Error - Program Counter is invalid - elprintf(EL_ANOMALY, "s68k FIXME: unhandled jump to %06x", pc); - - return (int)Pico_mcd->prg_ram; -} - - -static u32 PicoCheckPcS68k(u32 pc) -{ - pc-=PicoCpuCS68k.membase; // Get real pc - pc&=0xfffffe; - - PicoCpuCS68k.membase=PicoMemBaseS68k(pc); - - return PicoCpuCS68k.membase+pc; -} -#endif - -#ifndef _ASM_CD_MEMORY_C -void PicoMemResetCD(int r3) -{ #ifdef EMU_F68K // update fetchmap.. int i; @@ -1636,7 +843,6 @@ void PicoMemResetCD(int r3) } #endif } -#endif #ifdef EMU_M68K static void m68k_mem_setup_cd(void); @@ -1644,43 +850,71 @@ static void m68k_mem_setup_cd(void); PICO_INTERNAL void PicoMemSetupCD(void) { - // additional handlers for common code - PicoRead16Hook = OtherRead16End; - PicoWrite8Hook = OtherWrite8End; + // setup default main68k map + PicoMemSetup(); + + // PicoMemRemapCD() will set up RAMs, so not done here + + // main68k map (BIOS mapped by PicoMemSetup()): + // RAM cart + if (PicoOpt & POPT_EN_MCD_RAMCART) { + cpu68k_map_set(m68k_read8_map, 0x400000, 0x7fffff, PicoReadM68k8_ramc, 1); + cpu68k_map_set(m68k_read16_map, 0x400000, 0x7fffff, PicoReadM68k16_ramc, 1); + cpu68k_map_set(m68k_write8_map, 0x400000, 0x7fffff, PicoWriteM68k8_ramc, 1); + cpu68k_map_set(m68k_write16_map, 0x400000, 0x7fffff, PicoWriteM68k16_ramc, 1); + } + + // registers/IO: + cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoReadM68k8_io, 1); + cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoReadM68k16_io, 1); + cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWriteM68k8_io, 1); + cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWriteM68k16_io, 1); + + // sub68k map + cpu68k_map_set(s68k_read8_map, 0x000000, 0xffffff, s68k_unmapped_read8, 1); + cpu68k_map_set(s68k_read16_map, 0x000000, 0xffffff, s68k_unmapped_read16, 1); + cpu68k_map_set(s68k_write8_map, 0x000000, 0xffffff, s68k_unmapped_write8, 1); + cpu68k_map_set(s68k_write16_map, 0x000000, 0xffffff, s68k_unmapped_write16, 1); + + // PRG RAM + cpu68k_map_set(s68k_read8_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); + cpu68k_map_set(s68k_read16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); + cpu68k_map_set(s68k_write8_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); + cpu68k_map_set(s68k_write16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0); + + // BRAM + cpu68k_map_set(s68k_read8_map, 0xfe0000, 0xfeffff, PicoReadS68k8_bram, 1); + cpu68k_map_set(s68k_read16_map, 0xfe0000, 0xfeffff, PicoReadS68k16_bram, 1); + cpu68k_map_set(s68k_write8_map, 0xfe0000, 0xfeffff, PicoWriteS68k8_bram, 1); + cpu68k_map_set(s68k_write16_map, 0xfe0000, 0xfeffff, PicoWriteS68k16_bram, 1); + + // PCM, regs + cpu68k_map_set(s68k_read8_map, 0xff0000, 0xffffff, PicoReadS68k8_pr, 1); + cpu68k_map_set(s68k_read16_map, 0xff0000, 0xffffff, PicoReadS68k16_pr, 1); + cpu68k_map_set(s68k_write8_map, 0xff0000, 0xffffff, PicoWriteS68k8_pr, 1); + cpu68k_map_set(s68k_write16_map, 0xff0000, 0xffffff, PicoWriteS68k16_pr, 1); #ifdef EMU_C68K - // Setup m68k memory callbacks: - PicoCpuCM68k.checkpc=PicoCheckPcM68k; - PicoCpuCM68k.fetch8 =PicoCpuCM68k.read8 =PicoReadM68k8; - PicoCpuCM68k.fetch16=PicoCpuCM68k.read16=PicoReadM68k16; - PicoCpuCM68k.fetch32=PicoCpuCM68k.read32=PicoReadM68k32; - PicoCpuCM68k.write8 =PicoWriteM68k8; - PicoCpuCM68k.write16=PicoWriteM68k16; - PicoCpuCM68k.write32=PicoWriteM68k32; // s68k - PicoCpuCS68k.checkpc=PicoCheckPcS68k; - PicoCpuCS68k.fetch8 =PicoCpuCS68k.read8 =PicoReadS68k8; - PicoCpuCS68k.fetch16=PicoCpuCS68k.read16=PicoReadS68k16; - PicoCpuCS68k.fetch32=PicoCpuCS68k.read32=PicoReadS68k32; - PicoCpuCS68k.write8 =PicoWriteS68k8; - PicoCpuCS68k.write16=PicoWriteS68k16; - PicoCpuCS68k.write32=PicoWriteS68k32; + PicoCpuCS68k.read8 = (void *)s68k_read8_map; + PicoCpuCS68k.read16 = (void *)s68k_read16_map; + PicoCpuCS68k.read32 = (void *)s68k_read16_map; + PicoCpuCS68k.write8 = (void *)s68k_write8_map; + PicoCpuCS68k.write16 = (void *)s68k_write16_map; + PicoCpuCS68k.write32 = (void *)s68k_write16_map; + PicoCpuCS68k.checkpc = NULL; /* unused */ + PicoCpuCS68k.fetch8 = NULL; + PicoCpuCS68k.fetch16 = NULL; + PicoCpuCS68k.fetch32 = NULL; #endif #ifdef EMU_F68K - // m68k - PicoCpuFM68k.read_byte =PicoReadM68k8; - PicoCpuFM68k.read_word =PicoReadM68k16; - PicoCpuFM68k.read_long =PicoReadM68k32; - PicoCpuFM68k.write_byte=PicoWriteM68k8; - PicoCpuFM68k.write_word=PicoWriteM68k16; - PicoCpuFM68k.write_long=PicoWriteM68k32; // s68k - PicoCpuFS68k.read_byte =PicoReadS68k8; - PicoCpuFS68k.read_word =PicoReadS68k16; - PicoCpuFS68k.read_long =PicoReadS68k32; - PicoCpuFS68k.write_byte=PicoWriteS68k8; - PicoCpuFS68k.write_word=PicoWriteS68k16; - PicoCpuFS68k.write_long=PicoWriteS68k32; + PicoCpuFS68k.read_byte = s68k_read8; + PicoCpuFS68k.read_word = s68k_read16; + PicoCpuFS68k.read_long = s68k_read32; + PicoCpuFS68k.write_byte = s68k_write8; + PicoCpuFS68k.write_word = s68k_write16; + PicoCpuFS68k.write_long = s68k_write32; // setup FAME fetchmap { @@ -1705,7 +939,7 @@ PICO_INTERNAL void PicoMemSetupCD(void) // WORD RAM 2M area for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++) PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x80000; - // PicoMemResetCD() will setup word ram for both + // PicoMemRemapCD() will setup word ram for both } #endif #ifdef EMU_M68K @@ -1718,109 +952,30 @@ PICO_INTERNAL void PicoMemSetupCD(void) #ifdef EMU_M68K +u32 m68k_read8(u32 a); +u32 m68k_read16(u32 a); +u32 m68k_read32(u32 a); +void m68k_write8(u32 a, u8 d); +void m68k_write16(u32 a, u16 d); +void m68k_write32(u32 a, u32 d); + static unsigned int PicoReadCD8w (unsigned int a) { - return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k8(a) : PicoReadM68k8(a); + return m68ki_cpu_p == &PicoCpuMS68k ? s68k_read8(a) : m68k_read8(a); } static unsigned int PicoReadCD16w(unsigned int a) { - return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k16(a) : PicoReadM68k16(a); + return m68ki_cpu_p == &PicoCpuMS68k ? s68k_read16(a) : m68k_read16(a); } static unsigned int PicoReadCD32w(unsigned int a) { - return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k32(a) : PicoReadM68k32(a); + return m68ki_cpu_p == &PicoCpuMS68k ? s68k_read32(a) : m68k_read32(a); } static void PicoWriteCD8w (unsigned int a, unsigned char d) { - if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d); + if (m68ki_cpu_p == &PicoCpuMS68k) s68k_write8(a, d); else m68k_write8(a, d); } static void PicoWriteCD16w(unsigned int a, unsigned short d) { - if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d); + if (m68ki_cpu_p == &PicoCpuMS68k) s68k_write16(a, d); else m68k_write16(a, d); } static void PicoWriteCD32w(unsigned int a, unsigned int d) { - if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d); -} - -// these are allowed to access RAM -static unsigned int m68k_read_pcrelative_CD8 (unsigned int a) -{ - a&=0xffffff; - if(m68ki_cpu_p == &PicoCpuMS68k) { - if (a < 0x80000) return *(u8 *)(Pico_mcd->prg_ram+(a^1)); // PRG Ram - if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff) - return *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff)); - if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff) - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff)); - } - 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 - if((a&0xfc0000)==0x200000) { // word RAM - if(!(Pico_mcd->s68k_regs[3]&4)) // 2M? - return *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff)); - else if (a < 0x220000) { - int bank = Pico_mcd->s68k_regs[3]&1; - return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff)); - } - } - elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a); - } - return 0;//(u8) lastread_d; -} -static unsigned int m68k_read_pcrelative_CD16(unsigned int a) -{ - a&=0xffffff; - if(m68ki_cpu_p == &PicoCpuMS68k) { - if (a < 0x80000) return *(u16 *)(Pico_mcd->prg_ram+(a&~1)); // PRG Ram - if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff) - return *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); - if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff) - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - } - 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 - if((a&0xfc0000)==0x200000) { // word RAM - if(!(Pico_mcd->s68k_regs[3]&4)) // 2M? - return *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); - else if (a < 0x220000) { - int bank = Pico_mcd->s68k_regs[3]&1; - return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - } - } - elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a); - } - return 0; -} -static unsigned int m68k_read_pcrelative_CD32(unsigned int a) -{ - u16 *pm; - a&=0xffffff; - if(m68ki_cpu_p == &PicoCpuMS68k) { - if (a < 0x80000) { u16 *pm=(u16 *)(Pico_mcd->prg_ram+(a&~1)); return (pm[0]<<16)|pm[1]; } // PRG Ram - if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff) - { pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); return (pm[0]<<16)|pm[1]; } - if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff) - int bank = (Pico_mcd->s68k_regs[3]&1)^1; - pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - return (pm[0]<<16)|pm[1]; - } - 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]; } - if((a&0xfc0000)==0x200000) { // word RAM - if(!(Pico_mcd->s68k_regs[3]&4)) // 2M? - { pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); return (pm[0]<<16)|pm[1]; } - else if (a < 0x220000) { - int bank = Pico_mcd->s68k_regs[3]&1; - pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); - return (pm[0]<<16)|pm[1]; - } - } - elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a); - } - return 0; + if (m68ki_cpu_p == &PicoCpuMS68k) s68k_write32(a, d); else m68k_write32(a, d); } extern unsigned int (*pm68k_read_memory_8) (unsigned int address); @@ -1829,9 +984,6 @@ extern unsigned int (*pm68k_read_memory_32)(unsigned int address); extern void (*pm68k_write_memory_8) (unsigned int address, unsigned char value); extern void (*pm68k_write_memory_16)(unsigned int address, unsigned short value); extern void (*pm68k_write_memory_32)(unsigned int address, unsigned int value); -extern unsigned int (*pm68k_read_memory_pcr_8) (unsigned int address); -extern unsigned int (*pm68k_read_memory_pcr_16)(unsigned int address); -extern unsigned int (*pm68k_read_memory_pcr_32)(unsigned int address); static void m68k_mem_setup_cd(void) { @@ -1841,9 +993,6 @@ static void m68k_mem_setup_cd(void) pm68k_write_memory_8 = PicoWriteCD8w; pm68k_write_memory_16 = PicoWriteCD16w; pm68k_write_memory_32 = PicoWriteCD32w; - pm68k_read_memory_pcr_8 = m68k_read_pcrelative_CD8; - pm68k_read_memory_pcr_16 = m68k_read_pcrelative_CD16; - pm68k_read_memory_pcr_32 = m68k_read_pcrelative_CD32; } #endif // EMU_M68K