PicoCpuCM68k.IrqCallback=SekIntAck;\r
PicoCpuCM68k.ResetCallback=SekResetAck;\r
PicoCpuCM68k.UnrecognizedCallback=SekUnrecognizedOpcode;\r
+ PicoCpuCM68k.flags=4; // Z set\r
#endif\r
#ifdef EMU_M68K\r
{\r
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
void *oldcontext = g_m68kcontext;\r
g_m68kcontext = &PicoCpuFM68k;\r
memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));\r
- m68k_init();\r
+ fm68k_init();\r
PicoCpuFM68k.iack_handler = SekIntAckF68K;\r
+ PicoCpuFM68k.sr = 0x2704; // Z flag\r
g_m68kcontext = oldcontext;\r
}\r
#endif\r
PicoCpuCM68k.state_flags=0;\r
PicoCpuCM68k.osp=0;\r
PicoCpuCM68k.srh =0x27; // Supervisor mode\r
- PicoCpuCM68k.flags=4; // Z set\r
PicoCpuCM68k.irq=0;\r
PicoCpuCM68k.a[7]=PicoCpuCM68k.read32(0); // Stack Pointer\r
PicoCpuCM68k.membase=0;\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
g_m68kcontext = &PicoCpuFM68k;\r
- m68k_reset();\r
+ fm68k_reset();\r
}\r
#endif\r
\r
}\r
\r
\r
-PICO_INTERNAL int SekInterrupt(int irq)\r
-{\r
-#if defined(EMU_C68K) && defined(EMU_M68K)\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,PicoCpuCM68k.d,0x44/4);\r
+ memcpy32(data,(int *)PicoCpuCM68k.d,0x44/4);\r
+ data[0x11] = PicoCpuCM68k.flags;\r
#elif defined(EMU_M68K)\r
- memcpy32(data, PicoCpuMM68k.dar, 0x40/4);\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
+#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