\r
//#define __debug_io\r
//#define __debug_io2\r
+#define rdprintf dprintf\r
\r
// -----------------------------------------------------------------\r
\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
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
switch (a) {\r
case 0:\r
- d = 1; goto end; // ver = 0, not in reset state\r
+ d = 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
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
\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
+ rdprintf("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
+ 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
+ rdprintf("s68k_regs r16: [%02x] @ %06x", a&0x1fe, SekPcS68k);\r
d = s68k_reg_read16(a, 16);\r
- //dprintf("ret = %04x", d);\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
+ rdprintf("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
+ 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
+ rdprintf("s68k_regs w8: [%02x] %02x @ %06x", a&0x1ff, d, SekPcS68k);\r
s68k_reg_write8(a,d,8);\r
return;\r
}\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs w16: [%02x] %04x @ %06x", a&0x1ff, d, SekPcS68k);\r
+ rdprintf("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
return;\r
\r
// regs\r
if ((a&0xfffe00) == 0xff8000) {\r
- //dprintf("s68k_regs w32: [%02x] %08x @ %06x", a&0x1ff, d, SekPcS68k);\r
+ rdprintf("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