#include "pico_int.h"\r
#include "memory.h"\r
\r
-\r
-int SekCycleCnt=0; // cycles done in this frame\r
-int SekCycleAim=0; // cycle aim\r
-unsigned int SekCycleCntT=0;\r
-\r
-\r
/* context */\r
// Cyclone 68000\r
#ifdef EMU_C68K\r
#endif\r
\r
\r
+static int do_ack(int level)\r
+{\r
+ struct PicoVideo *pv = &Pico.video;\r
+\r
+ elprintf(EL_INTS, "%cack: @ %06x [%u], p=%02x",\r
+ level == 6 ? 'v' : 'h', SekPc, SekCyclesDone(), pv->pending_ints);\r
+ // the VDP doesn't look at the 68k level\r
+ if (pv->pending_ints & pv->reg[1] & 0x20) {\r
+ pv->pending_ints &= ~0x20;\r
+ pv->status &= ~SR_F;\r
+ return (pv->reg[0] & pv->pending_ints & 0x10) >> 2;\r
+ }\r
+ else if (pv->pending_ints & pv->reg[0] & 0x10)\r
+ pv->pending_ints &= ~0x10;\r
+\r
+ return 0;\r
+}\r
+\r
/* callbacks */\r
#ifdef EMU_C68K\r
// interrupt acknowledgment\r
static int SekIntAck(int level)\r
{\r
- // try to emulate VDP's reaction to 68000 int ack\r
- if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
- else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
- PicoCpuCM68k.irq = 0;\r
+ PicoCpuCM68k.irq = do_ack(level);\r
return CYCLONE_INT_ACK_AUTOVECTOR;\r
}\r
\r
PicoCpuCM68k.state_flags |= 1;\r
return 1;\r
}\r
+ // happened once - may happen again\r
+ SekFinishIdleDet();\r
#ifdef EMU_M68K // debugging cyclone\r
{\r
extern int have_illegal;\r
#ifdef EMU_M68K\r
static int SekIntAckM68K(int level)\r
{\r
- if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
- else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
- CPU_INT_LEVEL = 0;\r
+ CPU_INT_LEVEL = do_ack(level) << 8;\r
return M68K_INT_ACK_AUTOVECTOR;\r
}\r
\r
#ifdef EMU_F68K\r
static void SekIntAckF68K(unsigned level)\r
{\r
- if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
- else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
- PicoCpuFM68k.interrupts[0] = 0;\r
+ PicoCpuFM68k.interrupts[0] = do_ack(level);\r
}\r
#endif\r
\r
REG_USP = 0; // ?\r
#endif\r
#ifdef EMU_F68K\r
- {\r
- g_m68kcontext = &PicoCpuFM68k;\r
- fm68k_reset();\r
- }\r
+ fm68k_reset(&PicoCpuFM68k);\r
#endif\r
\r
return 0;\r
\r
void SekStepM68k(void)\r
{\r
- SekCycleAim=SekCycleCnt+1;\r
+ Pico.t.m68c_aim = Pico.t.m68c_cnt + 1;\r
#if defined(EMU_CORE_DEBUG)\r
- SekCycleCnt+=CM_compareRun(1, 0);\r
+ Pico.t.m68c_cnt += CM_compareRun(1, 0);\r
#elif defined(EMU_C68K)\r
PicoCpuCM68k.cycles=1;\r
CycloneRun(&PicoCpuCM68k);\r
- SekCycleCnt+=1-PicoCpuCM68k.cycles;\r
+ Pico.t.m68c_cnt += 1 - PicoCpuCM68k.cycles;\r
#elif defined(EMU_M68K)\r
- SekCycleCnt+=m68k_execute(1);\r
+ Pico.t.m68c_cnt += m68k_execute(1);\r
#elif defined(EMU_F68K)\r
- SekCycleCnt+=fm68k_emulate(1, 0, 0);\r
+ Pico.t.m68c_cnt += fm68k_emulate(&PicoCpuFM68k, 1, 0);\r
#endif\r
}\r
\r
cpu[0x4d] = (context->execinfo & FM68K_HALTED) ? 1 : 0;\r
#endif\r
\r
- *(unsigned int *)(cpu+0x40)=pc;\r
+ *(unsigned int *)(cpu+0x40) = pc;\r
+ *(unsigned int *)(cpu+0x50) =\r
+ is_sub ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
}\r
\r
PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)\r
context->execinfo &= ~FM68K_HALTED;\r
if (cpu[0x4d]&1) context->execinfo |= FM68K_HALTED;\r
#endif\r
+ if (is_sub)\r
+ SekCycleCntS68k = *(unsigned int *)(cpu+0x50);\r
+ else\r
+ Pico.t.m68c_cnt = *(unsigned int *)(cpu+0x50);\r
}\r
\r
\r
\r
static unsigned short **idledet_ptrs = NULL;\r
static int idledet_count = 0, idledet_bads = 0;\r
-int idledet_start_frame = 0;\r
+static int idledet_start_frame = 0;\r
\r
#if 0\r
#define IDLE_STATS 1\r
\r
void SekInitIdleDet(void)\r
{\r
- unsigned short **tmp = realloc(idledet_ptrs, 0x200*4);\r
+ unsigned short **tmp;\r
+ tmp = realloc(idledet_ptrs, 0x200 * sizeof(tmp[0]));\r
if (tmp == NULL) {\r
free(idledet_ptrs);\r
idledet_ptrs = NULL;\r
CycloneInitIdle();\r
#endif\r
#ifdef EMU_F68K\r
- fm68k_emulate(0, 0, 1);\r
+ fm68k_idle_install();\r
#endif\r
}\r
\r
+int SekIsIdleReady(void)\r
+{\r
+ return (Pico.m.frame_count >= idledet_start_frame);\r
+}\r
+\r
int SekIsIdleCode(unsigned short *dst, int bytes)\r
{\r
// printf("SekIsIdleCode %04x %i\n", *dst, bytes);\r
return 1;\r
break;\r
case 4:\r
- if ( (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX) // there 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
+ if ( (*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
+ if (PicoAHW & (PAHW_MCD|PAHW_32X))\r
+ break;\r
+ // with no addons, there should be no need to wait\r
+ // for byte change anywhere\r
+ if ( (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX)\r
+ (*dst & 0xfff8) == 0x4a28) // tst.b ($xxxx,a0)\r
return 1;\r
break;\r
case 6:\r
return 1;\r
break;\r
case 12:\r
- if ((*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX\r
+ if (PicoAHW & (PAHW_MCD|PAHW_32X))\r
+ break;\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
is_main68k = ctx == &PicoCpuFM68k;\r
#endif\r
pc &= ~0xff000000;\r
+ if (!(newop&0x200))\r
elprintf(EL_IDLE, "idle: patch %06x %04x %04x %c %c #%i", pc, oldop, newop,\r
(newop&0x200)?'n':'y', is_main68k?'m':'s', idledet_count);\r
\r
}\r
\r
if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) {\r
- unsigned short **tmp = realloc(idledet_ptrs, (idledet_count+0x200)*4);\r
+ unsigned short **tmp;\r
+ tmp = realloc(idledet_ptrs, (idledet_count+0x200) * sizeof(tmp[0]));\r
if (tmp == NULL)\r
return 1;\r
idledet_ptrs = tmp;\r
\r
void SekFinishIdleDet(void)\r
{\r
+ if (idledet_count < 0)\r
+ return;\r
#ifdef EMU_C68K\r
CycloneFinishIdle();\r
#endif\r
#ifdef EMU_F68K\r
- fm68k_emulate(0, 0, 2);\r
+ fm68k_idle_remove();\r
#endif\r
while (idledet_count > 0)\r
{\r
else\r
elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);\r
}\r
+ idledet_count = -1;\r
}\r
\r
\r
+#if defined(CPU_CMP_R) || defined(CPU_CMP_W)\r
+#include "debug.h"\r
+\r
+struct ref_68k {\r
+ u32 dar[16];\r
+ u32 pc;\r
+ u32 sr;\r
+ u32 cycles;\r
+ u32 pc_prev;\r
+};\r
+struct ref_68k ref_68ks[2];\r
+static int current_68k;\r
+\r
+void SekTrace(int is_s68k)\r
+{\r
+ struct ref_68k *x68k = &ref_68ks[is_s68k];\r
+ u32 pc = is_s68k ? SekPcS68k : SekPc;\r
+ u32 sr = is_s68k ? SekSrS68k : SekSr;\r
+ u32 cycles = is_s68k ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
+ u32 r;\r
+ u8 cmd;\r
+#ifdef CPU_CMP_W\r
+ int i;\r
+\r
+ if (is_s68k != current_68k) {\r
+ current_68k = is_s68k;\r
+ cmd = CTL_68K_SLAVE | current_68k;\r
+ tl_write(&cmd, sizeof(cmd));\r
+ }\r
+ if (pc != x68k->pc) {\r
+ x68k->pc = pc;\r
+ tl_write_uint(CTL_68K_PC, x68k->pc);\r
+ }\r
+ if (sr != x68k->sr) {\r
+ x68k->sr = sr;\r
+ tl_write_uint(CTL_68K_SR, x68k->sr);\r
+ }\r
+ for (i = 0; i < 16; i++) {\r
+ r = is_s68k ? SekDarS68k(i) : SekDar(i);\r
+ if (r != x68k->dar[i]) {\r
+ x68k->dar[i] = r;\r
+ tl_write_uint(CTL_68K_R + i, r);\r
+ }\r
+ }\r
+ tl_write_uint(CTL_68K_CYCLES, cycles);\r
+#else\r
+ int i, bad = 0;\r
+\r
+ while (1)\r
+ {\r
+ int ret = tl_read(&cmd, sizeof(cmd));\r
+ if (ret == 0) {\r
+ elprintf(EL_STATUS, "EOF");\r
+ exit(1);\r
+ }\r
+ switch (cmd) {\r
+ case CTL_68K_SLAVE:\r
+ case CTL_68K_SLAVE + 1:\r
+ current_68k = cmd & 1;\r
+ break;\r
+ case CTL_68K_PC:\r
+ tl_read_uint(&x68k->pc);\r
+ break;\r
+ case CTL_68K_SR:\r
+ tl_read_uint(&x68k->sr);\r
+ break;\r
+ case CTL_68K_CYCLES:\r
+ tl_read_uint(&x68k->cycles);\r
+ goto breakloop;\r
+ default:\r
+ if (CTL_68K_R <= cmd && cmd < CTL_68K_R + 0x10)\r
+ tl_read_uint(&x68k->dar[cmd - CTL_68K_R]);\r
+ else\r
+ elprintf(EL_STATUS, "invalid cmd: %02x", cmd);\r
+ }\r
+ }\r
+\r
+breakloop:\r
+ if (is_s68k != current_68k) {\r
+ printf("bad 68k: %d %d\n", is_s68k, current_68k);\r
+ bad = 1;\r
+ }\r
+ if (cycles != x68k->cycles) {\r
+ printf("bad cycles: %u %u\n", cycles, x68k->cycles);\r
+ bad = 1;\r
+ }\r
+ if ((pc ^ x68k->pc) & 0xffffff) {\r
+ printf("bad PC: %08x %08x\n", pc, x68k->pc);\r
+ bad = 1;\r
+ }\r
+ if (sr != x68k->sr) {\r
+ printf("bad SR: %03x %03x\n", sr, x68k->sr);\r
+ bad = 1;\r
+ }\r
+ for (i = 0; i < 16; i++) {\r
+ r = is_s68k ? SekDarS68k(i) : SekDar(i);\r
+ if (r != x68k->dar[i]) {\r
+ printf("bad %c%d: %08x %08x\n", i < 8 ? 'D' : 'A', i & 7,\r
+ r, x68k->dar[i]);\r
+ bad = 1;\r
+ }\r
+ }\r
+ if (bad) {\r
+ for (i = 0; i < 8; i++)\r
+ printf("D%d: %08x A%d: %08x\n", i, x68k->dar[i],\r
+ i, x68k->dar[i + 8]);\r
+ printf("PC: %08x, %08x\n", x68k->pc, x68k->pc_prev);\r
+ printf("SR: %04x\n", x68k->sr);\r
+\r
+ PDebugDumpMem();\r
+ exit(1);\r
+ }\r
+ x68k->pc_prev = x68k->pc;\r
+#endif\r
+}\r
+#endif // CPU_CMP_*\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
op_flags[REG_PC/2] = 1;\r
}\r
#endif\r
+\r
+// vim:shiftwidth=2:ts=2:expandtab\r
notaz.gp2x.de / picodrive.git / blobdiff