-// This is part of Pico Library\r
+// Memory I/O handlers for Sega/Mega CD.\r
+// Loosely based on Gens code.\r
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas\r
\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
-// A68K no longer supported here\r
\r
//#define __debug_io\r
\r
#include "../PicoInt.h"\r
\r
-#include "../sound/sound.h"\r
#include "../sound/ym2612.h"\r
#include "../sound/sn76496.h"\r
\r
#include "gfx_cd.h"\r
#include "pcm.h"\r
\r
+#ifndef UTYPES_DEFINED\r
typedef unsigned char u8;\r
typedef unsigned short u16;\r
typedef unsigned int u32;\r
+#define UTYPES_DEFINED\r
+#endif\r
\r
//#define __debug_io\r
//#define __debug_io2\r
#define rdprintf(...)\r
//#define wrdprintf dprintf\r
#define wrdprintf(...)\r
-//#define plprintf dprintf\r
-#define plprintf(...)\r
+#define plprintf dprintf\r
+//#define plprintf(...)\r
+\r
+#ifdef EMU_CORE_DEBUG\r
+extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16];\r
+extern int lrp_cyc, lwp_cyc;\r
+#undef USE_POLL_DETECT\r
+#endif\r
\r
// -----------------------------------------------------------------\r
\r
// poller detection\r
-//#undef USE_POLL_DETECT\r
#define POLL_LIMIT 16\r
#define POLL_CYCLES 124\r
// int m68k_poll_addr, m68k_poll_cnt;\r
Pico_mcd->m.busreq = d;\r
return;\r
case 2:\r
+ dprintf("m68k: prg wp=%02x", d);\r
Pico_mcd->s68k_regs[2] = d; // really use s68k side register\r
return;\r
case 3: {\r
{\r
//dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k);\r
\r
- // TODO: review against Gens\r
// Warning: d might have upper bits set\r
switch (a) {\r
case 2:\r
if (d&4) {\r
if ((d ^ dold) & 5) {\r
d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit\r
-#ifdef _ASM_CD_MEMORY_C\r
PicoMemResetCD(d);\r
-#endif\r
}\r
#ifdef _ASM_CD_MEMORY_C\r
if ((d ^ dold) & 0x1d)\r
d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode\r
}\r
wram_1M_to_2M(Pico_mcd->word_ram2M);\r
-#ifdef _ASM_CD_MEMORY_C\r
PicoMemResetCD(d);\r
-#endif\r
}\r
else\r
d |= dold&1;\r
goto end;\r
}\r
\r
+ if (a==0x400000) {\r
+ if (SRam.data != NULL) d=3; // 64k cart\r
+ goto end;\r
+ }\r
+\r
+ if ((a&0xfe0000)==0x600000) {\r
+ if (SRam.data != NULL) {\r
+ d=SRam.data[((a>>1)&0xffff)+0x2000];\r
+ if (realsize == 8) d|=d<<8;\r
+ }\r
+ goto end;\r
+ }\r
+\r
+ if (a==0x7ffffe) {\r
+ d=Pico_mcd->m.bcram_reg;\r
+ goto end;\r
+ }\r
+\r
dprintf("m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);\r
\r
end:\r
{\r
if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; }\r
\r
- dprintf("m68k FIXME: strange w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
-}\r
+ if ((a&0xfe0000)==0x600000) {\r
+ if (SRam.data != NULL && (Pico_mcd->m.bcram_reg&1)) {\r
+ SRam.data[((a>>1)&0xffff)+0x2000]=d;\r
+ SRam.changed = 1;\r
+ }\r
+ return;\r
+ }\r
+\r
+ if (a==0x7fffff) {\r
+ Pico_mcd->m.bcram_reg=d;\r
+ return;\r
+ }\r
\r
+ dprintf("m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
+}\r
\r
+#define _CD_MEMORY_C\r
#undef _ASM_MEMORY_C\r
#include "../MemoryCmn.c"\r
#include "cell_map.c"\r
// -----------------------------------------------------------------\r
// Read Rom and read Ram\r
\r
-//u8 PicoReadM68k8_(u32 a);\r
#ifdef _ASM_CD_MEMORY_C\r
-u8 PicoReadM68k8(u32 a);\r
+u32 PicoReadM68k8(u32 a);\r
#else\r
-static u8 PicoReadM68k8(u32 a)\r
+static u32 PicoReadM68k8(u32 a)\r
{\r
u32 d=0;\r
\r
if (a < 0x20000) { d = *(u8 *)(Pico_mcd->bios+(a^1)); goto end; } // bios\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
d = *(prg_bank+((a^1)&0x1ffff));\r
goto end;\r
#ifdef __debug_io\r
dprintf("r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
#endif\r
- return (u8)d;\r
+#ifdef EMU_CORE_DEBUG\r
+ if (a>=Pico.romsize) {\r
+ lastread_a = a;\r
+ lastread_d[lrp_cyc++&15] = d;\r
+ }\r
+#endif\r
+ return d;\r
}\r
#endif\r
\r
\r
#ifdef _ASM_CD_MEMORY_C\r
-u16 PicoReadM68k16(u32 a);\r
+u32 PicoReadM68k16(u32 a);\r
#else\r
-static u16 PicoReadM68k16(u32 a)\r
+static u32 PicoReadM68k16(u32 a)\r
{\r
- u16 d=0;\r
+ u32 d=0;\r
\r
if ((a&0xe00000)==0xe00000) { d=*(u16 *)(Pico.ram+(a&0xfffe)); goto end; } // Ram\r
\r
if (a < 0x20000) { d = *(u16 *)(Pico_mcd->bios+a); goto end; } // bios\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
wrdprintf("m68k_prgram r16: [%i,%06x] @%06x", Pico_mcd->s68k_regs[3]>>6, a, SekPc);\r
d = *(u16 *)(prg_bank+(a&0x1fffe));\r
if ((a&0xffffc0)==0xa12000)\r
rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);\r
\r
- d = (u16)OtherRead16(a, 16);\r
+ d = OtherRead16(a, 16);\r
\r
if ((a&0xffffc0)==0xa12000)\r
rdprintf("ret = %04x", d);\r
\r
#ifdef __debug_io\r
dprintf("r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
+#endif\r
+#ifdef EMU_CORE_DEBUG\r
+ if (a>=Pico.romsize) {\r
+ lastread_a = a;\r
+ lastread_d[lrp_cyc++&15] = d;\r
+ }\r
#endif\r
return d;\r
}\r
if (a < 0x20000) { u16 *pm=(u16 *)(Pico_mcd->bios+a); d = (pm[0]<<16)|pm[1]; goto end; } // bios\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));\r
d = (pm[0]<<16)|pm[1];\r
end:\r
#ifdef __debug_io\r
dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
+#endif\r
+#ifdef EMU_CORE_DEBUG\r
+ if (a>=Pico.romsize) {\r
+ lastread_a = a;\r
+ lastread_d[lrp_cyc++&15] = d;\r
+ }\r
#endif\r
return d;\r
}\r
\r
\r
// -----------------------------------------------------------------\r
-// Write Ram\r
\r
#ifdef _ASM_CD_MEMORY_C\r
void PicoWriteM68k8(u32 a,u8 d);\r
#ifdef __debug_io\r
dprintf("w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc);\r
#endif\r
- //if ((a&0xe0ffff)==0xe0a9ba+0x69c)\r
- // dprintf("w8 : %06x, %02x @%06x", a&0xffffff, d, SekPc);\r
-\r
+#ifdef EMU_CORE_DEBUG\r
+ lastwrite_cyc_d[lwp_cyc++&15] = d;\r
+#endif\r
\r
if ((a&0xe00000)==0xe00000) { // Ram\r
*(u8 *)(Pico.ram+((a^1)&0xffff)) = d;\r
a&=0xffffff;\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
*(u8 *)(prg_bank+((a^1)&0x1ffff))=d;\r
return;\r
return;\r
}\r
\r
- OtherWrite8(a,d,8);\r
+ OtherWrite8(a,d);\r
}\r
#endif\r
\r
#ifdef __debug_io\r
dprintf("w16: %06x, %04x", a&0xffffff, d);\r
#endif\r
- // dprintf("w16: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
+#ifdef EMU_CORE_DEBUG\r
+ lastwrite_cyc_d[lwp_cyc++&15] = d;\r
+#endif\r
\r
if ((a&0xe00000)==0xe00000) { // Ram\r
*(u16 *)(Pico.ram+(a&0xfffe))=d;\r
a&=0xfffffe;\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
wrdprintf("m68k_prgram w16: [%i,%06x] %04x @%06x", Pico_mcd->s68k_regs[3]>>6, a, d, SekPc);\r
*(u16 *)(prg_bank+(a&0x1fffe))=d;\r
Pico_mcd->s68k_regs[0xe] = d >> 8;\r
#ifdef USE_POLL_DETECT\r
if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {\r
- SekSetStopS68k(0); s68k_poll_adclk = -1;\r
+ SekSetStopS68k(0); s68k_poll_adclk = 0;\r
plprintf("s68k poll release, a=%02x\n", a);\r
}\r
#endif\r
#ifdef __debug_io\r
dprintf("w32: %06x, %08x", a&0xffffff, d);\r
#endif\r
+#ifdef EMU_CORE_DEBUG\r
+ lastwrite_cyc_d[lwp_cyc++&15] = d;\r
+#endif\r
\r
if ((a&0xe00000)==0xe00000)\r
{\r
a&=0xfffffe;\r
\r
// prg RAM\r
- if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {\r
+ if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&3)!=1) {\r
u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
u16 *pm=(u16 *)(prg_bank+(a&0x1fffe));\r
pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
#endif\r
\r
\r
+// -----------------------------------------------------------------\r
+// S68k\r
// -----------------------------------------------------------------\r
\r
#ifdef _ASM_CD_MEMORY_C\r
-u8 PicoReadS68k8(u32 a);\r
+u32 PicoReadS68k8(u32 a);\r
#else\r
-static u8 PicoReadS68k8(u32 a)\r
+static u32 PicoReadS68k8(u32 a)\r
{\r
u32 d=0;\r
\r
+#ifdef EMU_CORE_DEBUG\r
+ u32 ab=a&0xfffffe;\r
+#endif\r
a&=0xffffff;\r
\r
// prg RAM\r
// test: batman returns\r
wrdprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];\r
if (a&1) d &= 0x0f;\r
else d >>= 4;\r
wrdprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);\r
// if (!(Pico_mcd->s68k_regs[3]&4))\r
// dprintf("s68k_wram1M FIXME: wrong mode");\r
- bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
d = Pico_mcd->word_ram1M[bank][(a^1)&0x1ffff];\r
wrdprintf("ret = %02x", (u8)d);\r
goto end;\r
#ifdef __debug_io2\r
dprintf("s68k r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);\r
#endif\r
- return (u8)d;\r
+#ifdef EMU_CORE_DEBUG\r
+ lastread_a = ab;\r
+ lastread_d[lrp_cyc++&15] = d;\r
+#endif\r
+ return d;\r
}\r
#endif\r
\r
\r
-//u16 PicoReadS68k16_(u32 a);\r
#ifdef _ASM_CD_MEMORY_C\r
-u16 PicoReadS68k16(u32 a);\r
+u32 PicoReadS68k16(u32 a);\r
#else\r
-static u16 PicoReadS68k16(u32 a)\r
+static u32 PicoReadS68k16(u32 a)\r
{\r
u32 d=0;\r
\r
+#ifdef EMU_CORE_DEBUG\r
+ u32 ab=a&0xfffffe;\r
+#endif\r
a&=0xfffffe;\r
\r
// prg RAM\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
wrdprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];\r
d |= d << 4; d &= ~0xf0;\r
dprintf("FIXME: decode");\r
wrdprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);\r
// if (!(Pico_mcd->s68k_regs[3]&4))\r
// dprintf("s68k_wram1M FIXME: wrong mode");\r
- bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
d = *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
wrdprintf("ret = %04x", d);\r
goto end;\r
\r
#ifdef __debug_io2\r
dprintf("s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
+#endif\r
+#ifdef EMU_CORE_DEBUG\r
+ lastread_a = ab;\r
+ lastread_d[lrp_cyc++&15] = d;\r
#endif\r
return d;\r
}\r
{\r
u32 d=0;\r
\r
+#ifdef EMU_CORE_DEBUG\r
+ u32 ab=a&0xfffffe;\r
+#endif\r
a&=0xfffffe;\r
\r
// prg RAM\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
wrdprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M decode mode?\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
a >>= 1;\r
d = Pico_mcd->word_ram1M[bank][((a+0)^1)&0x1ffff] << 16;\r
d |= Pico_mcd->word_ram1M[bank][((a+1)^1)&0x1ffff];\r
wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);\r
// if (!(Pico_mcd->s68k_regs[3]&4))\r
// dprintf("s68k_wram1M FIXME: wrong mode");\r
- bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];\r
wrdprintf("ret = %08x", d);\r
goto end;\r
\r
#ifdef __debug_io2\r
dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
+#endif\r
+#ifdef EMU_CORE_DEBUG\r
+ if (ab > 0x78) { // not vectors and stuff\r
+ lastread_a = ab;\r
+ lastread_d[lrp_cyc++&15] = d;\r
+ }\r
#endif\r
return d;\r
}\r
/* check: jaguar xj 220 (draws entire world using decode) */\r
static void decode_write8(u32 a, u8 d, int r3)\r
{\r
- u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);\r
+ u8 *pd = Pico_mcd->word_ram1M[(r3 & 1)^1] + (((a>>1)^1)&0x1ffff);\r
u8 oldmask = (a&1) ? 0xf0 : 0x0f;\r
\r
r3 &= 0x18;\r
\r
static void decode_write16(u32 a, u16 d, int r3)\r
{\r
- u8 *pd = Pico_mcd->word_ram1M[!(r3 & 1)] + (((a>>1)^1)&0x1ffff);\r
+ u8 *pd = Pico_mcd->word_ram1M[(r3 & 1)^1] + (((a>>1)^1)&0x1ffff);\r
\r
//if ((a & 0x3ffff) < 0x28000) return;\r
\r
\r
a&=0xffffff;\r
\r
+#ifdef EMU_CORE_DEBUG\r
+ lastwrite_cyc_d[lwp_cyc++&15] = d;\r
+#endif\r
+\r
// prg RAM\r
if (a < 0x80000) {\r
u8 *pm=(u8 *)(Pico_mcd->prg_ram+(a^1));\r
- *pm=d;\r
+ if (a >= (Pico_mcd->s68k_regs[2]<<8)) *pm=d;\r
return;\r
}\r
\r
wrdprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);\r
// if (!(Pico_mcd->s68k_regs[3]&4))\r
// dprintf("s68k_wram1M FIXME: wrong mode");\r
- bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
*(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff))=d;\r
return;\r
}\r
\r
a&=0xfffffe;\r
\r
+#ifdef EMU_CORE_DEBUG\r
+ lastwrite_cyc_d[lwp_cyc++&15] = d;\r
+#endif\r
+\r
// prg RAM\r
if (a < 0x80000) {\r
wrdprintf("s68k_prgram w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
- *(u16 *)(Pico_mcd->prg_ram+a)=d;\r
+ if (a >= (Pico_mcd->s68k_regs[2]<<8)) // needed for Dungeon Explorer\r
+ *(u16 *)(Pico_mcd->prg_ram+a)=d;\r
return;\r
}\r
\r
wrdprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
// if (!(Pico_mcd->s68k_regs[3]&4))\r
// dprintf("s68k_wram1M FIXME: wrong mode");\r
- bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
*(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe))=d;\r
return;\r
}\r
\r
a&=0xfffffe;\r
\r
+#ifdef EMU_CORE_DEBUG\r
+ lastwrite_cyc_d[lwp_cyc++&15] = d;\r
+#endif\r
+\r
// prg RAM\r
if (a < 0x80000) {\r
- u16 *pm=(u16 *)(Pico_mcd->prg_ram+a);\r
- pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
+ if (a >= (Pico_mcd->s68k_regs[2]<<8)) {\r
+ u16 *pm=(u16 *)(Pico_mcd->prg_ram+a);\r
+ pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
+ }\r
return;\r
}\r
\r
wrdprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);\r
// if (!(Pico_mcd->s68k_regs[3]&4))\r
// dprintf("s68k_wram1M FIXME: wrong mode");\r
- bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
pm[0]=(u16)(d>>16); pm[1]=(u16)d;\r
return;\r
// -----------------------------------------------------------------\r
\r
\r
-#if defined(EMU_C68K)\r
+#ifdef EMU_C68K\r
static __inline int PicoMemBaseM68k(u32 pc)\r
{\r
if ((pc&0xe00000)==0xe00000)\r
if (!(Pico_mcd->s68k_regs[3]&4))\r
return (int)Pico_mcd->word_ram2M - 0x200000; // Program Counter in Word Ram\r
if (pc < 0x220000) {\r
- int bank = (Pico_mcd->s68k_regs[3]&1);\r
+ int bank = Pico_mcd->s68k_regs[3]&1;\r
return (int)Pico_mcd->word_ram1M[bank] - 0x200000;\r
}\r
}\r
\r
static u32 PicoCheckPcM68k(u32 pc)\r
{\r
- pc-=PicoCpu.membase; // Get real pc\r
+ pc-=PicoCpuCM68k.membase; // Get real pc\r
pc&=0xfffffe;\r
\r
- PicoCpu.membase=PicoMemBaseM68k(pc);\r
+ PicoCpuCM68k.membase=PicoMemBaseM68k(pc);\r
\r
- return PicoCpu.membase+pc;\r
+ return PicoCpuCM68k.membase+pc;\r
}\r
\r
\r
return (int)Pico_mcd->word_ram2M - 0x080000;\r
\r
if ((pc&0xfe0000)==0x0c0000) { // word RAM 1M area\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
return (int)Pico_mcd->word_ram1M[bank] - 0x0c0000;\r
}\r
\r
\r
static u32 PicoCheckPcS68k(u32 pc)\r
{\r
- pc-=PicoCpuS68k.membase; // Get real pc\r
+ pc-=PicoCpuCS68k.membase; // Get real pc\r
pc&=0xfffffe;\r
\r
- PicoCpuS68k.membase=PicoMemBaseS68k(pc);\r
+ PicoCpuCS68k.membase=PicoMemBaseS68k(pc);\r
\r
- return PicoCpuS68k.membase+pc;\r
+ return PicoCpuCS68k.membase+pc;\r
}\r
#endif\r
\r
+#ifndef _ASM_CD_MEMORY_C\r
+void PicoMemResetCD(int r3)\r
+{\r
+#ifdef EMU_F68K\r
+ // update fetchmap..\r
+ int i;\r
+ if (!(r3 & 4))\r
+ {\r
+ for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)\r
+ PicoCpuFM68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x200000;\r
+ }\r
+ else\r
+ {\r
+ for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)\r
+ PicoCpuFM68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;\r
+ for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)\r
+ PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;\r
+ }\r
+#endif\r
+}\r
+#endif\r
\r
-void PicoMemSetupCD()\r
+PICO_INTERNAL void PicoMemSetupCD(void)\r
{\r
dprintf("PicoMemSetupCD()");\r
#ifdef EMU_C68K\r
// Setup m68k memory callbacks:\r
- PicoCpu.checkpc=PicoCheckPcM68k;\r
- PicoCpu.fetch8 =PicoCpu.read8 =PicoReadM68k8;\r
- PicoCpu.fetch16=PicoCpu.read16=PicoReadM68k16;\r
- PicoCpu.fetch32=PicoCpu.read32=PicoReadM68k32;\r
- PicoCpu.write8 =PicoWriteM68k8;\r
- PicoCpu.write16=PicoWriteM68k16;\r
- PicoCpu.write32=PicoWriteM68k32;\r
+ PicoCpuCM68k.checkpc=PicoCheckPcM68k;\r
+ PicoCpuCM68k.fetch8 =PicoCpuCM68k.read8 =PicoReadM68k8;\r
+ PicoCpuCM68k.fetch16=PicoCpuCM68k.read16=PicoReadM68k16;\r
+ PicoCpuCM68k.fetch32=PicoCpuCM68k.read32=PicoReadM68k32;\r
+ PicoCpuCM68k.write8 =PicoWriteM68k8;\r
+ PicoCpuCM68k.write16=PicoWriteM68k16;\r
+ PicoCpuCM68k.write32=PicoWriteM68k32;\r
+ // s68k\r
+ PicoCpuCS68k.checkpc=PicoCheckPcS68k;\r
+ PicoCpuCS68k.fetch8 =PicoCpuCS68k.read8 =PicoReadS68k8;\r
+ PicoCpuCS68k.fetch16=PicoCpuCS68k.read16=PicoReadS68k16;\r
+ PicoCpuCS68k.fetch32=PicoCpuCS68k.read32=PicoReadS68k32;\r
+ PicoCpuCS68k.write8 =PicoWriteS68k8;\r
+ PicoCpuCS68k.write16=PicoWriteS68k16;\r
+ PicoCpuCS68k.write32=PicoWriteS68k32;\r
+#endif\r
+#ifdef EMU_F68K\r
+ // m68k\r
+ PicoCpuFM68k.read_byte =PicoReadM68k8;\r
+ PicoCpuFM68k.read_word =PicoReadM68k16;\r
+ PicoCpuFM68k.read_long =PicoReadM68k32;\r
+ PicoCpuFM68k.write_byte=PicoWriteM68k8;\r
+ PicoCpuFM68k.write_word=PicoWriteM68k16;\r
+ PicoCpuFM68k.write_long=PicoWriteM68k32;\r
// s68k\r
- PicoCpuS68k.checkpc=PicoCheckPcS68k;\r
- PicoCpuS68k.fetch8 =PicoCpuS68k.read8 =PicoReadS68k8;\r
- PicoCpuS68k.fetch16=PicoCpuS68k.read16=PicoReadS68k16;\r
- PicoCpuS68k.fetch32=PicoCpuS68k.read32=PicoReadS68k32;\r
- PicoCpuS68k.write8 =PicoWriteS68k8;\r
- PicoCpuS68k.write16=PicoWriteS68k16;\r
- PicoCpuS68k.write32=PicoWriteS68k32;\r
+ PicoCpuFS68k.read_byte =PicoReadS68k8;\r
+ PicoCpuFS68k.read_word =PicoReadS68k16;\r
+ PicoCpuFS68k.read_long =PicoReadS68k32;\r
+ PicoCpuFS68k.write_byte=PicoWriteS68k8;\r
+ PicoCpuFS68k.write_word=PicoWriteS68k16;\r
+ PicoCpuFS68k.write_long=PicoWriteS68k32;\r
+\r
+ // setup FAME fetchmap\r
+ {\r
+ int i;\r
+ // M68k\r
+ // by default, point everything to fitst 64k of ROM (BIOS)\r
+ for (i = 0; i < M68K_FETCHBANK1; i++)\r
+ PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));\r
+ // now real ROM (BIOS)\r
+ for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)\r
+ PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom;\r
+ // .. and RAM\r
+ for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)\r
+ PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));\r
+ // S68k\r
+ // PRG RAM is default\r
+ for (i = 0; i < M68K_FETCHBANK1; i++)\r
+ PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->prg_ram - (i<<(24-FAMEC_FETCHBITS));\r
+ // real PRG RAM\r
+ for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0x80000; i++)\r
+ PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->prg_ram;\r
+ // WORD RAM 2M area\r
+ for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++)\r
+ PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x80000;\r
+ // PicoMemResetCD() will setup word ram for both\r
+ }\r
#endif\r
+\r
// m68k_poll_addr = m68k_poll_cnt = 0;\r
s68k_poll_adclk = s68k_poll_cnt = 0;\r
}\r
\r
#ifdef EMU_M68K\r
unsigned char PicoReadCD8w (unsigned int a) {\r
- return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k8(a) : PicoReadM68k8(a);\r
+ return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k8(a) : PicoReadM68k8(a);\r
}\r
unsigned short PicoReadCD16w(unsigned int a) {\r
- return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k16(a) : PicoReadM68k16(a);\r
+ return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k16(a) : PicoReadM68k16(a);\r
}\r
unsigned int PicoReadCD32w(unsigned int a) {\r
- return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k32(a) : PicoReadM68k32(a);\r
+ return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k32(a) : PicoReadM68k32(a);\r
}\r
void PicoWriteCD8w (unsigned int a, unsigned char d) {\r
- if (m68ki_cpu_p == &PicoS68kCPU) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d);\r
+ if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d);\r
}\r
void PicoWriteCD16w(unsigned int a, unsigned short d) {\r
- if (m68ki_cpu_p == &PicoS68kCPU) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d);\r
+ if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d);\r
}\r
void PicoWriteCD32w(unsigned int a, unsigned int d) {\r
- if (m68ki_cpu_p == &PicoS68kCPU) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d);\r
+ if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d);\r
}\r
\r
// these are allowed to access RAM\r
-unsigned int m68k_read_pcrelative_CD8 (unsigned int a) {\r
+unsigned int m68k_read_pcrelative_CD8 (unsigned int a)\r
+{\r
a&=0xffffff;\r
- if(m68ki_cpu_p == &PicoS68kCPU) {\r
+ if(m68ki_cpu_p == &PicoCpuMS68k) {\r
if (a < 0x80000) return *(u8 *)(Pico_mcd->prg_ram+(a^1)); // PRG Ram\r
if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff)\r
return *(u8 *)(Pico_mcd->word_ram2M+((a^1)&0x3ffff));\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff)\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff));\r
}\r
dprintf("s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);\r
}\r
return 0;//(u8) lastread_d;\r
}\r
-unsigned int m68k_read_pcrelative_CD16(unsigned int a) {\r
+unsigned int m68k_read_pcrelative_CD16(unsigned int a)\r
+{\r
a&=0xffffff;\r
- if(m68ki_cpu_p == &PicoS68kCPU) {\r
+ if(m68ki_cpu_p == &PicoCpuMS68k) {\r
if (a < 0x80000) return *(u16 *)(Pico_mcd->prg_ram+(a&~1)); // PRG Ram\r
if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff)\r
return *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff)\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
}\r
dprintf("s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);\r
}\r
return 0;\r
}\r
-unsigned int m68k_read_pcrelative_CD32(unsigned int a) {\r
+unsigned int m68k_read_pcrelative_CD32(unsigned int a)\r
+{\r
u16 *pm;\r
a&=0xffffff;\r
- if(m68ki_cpu_p == &PicoS68kCPU) {\r
+ if(m68ki_cpu_p == &PicoCpuMS68k) {\r
if (a < 0x80000) { u16 *pm=(u16 *)(Pico_mcd->prg_ram+(a&~1)); return (pm[0]<<16)|pm[1]; } // PRG Ram\r
if ((a&0xfc0000)==0x080000 && !(Pico_mcd->s68k_regs[3]&4)) // word RAM (2M area: 080000-0bffff)\r
{ pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); return (pm[0]<<16)|pm[1]; }\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // word RAM (1M area: 0c0000-0dffff)\r
- int bank = !(Pico_mcd->s68k_regs[3]&1);\r
+ int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
return (pm[0]<<16)|pm[1];\r
}\r
notaz.gp2x.de / picodrive.git / blobdiff