// This is part of Pico Library\r
\r
// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, 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
#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
//#define __debug_io\r
//#define __debug_io2\r
-#define rdprintf dprintf\r
-//#define rdprintf(...)\r
+//#define rdprintf dprintf\r
+#define rdprintf(...)\r
\r
// -----------------------------------------------------------------\r
\r
-// extern m68ki_cpu_core m68ki_cpu;\r
-\r
-extern int counter75hz;\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
dprintf("m68k reserved read");\r
goto end;\r
case 0xC:\r
- dprintf("m68k stopwatch read");\r
- break;\r
+ dprintf("m68k stopwatch timer read");\r
+ d = Pico_mcd->m.timer_stopwatch >> 16;\r
+ goto end;\r
}\r
\r
if (a < 0x30) {\r
return;\r
case 1:\r
d &= 3;\r
- if (!(d&1)) PicoMCD |= 2; // reset pending, needed to be sure we fetch the right vectors on reset\r
+ if (!(d&1)) Pico_mcd->m.state_flags |= 1; // reset pending, needed to be sure we fetch the right vectors on reset\r
if ( (Pico_mcd->m.busreq&1) != (d&1)) dprintf("m68k: s68k reset %i", !(d&1));\r
if ( (Pico_mcd->m.busreq&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1);\r
- if ((PicoMCD&2) && (d&3)==1) {\r
+ if ((Pico_mcd->m.state_flags&1) && (d&3)==1) {\r
SekResetS68k(); // S68k comes out of RESET or BRQ state\r
- PicoMCD&=~2;\r
+ Pico_mcd->m.state_flags&=~1;\r
dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);\r
}\r
Pico_mcd->m.busreq = d;\r
return;\r
case 6:\r
*((char *)&Pico_mcd->m.hint_vector+1) = d;\r
+ Pico_mcd->bios[0x72 + 1] = d; // simple hint vector changer\r
return;\r
case 7:\r
*(char *)&Pico_mcd->m.hint_vector = d;\r
+ Pico_mcd->bios[0x72] = d;\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
d = Read_CDC_Host(1); // Gens returns 0 here on byte reads\r
goto end;\r
case 0xC:\r
- dprintf("s68k stopwatch read");\r
+ dprintf("s68k stopwatch timer read");\r
+ d = Pico_mcd->m.timer_stopwatch >> 16;\r
+ goto end;\r
+ case 0x30:\r
+ dprintf("s68k int3 timer read");\r
break;\r
case 0x34: // fader\r
d = 0; // no busy bit\r
case 0xa:\r
dprintf("s68k set CDC dma addr");\r
break;\r
+ case 0xc:\r
+ case 0xd:\r
+ dprintf("s68k set stopwatch timer");\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: %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
if ((d&(1<<4)) && (Pico_mcd->s68k_regs[0x37]&4) && !(Pico_mcd->s68k_regs[0x33]&(1<<4))) {\r
CDD_Export_Status();\r
- // counter75hz = 0; // ???\r
}\r
break;\r
case 0x34: // fader\r
Pico_mcd->s68k_regs[0x37] = d&7;\r
if ((d&4) && !(d_old&4)) {\r
CDD_Export_Status();\r
- // counter75hz = 0; // ???\r
}\r
return;\r
}\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
goto end;\r
}\r
\r
+#if 0\r
+ if (a == 0x200000 && SekPc == 0xff0b66 && Pico.m.frame_count > 1000)\r
+ {\r
+ int i;\r
+ FILE *ff;\r
+ unsigned short *ram = (unsigned short *) Pico.ram;\r
+ // unswap and dump RAM\r
+ for (i = 0; i < 0x10000/2; i++)\r
+ ram[i] = (ram[i]>>8) | (ram[i]<<8);\r
+ ff = fopen("ram.bin", "wb");\r
+ fwrite(ram, 1, 0x10000, ff);\r
+ fclose(ff);\r
+ exit(0);\r
+ }\r
+#endif\r
+\r
// word RAM\r
if ((a&0xfc0000)==0x200000) {\r
dprintf("m68k_wram r8: [%06x] @%06x", a, SekPc);\r
if ((a&0xffffc0)==0xa12000)\r
rdprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);\r
\r
-#if 0\r
- if ((a&0x3f) == 0x1c && SekPc == 0xffff05ba)\r
- {\r
- int i;\r
- FILE *ff;\r
- unsigned short *ram = (unsigned short *) Pico.ram;\r
- // unswap and dump RAM\r
- for (i = 0; i < 0x10000/2; i++)\r
- ram[i] = (ram[i]>>8) | (ram[i]<<8);\r
- ff = fopen("ram.bin", "wb");\r
- fwrite(ram, 1, 0x10000, ff);\r
- fclose(ff);\r
- exit(0);\r
- }\r
-#endif\r
-\r
OtherWrite16(a, (u16)(d>>16));\r
OtherWrite16(a+2,(u16)d);\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
\r
// -----------------------------------------------------------------\r
\r
+\r
+#if defined(EMU_C68K)\r
+static __inline int PicoMemBaseM68k(u32 pc)\r
+{\r
+ int membase=0;\r
+\r
+ if (pc < 0x20000)\r
+ {\r
+ membase=(int)Pico_mcd->bios; // Program Counter in BIOS\r
+ }\r
+ else if ((pc&0xe00000)==0xe00000)\r
+ {\r
+ membase=(int)Pico.ram-(pc&0xff0000); // Program Counter in Ram\r
+ }\r
+ else if ((pc&0xfc0000)==0x200000 && !(Pico_mcd->s68k_regs[3]&4))\r
+ {\r
+ membase=(int)Pico_mcd->word_ram-0x200000; // Program Counter in Word Ram\r
+ }\r
+ else\r
+ {\r
+ // Error - Program Counter is invalid\r
+ dprintf("m68k: unhandled jump to %06x", pc);\r
+ membase=(int)Pico.rom;\r
+ }\r
+\r
+ return membase;\r
+}\r
+\r
+\r
+static u32 PicoCheckPcM68k(u32 pc)\r
+{\r
+ pc-=PicoCpu.membase; // Get real pc\r
+ pc&=0xfffffe;\r
+\r
+ PicoCpu.membase=PicoMemBaseM68k(pc);\r
+\r
+ return PicoCpu.membase+pc;\r
+}\r
+\r
+\r
+static __inline int PicoMemBaseS68k(u32 pc)\r
+{\r
+ int membase;\r
+\r
+ membase=(int)Pico_mcd->prg_ram; // Program Counter in Prg RAM\r
+ if (pc >= 0x80000)\r
+ {\r
+ // Error - Program Counter is invalid\r
+ dprintf("s68k: unhandled jump to %06x", pc);\r
+ }\r
+\r
+ return membase;\r
+}\r
+\r
+\r
+static u32 PicoCheckPcS68k(u32 pc)\r
+{\r
+ pc-=PicoCpuS68k.membase; // Get real pc\r
+ pc&=0xfffffe;\r
+\r
+ PicoCpuS68k.membase=PicoMemBaseS68k(pc);\r
+\r
+ return PicoCpuS68k.membase+pc;\r
+}\r
+#endif\r
+\r
+\r
+void PicoMemSetupCD()\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
+ // 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
+#endif\r
+}\r
+\r
+\r
#ifdef EMU_M68K\r
unsigned char PicoReadCD8w (unsigned int a) {\r
return m68ki_cpu_p == &PicoS68kCPU ? PicoReadS68k8(a) : PicoReadM68k8(a);\r
a&=0xffffff;\r
if(m68ki_cpu_p == &PicoS68kCPU) {\r
if (a < 0x80000) return *(u8 *)(Pico_mcd->prg_ram+(a^1)); // PRG Ram\r
- else dprintf("s68k read_pcrel8 @ %06x", a);\r
+ dprintf("s68k_read_pcrelative_CD8: can't handle %06x", a);\r
} else {\r
- if(a<Pico.romsize) return *(u8 *)(Pico.rom+(a^1)); // Rom\r
+ if(a<0x20000) return *(u8 *)(Pico.rom+(a^1)); // Bios\r
if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram\r
+ if(!(Pico_mcd->s68k_regs[3]&4) && (a&0xfc0000)==0x200000)\r
+ return Pico_mcd->word_ram[(a^1)&0x3fffe];\r
+ dprintf("m68k_read_pcrelative_CD8: can't handle %06x", a);\r
}\r
return 0;//(u8) lastread_d;\r
}\r
a&=0xffffff;\r
if(m68ki_cpu_p == &PicoS68kCPU) {\r
if (a < 0x80000) return *(u16 *)(Pico_mcd->prg_ram+(a&~1)); // PRG Ram\r
- else dprintf("s68k read_pcrel16 @ %06x", a);\r
+ dprintf("s68k_read_pcrelative_CD16: can't handle %06x", a);\r
} else {\r
- if(a<Pico.romsize) return *(u16 *)(Pico.rom+(a&~1)); // Rom\r
+ if(a<0x20000) return *(u16 *)(Pico.rom+(a&~1)); // Bios\r
if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram\r
+ if(!(Pico_mcd->s68k_regs[3]&4) && (a&0xfc0000)==0x200000)\r
+ return *(u16 *)(Pico_mcd->word_ram+(a&0x3fffe));\r
+ dprintf("m68k_read_pcrelative_CD16: can't handle %06x", a);\r
}\r
- return 0;//(u16) lastread_d;\r
+ return 0;\r
}\r
unsigned int m68k_read_pcrelative_CD32(unsigned int a) {\r
a&=0xffffff;\r
if(m68ki_cpu_p == &PicoS68kCPU) {\r
if (a < 0x80000) { u16 *pm=(u16 *)(Pico_mcd->prg_ram+(a&~1)); return (pm[0]<<16)|pm[1]; } // PRG Ram\r
- else dprintf("s68k read_pcrel32 @ %06x", a);\r
+ dprintf("s68k_read_pcrelative_CD32: can't handle %06x", a);\r
} else {\r
- if(a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+(a&~1)); return (pm[0]<<16)|pm[1]; }\r
+ if(a<0x20000) { u16 *pm=(u16 *)(Pico.rom+(a&~1)); return (pm[0]<<16)|pm[1]; }\r
if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram\r
+ if(!(Pico_mcd->s68k_regs[3]&4) && (a&0xfc0000)==0x200000)\r
+ { u16 *pm=(u16 *)(Pico_mcd->word_ram+(a&0x3fffe)); return (pm[0]<<16)|pm[1]; }\r
+ dprintf("m68k_read_pcrelative_CD32: can't handle %06x", a);\r
}\r
- return 0; //lastread_d;\r
+ return 0;\r
}\r
#endif // EMU_M68K\r
\r
notaz.gp2x.de / picodrive.git / blobdiff