#include "../sound/ym2612.h"\r
#include "../sound/sn76496.h"\r
\r
+#include "gfx_cd.h"\r
+\r
typedef unsigned char u8;\r
typedef unsigned short u16;\r
typedef unsigned int u32;\r
\r
//#define __debug_io\r
//#define __debug_io2\r
+//#define rdprintf dprintf\r
+#define rdprintf(...)\r
\r
// -----------------------------------------------------------------\r
\r
extern int counter75hz;\r
\r
\r
-static u32 m68k_reg_read16(u32 a, int realsize)\r
+static u32 m68k_reg_read16(u32 a)\r
{\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->m68k_regs[1]; // here IFL2 is always 0, just like in Gens\r
+ d = ((Pico_mcd->s68k_regs[0x33]<<13)&0x8000) | Pico_mcd->m.busreq; // here IFL2 is always 0, just like in Gens\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
goto end;\r
+ case 4:\r
+ d = Pico_mcd->s68k_regs[4]<<8;\r
+ goto end;\r
+ case 6:\r
+ d = Pico_mcd->m.hint_vector;\r
+ goto end;\r
case 8:\r
- dprintf("m68k host data read");\r
d = Read_CDC_Host(0);\r
goto end;\r
+ case 0xA:\r
+ dprintf("m68k reserved read");\r
+ goto end;\r
case 0xC:\r
dprintf("m68k stopwatch read");\r
break;\r
}\r
\r
- if (a < 0xE) {\r
- d = (Pico_mcd->m68k_regs[a]<<8) | Pico_mcd->m68k_regs[a+1];\r
- goto end;\r
- }\r
-\r
if (a < 0x30) {\r
// comm flag/cmd/status (0xE-0x2F)\r
d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];\r
return d;\r
}\r
\r
-static void m68k_reg_write8(u32 a, u32 d, int realsize)\r
+static void m68k_reg_write8(u32 a, u32 d)\r
{\r
a &= 0x3f;\r
// dprintf("m68k_regs w%2i: [%02x] %02x @%06x", realsize, a, d, SekPc);\r
case 0:\r
d &= 1;\r
if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { dprintf("m68k: s68k irq 2"); SekInterruptS68k(2); }\r
- break;\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 ( (Pico_mcd->m68k_regs[1]&1) != (d&1)) dprintf("m68k: s68k reset %i", !(d&1));\r
- if ( (Pico_mcd->m68k_regs[1]&2) != (d&2)) dprintf("m68k: s68k brq %i", (d&2)>>1);\r
- if (/*!(Pico_mcd->m68k_regs[1]&1) &&*/ (PicoMCD&2) && (d&3)==1) {\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
SekResetS68k(); // S68k comes out of RESET or BRQ state\r
PicoMCD&=~2;\r
dprintf("m68k: resetting s68k, cycles=%i", SekCyclesLeft);\r
}\r
- break;\r
+ Pico_mcd->m.busreq = d;\r
+ return;\r
case 2:\r
Pico_mcd->s68k_regs[2] = d; // really use s68k side register\r
return;\r
if (!(d & 4) && (d & 2)) d &= ~1; // return word RAM to s68k in 2M mode\r
Pico_mcd->s68k_regs[3] = d; // really use s68k side register\r
return;\r
+ case 6:\r
+ *((char *)&Pico_mcd->m.hint_vector+1) = d;\r
+ return;\r
+ case 7:\r
+ *(char *)&Pico_mcd->m.hint_vector = 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
- break;\r
- }\r
-\r
- if (a < 0x10) {\r
- Pico_mcd->m68k_regs[a] = (u8) d;\r
- return;\r
+ return;\r
}\r
\r
if ((a&0xf0) == 0x10) {\r
return;\r
}\r
\r
- if (a >= 0x20 || (a >= 0xa && a <= 0xd) || a == 0x0f)\r
- dprintf("m68k: invalid write?");\r
+ dprintf("m68k: invalid write? [%02x] %02x", a, d);\r
}\r
\r
\r
\r
-static u32 s68k_reg_read16(u32 a, int realsize)\r
+static u32 s68k_reg_read16(u32 a)\r
{\r
u32 d=0;\r
- a &= 0x1fe;\r
\r
// dprintf("s68k_regs r%2i: [%02x] @ %06x", realsize&~1, a+(realsize&1), SekPcS68k);\r
\r
switch (a) {\r
case 0:\r
- d = 1; goto end; // ver = 0, not in reset state\r
+ d = ((Pico_mcd->s68k_regs[0]&3)<<8) | 1; // ver = 0, not in reset state\r
+ goto end;\r
case 2:\r
d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0x1f);\r
dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPc);\r
d = CDC_Read_Reg();\r
goto end;\r
case 8:\r
- dprintf("s68k host data read");\r
- d = Read_CDC_Host(1);\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
return d;\r
}\r
\r
-static void s68k_reg_write8(u32 a, u32 d, int realsize)\r
+static void s68k_reg_write8(u32 a, u32 d)\r
{\r
- a &= 0x1ff;\r
//dprintf("s68k_regs w%2i: [%02x] %02x @ %06x", realsize, a, d, SekPcS68k);\r
\r
// TODO: review against Gens\r
Pico_mcd->s68k_regs[4] = (Pico_mcd->s68k_regs[4]&0xC0) | (d&7); // CDC mode\r
return;\r
case 5:\r
- dprintf("s68k CDC reg addr: %x", d&0xf);\r
+ //dprintf("s68k CDC reg addr: %x", d&0xf);\r
break;\r
case 7:\r
CDC_Write_Reg(d);\r
if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }\r
\r
if ((a&0xffffc0)==0xa12000) {\r
- d=m68k_reg_read16(a, realsize);\r
+ d=m68k_reg_read16(a);\r
goto end;\r
}\r
\r
\r
if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)(d|(d<<8))); return; } // Byte access gets mirrored\r
\r
- if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d, realsize); return; }\r
+ if ((a&0xffffc0)==0xa12000) { m68k_reg_write8(a, d); return; }\r
\r
dprintf("strange w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
}\r
\r
if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("m68k_regs r8: [%02x] @%06x", a&0x3f, SekPc);\r
\r
d=OtherRead16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("ret = %02x", (u8)d);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("ret = %02x", (u8)d);\r
\r
end:\r
\r
goto end;\r
}\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("m68k_regs r16: [%02x] @%06x", a&0x3f, SekPc);\r
\r
d = (u16)OtherRead16(a, 16);\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("ret = %04x", d);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("ret = %04x", d);\r
\r
end:\r
\r
goto end;\r
}\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("m68k_regs r32: [%02x] @%06x", a&0x3f, SekPc);\r
\r
d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("ret = %08x", d);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("ret = %08x", d);\r
\r
end:\r
#ifdef __debug_io\r
return;\r
}\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);\r
\r
OtherWrite8(a,d,8);\r
}\r
return;\r
}\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("m68k_regs w16: [%02x] %04x @%06x", a&0x3f, d, SekPc);\r
\r
OtherWrite16(a,d);\r
}\r
return;\r
}\r
\r
- //if ((a&0xffffc0)==0xa12000)\r
- // dprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);\r
+ if ((a&0xffffc0)==0xa12000)\r
+ rdprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);\r
\r
OtherWrite16(a, (u16)(d>>16));\r
OtherWrite16(a+2,(u16)d);\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs r8: [%02x] @ %06x", a&0x1ff, SekPcS68k);\r
- d = s68k_reg_read16(a&~1, 8|(a&1)); if ((a&1)==0) d>>=8;\r
- //dprintf("ret = %02x", (u8)d);\r
+ a &= 0x1ff;\r
+ rdprintf("s68k_regs r8: [%02x] @ %06x", a, SekPcS68k);\r
+ if (a >= 0x50 && a < 0x68)\r
+ d = gfx_cd_read(a&~1);\r
+ else d = s68k_reg_read16(a&~1);\r
+ if ((a&1)==0) d>>=8;\r
+ rdprintf("ret = %02x", (u8)d);\r
goto end;\r
}\r
\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs r16: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
- d = s68k_reg_read16(a, 16);\r
- //dprintf("ret = %04x", d);\r
+ a &= 0x1fe;\r
+ rdprintf("s68k_regs r16: [%02x] @ %06x", a, SekPcS68k);\r
+ if (a >= 0x50 && a < 0x68)\r
+ d = gfx_cd_read(a);\r
+ else d = s68k_reg_read16(a);\r
+ rdprintf("ret = %04x", d);\r
goto end;\r
}\r
\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs r32: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
- d = (s68k_reg_read16(a, 32)<<16)|s68k_reg_read16(a+2, 32);\r
- //dprintf("ret = %08x", d);\r
+ a &= 0x1fe;\r
+ rdprintf("s68k_regs r32: [%02x] @ %06x", a, SekPcS68k);\r
+ if (a >= 0x50 && a < 0x68)\r
+ d = (gfx_cd_read(a)<<16)|gfx_cd_read(a+2);\r
+ else d = (s68k_reg_read16(a)<<16)|s68k_reg_read16(a+2);\r
+ rdprintf("ret = %08x", d);\r
goto end;\r
}\r
\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs w8: [%02x] %02x @ %06x", a&0x1ff, d, SekPcS68k);\r
- s68k_reg_write8(a,d,8);\r
+ a &= 0x1ff;\r
+ rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a, d, SekPcS68k);\r
+ if (a >= 0x50 && a < 0x68)\r
+ gfx_cd_write(a&~1, (d<<8)|d);\r
+ else s68k_reg_write8(a,d);\r
return;\r
}\r
\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs w16: [%02x] %04x @ %06x", a&0x1ff, d, SekPcS68k);\r
- s68k_reg_write8(a, d>>8, 16);\r
- s68k_reg_write8(a+1,d&0xff, 16);\r
+ a &= 0x1fe;\r
+ rdprintf("s68k_regs w16: [%02x] %04x @ %06x", a, d, SekPcS68k);\r
+ if (a >= 0x50 && a < 0x68)\r
+ gfx_cd_write(a, d);\r
+ else {\r
+ s68k_reg_write8(a, d>>8);\r
+ s68k_reg_write8(a+1,d&0xff);\r
+ }\r
return;\r
}\r
\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs w32: [%02x] %08x @ %06x", a&0x1ff, d, SekPcS68k);\r
- s68k_reg_write8(a, d>>24, 32);\r
- s68k_reg_write8(a+1,(d>>16)&0xff, 32);\r
- s68k_reg_write8(a+2,(d>>8) &0xff, 32);\r
- s68k_reg_write8(a+3, d &0xff, 32);\r
+ a &= 0x1fe;\r
+ rdprintf("s68k_regs w32: [%02x] %08x @ %06x", a, d, SekPcS68k);\r
+ if (a >= 0x50 && a < 0x68) {\r
+ gfx_cd_write(a, d>>16);\r
+ gfx_cd_write(a+2, d&0xffff);\r
+ } else {\r
+ s68k_reg_write8(a, d>>24);\r
+ s68k_reg_write8(a+1,(d>>16)&0xff);\r
+ s68k_reg_write8(a+2,(d>>8) &0xff);\r
+ s68k_reg_write8(a+3, d &0xff);\r
+ }\r
return;\r
}\r
\r
notaz.gp2x.de / picodrive.git / blobdiff