#include "../memory.h"\r
\r
#include "gfx_cd.h"\r
-#include "pcm.h"\r
\r
uptr s68k_read8_map [0x1000000 >> M68K_MEM_SHIFT];\r
uptr s68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];\r
\r
// provided by ASM code:\r
#ifdef _ASM_CD_MEMORY_C\r
-u32 PicoReadM68k8_io(u32 a);\r
-u32 PicoReadM68k16_io(u32 a);\r
-void PicoWriteM68k8_io(u32 a, u32 d);\r
-void PicoWriteM68k16_io(u32 a, u32 d);\r
-\r
u32 PicoReadS68k8_pr(u32 a);\r
u32 PicoReadS68k16_pr(u32 a);\r
void PicoWriteS68k8_pr(u32 a, u32 d);\r
void PicoWriteS68k16_dec_m2b1(u32 a, u32 d);\r
#endif\r
\r
-static void remap_prg_window(int r3);\r
-static void remap_word_ram(int r3);\r
+static void remap_prg_window(u32 r1, u32 r3);\r
+static void remap_word_ram(u32 r3);\r
\r
// poller detection\r
#define POLL_LIMIT 16\r
-#define POLL_CYCLES 124\r
+#define POLL_CYCLES 64\r
\r
-u32 m68k_comm_check(u32 a, u32 d)\r
+void m68k_comm_check(u32 a)\r
{\r
pcd_sync_s68k(SekCyclesDone(), 0);\r
- if (a != Pico_mcd->m.m68k_poll_a) {\r
+ if (SekNotPolling || a != Pico_mcd->m.m68k_poll_a) {\r
Pico_mcd->m.m68k_poll_a = a;\r
Pico_mcd->m.m68k_poll_cnt = 0;\r
- return d;\r
+ SekNotPolling = 0;\r
+ return;\r
}\r
Pico_mcd->m.m68k_poll_cnt++;\r
- return d;\r
}\r
\r
#ifndef _ASM_CD_MEMORY_C\r
static u32 m68k_reg_read16(u32 a)\r
{\r
- u32 d=0;\r
+ u32 d = 0;\r
a &= 0x3e;\r
\r
switch (a) {\r
case 0:\r
- d = ((Pico_mcd->s68k_regs[0x33]<<13)&0x8000) | Pico_mcd->m.busreq; // here IFL2 is always 0, just like in Gens\r
+ // here IFL2 is always 0, just like in Gens\r
+ d = ((Pico_mcd->s68k_regs[0x33] << 13) & 0x8000)\r
+ | Pico_mcd->m.busreq;\r
goto end;\r
case 2:\r
+ m68k_comm_check(a);\r
d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);\r
elprintf(EL_CDREG3, "m68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
- goto end_comm;\r
+ goto end;\r
case 4:\r
d = Pico_mcd->s68k_regs[4]<<8;\r
goto end;\r
\r
if (a < 0x30) {\r
// comm flag/cmd/status (0xE-0x2F)\r
+ m68k_comm_check(a);\r
d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];\r
- goto end_comm;\r
+ goto end;\r
}\r
\r
elprintf(EL_UIO, "m68k_regs FIXME invalid read @ %02x", a);\r
\r
end:\r
return d;\r
-\r
-end_comm:\r
- return m68k_comm_check(a, d);\r
}\r
#endif\r
\r
u32 dold;\r
a &= 0x3f;\r
\r
- Pico_mcd->m.m68k_poll_a =\r
- Pico_mcd->m.m68k_poll_cnt = 0;\r
-\r
switch (a) {\r
case 0:\r
d &= 1;\r
return;\r
case 1:\r
d &= 3;\r
- elprintf(EL_CDREGS, "d m.busreq %u %u", d, Pico_mcd->m.busreq);\r
- if (d == Pico_mcd->m.busreq)\r
+ dold = Pico_mcd->m.busreq;\r
+ if (!(d & 1))\r
+ d |= 2; // verified: can't release bus on reset\r
+ if (dold == d)\r
return;\r
+\r
pcd_sync_s68k(SekCyclesDone(), 0);\r
\r
- if ((Pico_mcd->m.busreq ^ d) & 1) {\r
+ if ((dold ^ d) & 1)\r
elprintf(EL_INTSW, "m68k: s68k reset %i", !(d&1));\r
- if (!(d & 1))\r
- d |= 2; // verified: reset also gives bus\r
- else {\r
- elprintf(EL_CDREGS, "m68k: resetting s68k");\r
- SekResetS68k();\r
- }\r
+ if (!(d & 1))\r
+ Pico_mcd->m.state_flags |= PCD_ST_S68K_RST;\r
+ else if (d == 1 && (Pico_mcd->m.state_flags & PCD_ST_S68K_RST)) {\r
+ Pico_mcd->m.state_flags &= ~PCD_ST_S68K_RST;\r
+ elprintf(EL_CDREGS, "m68k: resetting s68k");\r
+ SekResetS68k();\r
}\r
- if ((Pico_mcd->m.busreq ^ d) & 2) {\r
+ if ((dold ^ d) & 2) {\r
elprintf(EL_INTSW, "m68k: s68k brq %i", d >> 1);\r
- remap_prg_window(Pico_mcd->s68k_regs[3]);\r
+ remap_prg_window(d, Pico_mcd->s68k_regs[3]);\r
}\r
Pico_mcd->m.busreq = d;\r
return;\r
if ((d ^ dold) & 0xc0) {\r
elprintf(EL_CDREGS, "m68k: prg bank: %i -> %i",\r
(Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));\r
- remap_prg_window(d);\r
+ remap_prg_window(Pico_mcd->m.busreq, d);\r
}\r
\r
// 2M mode state is tracked regardless of current mode\r
((u16 *)Pico_mcd->bios)[0x70/2], ((u16 *)Pico_mcd->bios)[0x72/2]);\r
return;\r
case 0x0f:\r
- d = (d << 1) | ((d >> 7) & 1); // rol8 1 (special case)\r
a = 0x0e;\r
case 0x0e:\r
goto write_comm;\r
if (d == Pico_mcd->s68k_regs[a])\r
return;\r
\r
- Pico_mcd->s68k_regs[a] = d;\r
pcd_sync_s68k(SekCyclesDone(), 0);\r
- if (Pico_mcd->m.s68k_poll_a == a && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
+ Pico_mcd->s68k_regs[a] = d;\r
+ if (Pico_mcd->m.s68k_poll_a == (a & ~1)\r
+ && Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT)\r
+ {\r
SekSetStopS68k(0);\r
Pico_mcd->m.s68k_poll_a = 0;\r
elprintf(EL_CDPOLL, "s68k poll release, a=%02x", a);\r
}\r
}\r
\r
-#ifndef _ASM_CD_MEMORY_C\r
-static\r
-#endif\r
u32 s68k_poll_detect(u32 a, u32 d)\r
{\r
#ifdef USE_POLL_DETECT\r
return d;\r
\r
cycles = SekCyclesDoneS68k();\r
- if (a == Pico_mcd->m.s68k_poll_a) {\r
+ if (!SekNotPolling && a == Pico_mcd->m.s68k_poll_a) {\r
u32 clkdiff = cycles - Pico_mcd->m.s68k_poll_clk;\r
if (clkdiff <= POLL_CYCLES) {\r
cnt = Pico_mcd->m.s68k_poll_cnt + 1;\r
//printf("-- diff: %u, cnt = %i\n", clkdiff, cnt);\r
if (Pico_mcd->m.s68k_poll_cnt > POLL_LIMIT) {\r
SekSetStopS68k(1);\r
- elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x",\r
+ elprintf(EL_CDPOLL, "s68k poll detected @%06x, a=%02x",\r
SekPcS68k, a);\r
}\r
}\r
Pico_mcd->m.s68k_poll_a = a;\r
Pico_mcd->m.s68k_poll_clk = cycles;\r
Pico_mcd->m.s68k_poll_cnt = cnt;\r
+ SekNotPollingS68k = 0;\r
#endif\r
return d;\r
}\r
{\r
// Warning: d might have upper bits set\r
switch (a) {\r
+ case 1:\r
+ if (!(d & 1))\r
+ pcd_soft_reset();\r
+ return;\r
case 2:\r
return; // only m68k can change WP\r
case 3: {\r
Pico_mcd->m.stopwatch_base_c = SekCyclesDoneS68k();\r
return;\r
case 0x0e:\r
- d &= 0xff;\r
- d = (d>>1) | (d<<7); // ror8 1, Gens note: Dragons lair\r
a = 0x0f;\r
case 0x0f:\r
goto write_comm;\r
return;\r
}\r
\r
- elprintf(EL_UIO, "m68k unmapped w8 [%06x] %02x @%06x", a, d & 0xff, SekPc);\r
+ elprintf(EL_UIO, "m68k unmapped w8 [%06x] %02x @%06x",\r
+ a, d & 0xff, SekPc);\r
}\r
\r
static void PicoWriteM68k16_ramc(u32 a, u32 d)\r
{\r
- elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
+ elprintf(EL_ANOMALY, "ramcart w16: [%06x] %04x @%06x",\r
+ a, d, SekPcS68k);\r
PicoWriteM68k8_ramc(a + 1, d);\r
}\r
\r
// IO/control/cd registers (a10000 - ...)\r
#ifndef _ASM_CD_MEMORY_C\r
-static u32 PicoReadM68k8_io(u32 a)\r
+u32 PicoRead8_mcd_io(u32 a)\r
{\r
u32 d;\r
if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
if (!(a & 1))\r
d >>= 8;\r
d &= 0xff;\r
- elprintf(EL_CDREGS, "m68k_regs r8: [%02x] %02x @%06x", a & 0x3f, d, SekPc);\r
+ elprintf(EL_CDREGS, "m68k_regs r8: [%02x] %02x @%06x",\r
+ a & 0x3f, d, SekPc);\r
return d;\r
}\r
\r
return PicoRead8_io(a);\r
}\r
\r
-static u32 PicoReadM68k16_io(u32 a)\r
+u32 PicoRead16_mcd_io(u32 a)\r
{\r
u32 d;\r
if ((a & 0xff00) == 0x2000) {\r
d = m68k_reg_read16(a);\r
- elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x", a & 0x3f, d, SekPc);\r
+ elprintf(EL_CDREGS, "m68k_regs r16: [%02x] %04x @%06x",\r
+ a & 0x3f, d, SekPc);\r
return d;\r
}\r
\r
return PicoRead16_io(a);\r
}\r
\r
-static void PicoWriteM68k8_io(u32 a, u32 d)\r
+void PicoWrite8_mcd_io(u32 a, u32 d)\r
{\r
if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
- elprintf(EL_CDREGS, "m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);\r
+ elprintf(EL_CDREGS, "m68k_regs w8: [%02x] %02x @%06x",\r
+ a & 0x3f, d, SekPc);\r
m68k_reg_write8(a, d);\r
return;\r
}\r
PicoWrite16_io(a, d);\r
}\r
\r
-static void PicoWriteM68k16_io(u32 a, u32 d)\r
+void PicoWrite16_mcd_io(u32 a, u32 d)\r
{\r
if ((a & 0xff00) == 0x2000) { // a12000 - a120ff\r
- elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);\r
+ elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",\r
+ a & 0x3f, d, SekPc);\r
\r
m68k_reg_write8(a, d >> 8);\r
if ((a & 0x3e) != 0x0e) // special case\r
\r
static void s68k_unmapped_write8(u32 a, u32 d)\r
{\r
- elprintf(EL_UIO, "s68k unmapped w8 [%06x] %02x @%06x", a, d & 0xff, SekPc);\r
+ elprintf(EL_UIO, "s68k unmapped w8 [%06x] %02x @%06x",\r
+ a, d & 0xff, SekPc);\r
}\r
\r
static void s68k_unmapped_write16(u32 a, u32 d)\r
{\r
- elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x", a, d & 0xffff, SekPc);\r
+ elprintf(EL_UIO, "s68k unmapped w16 [%06x] %04x @%06x",\r
+ a, d & 0xffff, SekPc);\r
}\r
\r
-// PRG RAM protected range (000000 - 00ff00)?\r
+// PRG RAM protected range (000000 - 01fdff)?\r
// XXX verify: ff00 or 1fe00 max?\r
static void PicoWriteS68k8_prgwp(u32 a, u32 d)\r
{\r
- if (a >= (Pico_mcd->s68k_regs[2] << 8))\r
+ if (a >= (Pico_mcd->s68k_regs[2] << 9))\r
Pico_mcd->prg_ram[a ^ 1] = d;\r
}\r
\r
static void PicoWriteS68k16_prgwp(u32 a, u32 d)\r
{\r
- if (a >= (Pico_mcd->s68k_regs[2] << 8))\r
+ if (a >= (Pico_mcd->s68k_regs[2] << 9))\r
*(u16 *)(Pico_mcd->prg_ram + a) = d;\r
}\r
\r
a &= 0x1ff;\r
if (a >= 0x0e && a < 0x30) {\r
d = Pico_mcd->s68k_regs[a];\r
- s68k_poll_detect(a, d);\r
+ s68k_poll_detect(a & ~1, d);\r
goto regs_done;\r
}\r
else if (a >= 0x58 && a < 0x68)\r
\r
regs_done:\r
d &= 0xff;\r
- elprintf(EL_CDREGS, "s68k_regs r8: [%02x] %02x @ %06x",\r
+ elprintf(EL_CDREGS, "s68k_regs r8: [%02x] %02x @%06x",\r
a, d, SekPcS68k);\r
return d;\r
}\r
a &= 0x7fff;\r
if (a >= 0x2000)\r
d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a >> 1) & 0xfff];\r
- else if (a >= 0x20) {\r
- a &= 0x1e;\r
- d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;\r
- if (a & 2)\r
- d >>= 8;\r
- }\r
- return d & 0xff;\r
+ else if (a >= 0x20)\r
+ d = pcd_pcm_read(a >> 1);\r
+\r
+ return d;\r
}\r
\r
return s68k_unmapped_read8(a);\r
d = gfx_cd_read(a);\r
else d = s68k_reg_read16(a);\r
\r
- elprintf(EL_CDREGS, "s68k_regs r16: [%02x] %04x @ %06x",\r
+ elprintf(EL_CDREGS, "s68k_regs r16: [%02x] %04x @%06x",\r
a, d, SekPcS68k);\r
return d;\r
}\r
\r
// PCM\r
if ((a & 0x8000) == 0x0000) {\r
- //elprintf(EL_ANOMALY, "FIXME: s68k_pcm r16: [%06x] @%06x", a, SekPcS68k);\r
a &= 0x7fff;\r
if (a >= 0x2000)\r
- d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff];\r
- else if (a >= 0x20) {\r
- a &= 0x1e;\r
- d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;\r
- if (a & 2) d >>= 8;\r
- }\r
- elprintf(EL_CDREGS, "ret = %04x", d);\r
+ d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a >> 1) & 0xfff];\r
+ else if (a >= 0x20)\r
+ d = pcd_pcm_read(a >> 1);\r
+\r
return d;\r
}\r
\r
// regs\r
if ((a & 0xfe00) == 0x8000) {\r
a &= 0x1ff;\r
- elprintf(EL_CDREGS, "s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k);\r
+ elprintf(EL_CDREGS, "s68k_regs w8: [%02x] %02x @%06x", a, d, SekPcS68k);\r
if (0x58 <= a && a < 0x68)\r
gfx_cd_write16(a&~1, (d<<8)|d);\r
else s68k_reg_write8(a,d);\r
if (a >= 0x2000)\r
Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d;\r
else if (a < 0x12)\r
- pcm_write(a>>1, d);\r
+ pcd_pcm_write(a>>1, d);\r
return;\r
}\r
\r
// regs\r
if ((a & 0xfe00) == 0x8000) {\r
a &= 0x1fe;\r
- elprintf(EL_CDREGS, "s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k);\r
+ elprintf(EL_CDREGS, "s68k_regs w16: [%02x] %04x @%06x", a, d, SekPcS68k);\r
if (a >= 0x58 && a < 0x68)\r
gfx_cd_write16(a, d);\r
else {\r
if (a >= 0x2000)\r
Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff] = d;\r
else if (a < 0x12)\r
- pcm_write(a>>1, d & 0xff);\r
+ pcd_pcm_write(a>>1, d & 0xff);\r
return;\r
}\r
\r
\r
// -----------------------------------------------------------------\r
\r
-static void remap_prg_window(int r3)\r
+static void remap_prg_window(u32 r1, u32 r3)\r
{\r
// PRG RAM\r
- if (Pico_mcd->m.busreq & 2) {\r
- void *bank = Pico_mcd->prg_ram_b[r3 >> 6];\r
+ if (r1 & 2) {\r
+ void *bank = Pico_mcd->prg_ram_b[(r3 >> 6) & 3];\r
cpu68k_map_all_ram(0x020000, 0x03ffff, bank, 0);\r
}\r
else {\r
}\r
}\r
\r
-static void remap_word_ram(int r3)\r
+static void remap_word_ram(u32 r3)\r
{\r
void *bank;\r
\r
\r
void pcd_state_loaded_mem(void)\r
{\r
- int r3 = Pico_mcd->s68k_regs[3];\r
+ u32 r3 = Pico_mcd->s68k_regs[3];\r
\r
/* after load events */\r
if (r3 & 4) // 1M mode?\r
wram_2M_to_1M(Pico_mcd->word_ram2M);\r
remap_word_ram(r3);\r
- remap_prg_window(r3);\r
+ remap_prg_window(Pico_mcd->m.busreq, r3);\r
Pico_mcd->m.dmna_ret_2m &= 3;\r
\r
// restore hint vector\r
}\r
\r
// registers/IO:\r
- cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoReadM68k8_io, 1);\r
- cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoReadM68k16_io, 1);\r
- cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWriteM68k8_io, 1);\r
- cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWriteM68k16_io, 1);\r
+ cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoRead8_mcd_io, 1);\r
+ cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoRead16_mcd_io, 1);\r
+ cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWrite8_mcd_io, 1);\r
+ cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWrite16_mcd_io, 1);\r
\r
// sub68k map\r
cpu68k_map_set(s68k_read8_map, 0x000000, 0xffffff, s68k_unmapped_read8, 1);\r
cpu68k_map_set(s68k_read16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0);\r
cpu68k_map_set(s68k_write8_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0);\r
cpu68k_map_set(s68k_write16_map, 0x000000, 0x07ffff, Pico_mcd->prg_ram, 0);\r
- cpu68k_map_set(s68k_write8_map, 0x000000, 0x00ffff, PicoWriteS68k8_prgwp, 1);\r
- cpu68k_map_set(s68k_write16_map, 0x000000, 0x00ffff, PicoWriteS68k16_prgwp, 1);\r
+ cpu68k_map_set(s68k_write8_map, 0x000000, 0x01ffff, PicoWriteS68k8_prgwp, 1);\r
+ cpu68k_map_set(s68k_write16_map, 0x000000, 0x01ffff, PicoWriteS68k16_prgwp, 1);\r
\r
// BRAM\r
cpu68k_map_set(s68k_read8_map, 0xfe0000, 0xfeffff, PicoReadS68k8_bram, 1);\r