#include "../sound/sn76496.h"\r
\r
#include "gfx_cd.h"\r
+#include "pcm.h"\r
\r
typedef unsigned char u8;\r
typedef unsigned short u16;\r
\r
// -----------------------------------------------------------------\r
\r
-// extern m68ki_cpu_core m68ki_cpu;\r
-\r
\r
static u32 m68k_reg_read16(u32 a)\r
{\r
goto end;\r
case 2:\r
d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);\r
- dprintf("m68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
+ dprintf("m68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);\r
goto end;\r
case 4:\r
d = Pico_mcd->s68k_regs[4]<<8;\r
goto end;\r
case 0xC:\r
dprintf("m68k stopwatch timer read");\r
- break;\r
+ d = Pico_mcd->m.timer_stopwatch >> 16;\r
+ goto end;\r
}\r
\r
if (a < 0x30) {\r
return;\r
case 0xe:\r
//dprintf("m68k: comm flag: %02x", d);\r
-\r
- //dprintf("s68k @ %06x", SekPcS68k);\r
-\r
Pico_mcd->s68k_regs[0xe] = d;\r
return;\r
}\r
goto end;\r
case 0xC:\r
dprintf("s68k stopwatch timer read");\r
- break;\r
+ d = Pico_mcd->m.timer_stopwatch >> 16;\r
+ goto end;\r
case 0x30:\r
dprintf("s68k int3 timer read");\r
break;\r
dprintf("s68k set CDC dma addr");\r
break;\r
case 0xc:\r
+ case 0xd:\r
dprintf("s68k set stopwatch timer");\r
- break;\r
+ Pico_mcd->m.timer_stopwatch = 0;\r
+ return;\r
+ case 0xe:\r
+ Pico_mcd->s68k_regs[0Xf] = (d>>1) | (d<<7); // ror8, Gens note: Dragons lair\r
+ Pico_mcd->m.timer_stopwatch = 0;\r
+ return;\r
case 0x31:\r
- dprintf("s68k set int3 timer");\r
+ dprintf("s68k set int3 timer: %02x", d);\r
+ Pico_mcd->m.timer_int3 = d << 16;\r
break;\r
case 0x33: // IRQ mask\r
dprintf("s68k irq mask: %02x", d);\r
return;\r
}\r
\r
- if ((a&0x1f0) == 0x10 || a == 0x0e || (a >= 0x38 && a < 0x42))\r
+ if ((a&0x1f0) == 0x10 || (a >= 0x38 && a < 0x42))\r
{\r
- dprintf("m68k: invalid write @ %02x?", a);\r
+ dprintf("s68k: invalid write @ %02x?", a);\r
return;\r
}\r
\r
\r
// word RAM (2M area)\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
- dprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_wram2M r8: [%06x] @%06x", a, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
// TODO (decode)\r
dprintf("(decode)");\r
\r
// word RAM (1M area)\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
- dprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_wram1M r8: [%06x] @%06x", a, SekPcS68k);\r
a=((a&0x1fffe)<<1)|(a&1);\r
if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
d = Pico_mcd->word_ram[a^1];\r
goto end;\r
}\r
\r
+ // PCM\r
+ if ((a&0xff8000)==0xff0000) {\r
+ dprintf("s68k_pcm r8: [%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
+ dprintf("ret = %02x", (u8)d);\r
+ goto end;\r
+ }\r
+\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
d = Pico_mcd->bram[(a>>1)&0x1fff];\r
\r
u16 PicoReadS68k16(u32 a)\r
{\r
- u16 d=0;\r
+ u32 d=0;\r
\r
a&=0xfffffe;\r
\r
\r
// word RAM (2M area)\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
- dprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_wram2M r16: [%06x] @%06x", a, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
// TODO (decode)\r
dprintf("(decode)");\r
\r
// word RAM (1M area)\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
- dprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_wram1M r16: [%06x] @%06x", a, SekPcS68k);\r
a=((a&0x1fffe)<<1);\r
if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
d = *(u16 *)(Pico_mcd->word_ram+a);\r
\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
- dprintf("s68k_bram r16: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_bram r16: [%06x] @%06x", a, SekPcS68k);\r
a = (a>>1)&0x1fff;\r
- d = Pico_mcd->bram[a++]; // Gens does little endian here, an so do we..\r
+ d = Pico_mcd->bram[a++]; // Gens does little endian here, and so do we..\r
d|= Pico_mcd->bram[a++] << 8;\r
dprintf("ret = %04x", d);\r
goto end;\r
}\r
\r
+ // PCM\r
+ if ((a&0xff8000)==0xff0000) {\r
+ dprintf("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
+ dprintf("ret = %04x", d);\r
+ goto end;\r
+ }\r
+\r
dprintf("s68k r16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
\r
end:\r
\r
// word RAM (2M area)\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
- dprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_wram2M r32: [%06x] @%06x", a, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
// TODO (decode)\r
dprintf("(decode)");\r
\r
// word RAM (1M area)\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
- dprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);\r
a=((a&0x1fffe)<<1);\r
if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
d = *(u16 *)(Pico_mcd->word_ram+a) << 16;\r
goto end;\r
}\r
\r
+ // PCM\r
+ if ((a&0xff8000)==0xff0000) {\r
+ dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);\r
+ a &= 0x7fff;\r
+ if (a >= 0x2000) {\r
+ a >>= 1;\r
+ d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][a&0xfff] << 16;\r
+ d |= Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a+1)&0xfff];\r
+ } else if (a >= 0x20) {\r
+ a &= 0x1e;\r
+ if (a & 2) {\r
+ a >>= 2;\r
+ d = (Pico_mcd->pcm.ch[a].addr >> (PCM_STEP_SHIFT-8)) & 0xff0000;\r
+ d |= (Pico_mcd->pcm.ch[(a+1)&7].addr >> PCM_STEP_SHIFT) & 0xff;\r
+ } else {\r
+ d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;\r
+ d = ((d<<16)&0xff0000) | ((d>>8)&0xff); // PCM chip is LE\r
+ }\r
+ }\r
+ dprintf("ret = %08x", d);\r
+ goto end;\r
+ }\r
+\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
- dprintf("s68k_bram r32: [%06x] @%06x", a, SekPc);\r
+ dprintf("s68k_bram r32: [%06x] @%06x", a, SekPcS68k);\r
a = (a>>1)&0x1fff;\r
d = Pico_mcd->bram[a++] << 16; // middle endian? TODO: verify against Fusion..\r
d|= Pico_mcd->bram[a++] << 24;\r
return;\r
}\r
\r
- if (a != 0xff0011 && (a&0xff8000) == 0xff0000) // PCM hack\r
- return;\r
-\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
a &= 0x1ff;\r
\r
// word RAM (2M area)\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
- dprintf("s68k_wram2M w8: [%06x] %02x @%06x", a, d, SekPc);\r
+ dprintf("s68k_wram2M w8: [%06x] %02x @%06x", a, d, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
// TODO (decode)\r
dprintf("(decode)");\r
// word RAM (1M area)\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
if (d)\r
- dprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPc);\r
+ dprintf("s68k_wram1M w8: [%06x] %02x @%06x", a, d, SekPcS68k);\r
a=((a&0x1fffe)<<1)|(a&1);\r
if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
*(u8 *)(Pico_mcd->word_ram+(a^1))=d;\r
return;\r
}\r
\r
+ // PCM\r
+ if ((a&0xff8000)==0xff0000) {\r
+ a &= 0x7fff;\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
+ return;\r
+ }\r
+\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
Pico_mcd->bram[(a>>1)&0x1fff] = d;\r
if (a >= 0x50 && a < 0x68)\r
gfx_cd_write(a, d);\r
else {\r
+ if (a == 0xe) { // special case, 2 byte writes would be handled differently\r
+ Pico_mcd->s68k_regs[0xf] = d;\r
+ return;\r
+ }\r
s68k_reg_write8(a, d>>8);\r
s68k_reg_write8(a+1,d&0xff);\r
}\r
\r
// word RAM (2M area)\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
- dprintf("s68k_wram2M w16: [%06x] %04x @%06x", a, d, SekPc);\r
+ dprintf("s68k_wram2M w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
// TODO (decode)\r
dprintf("(decode)");\r
// word RAM (1M area)\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
if (d)\r
- dprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPc);\r
+ dprintf("s68k_wram1M w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
a=((a&0x1fffe)<<1);\r
if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
*(u16 *)(Pico_mcd->word_ram+a)=d;\r
return;\r
}\r
\r
+ // PCM\r
+ if ((a&0xff8000)==0xff0000) {\r
+ a &= 0x7fff;\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
+ return;\r
+ }\r
+\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
- dprintf("s68k_bram w16: [%06x] %04x @%06x", a, d, SekPc);\r
+ dprintf("s68k_bram w16: [%06x] %04x @%06x", a, d, SekPcS68k);\r
a = (a>>1)&0x1fff;\r
Pico_mcd->bram[a++] = d; // Gens does little endian here, an so do we..\r
Pico_mcd->bram[a++] = d >> 8;\r
\r
// word RAM (2M area)\r
if ((a&0xfc0000)==0x080000) { // 080000-0bffff\r
- dprintf("s68k_wram2M w32: [%06x] %08x @%06x", a, d, SekPc);\r
+ dprintf("s68k_wram2M w32: [%06x] %08x @%06x", a, d, SekPcS68k);\r
if (Pico_mcd->s68k_regs[3]&4) { // 1M mode?\r
// TODO (decode)\r
dprintf("(decode)");\r
// word RAM (1M area)\r
if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
if (d)\r
- dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPc);\r
+ dprintf("s68k_wram1M w32: [%06x] %08x @%06x", a, d, SekPcS68k);\r
a=((a&0x1fffe)<<1);\r
if (!(Pico_mcd->s68k_regs[3]&1)) a+=2;\r
*(u16 *)(Pico_mcd->word_ram+a) = d>>16;\r
return;\r
}\r
\r
+ // PCM\r
+ if ((a&0xff8000)==0xff0000) {\r
+ a &= 0x7fff;\r
+ if (a >= 0x2000) {\r
+ a >>= 1;\r
+ Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][a&0xfff] = (d >> 16);\r
+ Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a+1)&0xfff] = d;\r
+ } else if (a < 0x12) {\r
+ a >>= 1;\r
+ pcm_write(a, (d>>16) & 0xff);\r
+ pcm_write(a+1, d & 0xff);\r
+ }\r
+ return;\r
+ }\r
+\r
// bram\r
if ((a&0xff0000)==0xfe0000) {\r
- dprintf("s68k_bram w32: [%06x] %08x @%06x", a, d, SekPc);\r
+ dprintf("s68k_bram w32: [%06x] %08x @%06x", a, d, SekPcS68k);\r
a = (a>>1)&0x1fff;\r
Pico_mcd->bram[a++] = d >> 16; // middle endian? verify?\r
Pico_mcd->bram[a++] = d >> 24;\r