#define UTYPES_DEFINED\r
#endif\r
\r
+int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp) = NULL;\r
\r
static __inline void AutoIncrement(void)\r
{\r
if ((source&0xe00000)==0xe00000) { // Ram\r
pd=(u16 *)(Pico.ram+(source&0xfffe));\r
pdend=(u16 *)(Pico.ram+0x10000);\r
- } else if(PicoMCD & 1) {\r
+ } else if (PicoMCD & 1) {\r
elprintf(EL_VDPDMA, "DmaSlow CD, r3=%02x", Pico_mcd->s68k_regs[3]);\r
if(source<0x20000) { // Bios area\r
pd=(u16 *)(Pico_mcd->bios+(source&~1));\r
pd=(u16 *)(prg_ram+(source&0x1fffe));\r
pdend=(u16 *)(prg_ram+0x20000);\r
} else {\r
- elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow FIXME: unsupported src");\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: FIXME: unsupported src", Pico.video.type, source, a);\r
return;\r
}\r
} else {\r
- if(source<Pico.romsize) { // Rom\r
+ if (source<Pico.romsize) { // Rom\r
pd=(u16 *)(Pico.rom+(source&~1));\r
pdend=(u16 *)(Pico.rom+Pico.romsize);\r
- } else {\r
- elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow: invalid dma src");\r
+ }\r
+ else if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));\r
+ else {\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: invalid src", Pico.video.type, source, a);\r
return;\r
}\r
}\r
else\r
{\r
// preliminary FIFO emulation for Chaos Engine, The (E)\r
- if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1) // active display, accurate mode?\r
+ if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1 && !(PicoOpt&0x10000)) // active display, accurate mode?\r
{\r
pvid->status&=~0x200; // FIFO no longer empty\r
pvid->lwrite_cnt++;\r
//if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone());\r
//if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone());\r
pvid->reg[num]=(unsigned char)d;\r
-#if !(defined(EMU_C68K) && defined(EMU_M68K)) // not debugging Cyclone\r
+#ifndef EMU_CORE_DEBUG\r
// update IRQ level (Lemmings, Wiz 'n' Liz intro, ... )\r
// may break if done improperly:\r
// International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx),\r
- // Fatal Rewind (hang), Sesame Street Counting Cafe\r
- if(num < 2) {\r
-#ifdef EMU_C68K\r
- // hack: make sure we do not touch the irq line if Cyclone is just about to take the IRQ\r
- if (PicoCpu.irq <= (PicoCpu.srh&7)) {\r
-#endif\r
- int lines, pints;\r
+ // Fatal Rewind (crash), Sesame Street Counting Cafe\r
+ if (num < 2)\r
+ {\r
+ if (!SekShouldInterrupt) // hack\r
+ {\r
+ int lines, pints, irq=0;\r
lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10);\r
pints = (pvid->pending_ints&lines);\r
- if(pints & 0x20) SekInterrupt(6);\r
- else if(pints & 0x10) SekInterrupt(4);\r
- else SekInterrupt(0);\r
-#ifdef EMU_C68K\r
- // adjust cycles for Cyclone so it would take the int "in time"\r
- if(PicoCpu.irq) {\r
- SekEndRun(24);\r
- }\r
+ if(pints & 0x20) irq = 6;\r
+ else if(pints & 0x10) irq = 4;\r
+ SekInterrupt(irq); // update line\r
+\r
+ if (irq) SekEndRun(24); // make it delayed\r
}\r
-#endif\r
}\r
else\r
#endif\r