PicoCpu.cycles=cyc_do;\r
CycloneRun(&PicoCpu);\r
SekCycleCnt+=cyc_do-PicoCpu.cycles;\r
-#elif defined(EMU_A68K)\r
- m68k_ICount=cyc_do;\r
- M68000_RUN();\r
- SekCycleCnt+=cyc_do-m68k_ICount;\r
#elif defined(EMU_M68K)\r
SekCycleCnt+=m68k_execute(cyc_do);\r
+#elif defined(EMU_F68K)\r
+ SekCycleCnt+=m68k_emulate(cyc_do);\r
#endif\r
}\r
\r
PicoCpu.cycles=1;\r
CycloneRun(&PicoCpu);\r
SekCycleCnt+=1-PicoCpu.cycles;\r
-#elif defined(EMU_A68K)\r
- m68k_ICount=1;\r
- M68000_RUN();\r
- SekCycleCnt+=1-m68k_ICount;\r
#elif defined(EMU_M68K)\r
SekCycleCnt+=m68k_execute(1);\r
+#elif defined(EMU_F68K)\r
+ SekCycleCnt+=m68k_emulate(1);\r
#endif\r
SekCycleAim=realaim;\r
}\r
// callback to output message from emu\r
void (*PicoMessage)(const char *msg)=NULL;\r
\r
-#if defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__)\r
+#if 1 // defined(__DEBUG_PRINT)\r
// tmp debug: dump some stuff\r
#define bit(r, x) ((r>>x)&1)\r
void z80_debug(char *dstr);\r
sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); dstrp+=strlen(dstrp);\r
sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status);\r
dstrp+=strlen(dstrp);\r
-#ifdef EMU_C68K\r
+#if defined(EMU_C68K)\r
sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpu.state_flags, SekCyclesDoneT());\r
dstrp+=strlen(dstrp);\r
sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpu.d[0], PicoCpu.a[0], PicoCpu.osp, PicoCpu.irq); dstrp+=strlen(dstrp);\r
for(r=2; r < 8; r++) {\r
sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpu.d[r], r, PicoCpu.a[r]); dstrp+=strlen(dstrp);\r
}\r
+#elif defined(EMU_M68K)\r
+ sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoM68kCPU.int_level>>8); dstrp+=strlen(dstrp);\r
+#elif defined(EMU_F68K)\r
+ sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuM68k.interrupts[0]); dstrp+=strlen(dstrp);\r
#endif\r
sprintf(dstrp, "z80Run: %i, pal: %i, frame#: %i\n", Pico.m.z80Run, Pico.m.pal, Pico.m.frame_count); dstrp+=strlen(dstrp);\r
z80_debug(dstrp); dstrp+=strlen(dstrp);\r