m68k_init();\r
m68k_set_int_ack_callback(SekIntAckM68K);\r
m68k_set_tas_instr_callback(SekTasCallback);\r
- m68k_pulse_reset(); // Init cpu emulator\r
+ //m68k_pulse_reset();\r
m68k_set_context(oldcontext);\r
}\r
#endif\r
memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));\r
fm68k_init();\r
PicoCpuFM68k.iack_handler = SekIntAckF68K;\r
+ PicoCpuFM68k.sr = 0x2704; // Z flag\r
g_m68kcontext = oldcontext;\r
}\r
#endif\r
m68ki_cpu.sp[0]=0;\r
m68k_set_irq(0);\r
m68k_pulse_reset();\r
+ REG_USP = 0; // ?\r
#endif\r
#ifdef EMU_F68K\r
{\r
}\r
\r
\r
-PICO_INTERNAL int SekInterrupt(int irq)\r
-{\r
-#ifdef EMU_CORE_DEBUG\r
- {\r
- extern unsigned int dbg_irq_level;\r
- dbg_irq_level=irq;\r
- return 0;\r
- }\r
-#endif\r
-#ifdef EMU_C68K\r
- PicoCpuCM68k.irq=irq;\r
-#endif\r
-#ifdef EMU_M68K\r
- {\r
- void *oldcontext = m68ki_cpu_p;\r
- m68k_set_context(&PicoCpuMM68k);\r
- m68k_set_irq(irq); // raise irq (gets lowered after taken or must be done in ack)\r
- m68k_set_context(oldcontext);\r
- }\r
-#endif\r
-#ifdef EMU_F68K\r
- PicoCpuFM68k.interrupts[0]=irq;\r
-#endif\r
-\r
- return 0;\r
-}\r
-\r
// data must be word aligned\r
PICO_INTERNAL void SekState(int *data)\r
{\r
#ifdef EMU_C68K\r
memcpy32(data,(int *)PicoCpuCM68k.d,0x44/4);\r
+ data[0x11] = PicoCpuCM68k.flags;\r
#elif defined(EMU_M68K)\r
memcpy32(data, (int *)PicoCpuMM68k.dar, 0x40/4);\r
data[0x10] = PicoCpuMM68k.pc;\r
+ data[0x11] = m68k_get_reg(&PicoCpuMM68k, M68K_REG_SR);\r
#elif defined(EMU_F68K)\r
memcpy32(data, (int *)PicoCpuFM68k.dreg, 0x40/4);\r
data[0x10] = PicoCpuFM68k.pc;\r
+ data[0x11] = PicoCpuFM68k.sr;\r
#endif\r
}\r
\r
#endif\r
}\r
\r
+/* idle loop detection, not to be used in CD mode */\r
+#ifdef EMU_C68K\r
+#include "cpu/Cyclone/tools/idle.h"\r
+#endif\r
+\r
+static int *idledet_addrs = NULL;\r
+static int idledet_count = 0, idledet_bads = 0;\r
+int idledet_start_frame = 0;\r
+\r
+static int jump_verify[0x10000];\r
+extern int CycloneJumpTab[];\r
+static unsigned char *rom_verify = NULL;\r
+\r
+void SekInitIdleDet(void)\r
+{\r
+ void *tmp = realloc(idledet_addrs, 0x200*4);\r
+ if (tmp == NULL) {\r
+ free(idledet_addrs);\r
+ idledet_addrs = NULL;\r
+ }\r
+ else\r
+ idledet_addrs = tmp;\r
+ idledet_count = idledet_bads = 0;\r
+ idledet_start_frame = Pico.m.frame_count + 360;\r
+\r
+ memcpy(jump_verify, CycloneJumpTab, 0x10000*4);\r
+ rom_verify = realloc(rom_verify, Pico.romsize);\r
+ memcpy(rom_verify, Pico.rom, Pico.romsize);\r
+#ifdef EMU_C68K\r
+ CycloneInitIdle();\r
+#endif\r
+}\r
+\r
+int SekIsIdleCode(unsigned short *dst, int bytes)\r
+{\r
+ printf("SekIsIdleCode %04x %i\n", *dst, bytes);\r
+ switch (bytes)\r
+ {\r
+ case 4:\r
+ if ( (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX) // where should be no need to wait\r
+ (*dst & 0xfff8) == 0x4a28 || // tst.b ($xxxx,a0) // for byte change anywhere\r
+ (*dst & 0xff3f) == 0x4a38 || // tst.x ($xxxx.w), tas ($xxxx.w)\r
+ (*dst & 0xc1ff) == 0x0038 || // move.x ($xxxx.w), dX\r
+ (*dst & 0xf13f) == 0xb038) // cmp.x ($xxxx.w), dX\r
+ return 1;\r
+ break;\r
+ case 6:\r
+ if ( ((dst[1] & 0xe0) == 0xe0 && ( // RAM\r
+ *dst == 0x4a39 || // tst.b ($xxxxxxxx)\r
+ *dst == 0x4a79 || // tst.w ($xxxxxxxx)\r
+ *dst == 0x4ab9)) || // tst.l ($xxxxxxxx)\r
+ *dst == 0x0838) // btst $X, ($xxxx.w) [6 byte op]\r
+ return 1;\r
+ break;\r
+ case 8:\r
+ if ( (dst[2] & 0xe0) == 0xe0 && ( // RAM\r
+ *dst == 0x0839 || // btst $X, ($xxxxxxxx.w) [8 byte op]\r
+ (*dst & 0xffbf) == 0x0c39)) // cmpi.{b,w} $X, ($xxxxxxxx)\r
+ return 1;\r
+ break;\r
+ case 12:\r
+ if ((*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX\r
+ (dst[1]&0xf100) == 0x0000 && // arithmetic\r
+ (dst[3]&0xf100) == 0x0000) // arithmetic\r
+ return 1;\r
+ break;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
+int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)\r
+{\r
+#ifdef EMU_C68K\r
+ pc -= PicoCpuCM68k.membase;\r
+#endif\r
+ pc &= ~0xff000000;\r
+ elprintf(EL_IDLE, "idle: patch %06x %04x %04x #%i", pc, oldop, newop, idledet_count);\r
+ if (pc > Pico.romsize) {\r
+ if (++idledet_bads > 128) return 2; // remove detector\r
+ return 1; // don't patch\r
+ }\r
+\r
+ if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) {\r
+ void *tmp = realloc(idledet_addrs, (idledet_count+0x200)*4);\r
+ if (tmp == NULL) return 1;\r
+ idledet_addrs = tmp;\r
+ }\r
+\r
+ idledet_addrs[idledet_count++] = pc;\r
+ return 0;\r
+}\r
+\r
+void SekFinishIdleDet(void)\r
+{\r
+ int done_something = idledet_count > 0;\r
+#ifdef EMU_C68K\r
+ CycloneFinishIdle();\r
+#endif\r
+ while (idledet_count > 0)\r
+ {\r
+ unsigned short *op = (unsigned short *)&Pico.rom[idledet_addrs[--idledet_count]];\r
+ if ((*op & 0xfd00) == 0x7100)\r
+ *op &= 0xff, *op |= 0x6600;\r
+ else if ((*op & 0xfd00) == 0x7500)\r
+ *op &= 0xff, *op |= 0x6700;\r
+ else if ((*op & 0xfd00) == 0x7d00)\r
+ *op &= 0xff, *op |= 0x6000;\r
+ else\r
+ elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);\r
+ }\r
+\r
+ if (done_something)\r
+ {\r
+ int i;\r
+ for (i = 0; i < 0x10000; i++)\r
+ if (jump_verify[i] != CycloneJumpTab[i])\r
+ printf("jumptab corruption @ %04x!\n", i), exit(1);\r
+ for (i = 0; i < Pico.romsize; i++)\r
+ if (rom_verify[i] != Pico.rom[i])\r
+ printf("ROM corruption @ %06x!\n", i), exit(1);\r
+ }\r
+}\r
+\r
+\r
+#if defined(EMU_M68K) && M68K_INSTRUCTION_HOOK == OPT_SPECIFY_HANDLER\r
+static unsigned char op_flags[0x400000/2] = { 0, };\r
+static int atexit_set = 0;\r
+\r
+static void make_idc(void)\r
+{\r
+ FILE *f = fopen("idc.idc", "w");\r
+ int i;\r
+ if (!f) return;\r
+ fprintf(f, "#include <idc.idc>\nstatic main() {\n");\r
+ for (i = 0; i < 0x400000/2; i++)\r
+ if (op_flags[i] != 0)\r
+ fprintf(f, " MakeCode(0x%06x);\n", i*2);\r
+ fprintf(f, "}\n");\r
+ fclose(f);\r
+}\r
+\r
+void instruction_hook(void)\r
+{\r
+ if (!atexit_set) {\r
+ atexit(make_idc);\r
+ atexit_set = 1;\r
+ }\r
+ if (REG_PC < 0x400000)\r
+ op_flags[REG_PC/2] = 1;\r
+}\r
+#endif\r