#include "pico_int.h"\r
#include "memory.h"\r
\r
-\r
-unsigned int SekCycleCnt;\r
-unsigned int SekCycleAim;\r
-\r
-\r
/* context */\r
// Cyclone 68000\r
#ifdef EMU_C68K\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
+ if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%u]", SekPc, Pico.t.m68c_cnt); }\r
+ else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%u]", SekPc, Pico.t.m68c_cnt); }\r
PicoCpuCM68k.irq = 0;\r
return CYCLONE_INT_ACK_AUTOVECTOR;\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
+ if (level == 4) { Pico.video.pending_ints = 0; elprintf(EL_INTS, "hack: @ %06x [%u]", SekPc, Pico.t.m68c_cnt); }\r
+ else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%u]", SekPc, Pico.t.m68c_cnt); }\r
CPU_INT_LEVEL = 0;\r
return M68K_INT_ACK_AUTOVECTOR;\r
}\r
{\r
if (level == 4) {\r
Pico.video.pending_ints = 0;\r
- elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCyclesDone());\r
+ elprintf(EL_INTS, "hack: @ %06x [%u]", SekPc, SekCyclesDone());\r
}\r
else if(level == 6) {\r
Pico.video.pending_ints &= ~0x20;\r
- elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCyclesDone());\r
+ elprintf(EL_INTS, "vack: @ %06x [%u]", SekPc, SekCyclesDone());\r
}\r
PicoCpuFM68k.interrupts[0] = 0;\r
}\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);\r
+ Pico.t.m68c_cnt += fm68k_emulate(1, 0);\r
#endif\r
}\r
\r
\r
*(unsigned int *)(cpu+0x40) = pc;\r
*(unsigned int *)(cpu+0x50) =\r
- is_sub ? SekCycleCntS68k : SekCycleCnt;\r
+ is_sub ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
}\r
\r
PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)\r
if (is_sub)\r
SekCycleCntS68k = *(unsigned int *)(cpu+0x50);\r
else\r
- SekCycleCnt = *(unsigned int *)(cpu+0x50);\r
+ Pico.t.m68c_cnt = *(unsigned int *)(cpu+0x50);\r
}\r
\r
\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
}\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
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
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 : SekCycleCnt;\r
+ u32 cycles = is_s68k ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
u32 r;\r
u8 cmd;\r
#ifdef CPU_CMP_W\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