#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
#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
+ if (pv->reg[0] & pv->pending_ints & 0x10)\r
+ return pv->hint_irq;\r
+ }\r
+ else if (pv->pending_ints & pv->reg[0] & 0x10)\r
+ pv->pending_ints &= ~0x10;\r
+\r
+ return (PicoIn.AHW & PAHW_PICO ? PicoPicoIrqAck(level) : 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) {\r
- Pico.video.pending_ints = 0;\r
- elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCyclesDone());\r
- }\r
- else if(level == 6) {\r
- Pico.video.pending_ints &= ~0x20;\r
- elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCyclesDone());\r
- }\r
- PicoCpuFM68k.interrupts[0] = 0;\r
+ PicoCpuFM68k.interrupts[0] = do_ack(level);\r
}\r
#endif\r
\r
}\r
#endif\r
#ifdef EMU_F68K\r
- {\r
- void *oldcontext = g_m68kcontext;\r
- g_m68kcontext = &PicoCpuFM68k;\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
+ memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));\r
+ fm68k_init();\r
+ PicoCpuFM68k.iack_handler = SekIntAckF68K;\r
+ PicoCpuFM68k.sr = 0x2704; // Z flag\r
#endif\r
}\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
// XXX: rename\r
PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub)\r
{\r
- unsigned int pc=0;\r
-\r
#if defined(EMU_C68K)\r
struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
memcpy(cpu,context->d,0x40);\r
- pc=context->pc-context->membase;\r
- *(unsigned int *)(cpu+0x44)=CycloneGetSr(context);\r
- *(unsigned int *)(cpu+0x48)=context->osp;\r
+ *(u32 *)(cpu+0x40)=context->pc-context->membase;\r
+ *(u32 *)(cpu+0x44)=CycloneGetSr(context);\r
+ *(u32 *)(cpu+0x48)=context->osp;\r
cpu[0x4c] = context->irq;\r
cpu[0x4d] = context->state_flags & 1;\r
#elif defined(EMU_M68K)\r
void *oldcontext = m68ki_cpu_p;\r
m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\r
memcpy(cpu,m68ki_cpu_p->dar,0x40);\r
- pc=m68ki_cpu_p->pc;\r
- *(unsigned int *)(cpu+0x44)=m68k_get_reg(NULL, M68K_REG_SR);\r
- *(unsigned int *)(cpu+0x48)=m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET];\r
+ *(u32 *)(cpu+0x40)=m68ki_cpu_p->pc;\r
+ *(u32 *)(cpu+0x44)=m68k_get_reg(NULL, M68K_REG_SR);\r
+ *(u32 *)(cpu+0x48)=m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET];\r
cpu[0x4c] = CPU_INT_LEVEL>>8;\r
cpu[0x4d] = CPU_STOPPED;\r
m68k_set_context(oldcontext);\r
#elif defined(EMU_F68K)\r
M68K_CONTEXT *context = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
memcpy(cpu,context->dreg,0x40);\r
- pc=context->pc;\r
- *(unsigned int *)(cpu+0x44)=context->sr;\r
- *(unsigned int *)(cpu+0x48)=context->asp;\r
+ *(u32 *)(cpu+0x40)=context->pc;\r
+ *(u32 *)(cpu+0x44)=context->sr;\r
+ *(u32 *)(cpu+0x48)=context->asp;\r
cpu[0x4c] = context->interrupts[0];\r
cpu[0x4d] = (context->execinfo & FM68K_HALTED) ? 1 : 0;\r
#endif\r
\r
- *(unsigned int *)(cpu+0x40) = pc;\r
- *(unsigned int *)(cpu+0x50) =\r
- is_sub ? SekCycleCntS68k : SekCycleCnt;\r
+ if (is_sub) {\r
+ *(u32 *)(cpu+0x50) = SekCycleCntS68k;\r
+ *(s16 *)(cpu+0x4e) = SekCycleCntS68k - SekCycleAimS68k;\r
+ } else {\r
+ *(u32 *)(cpu+0x50) = Pico.t.m68c_cnt + Pico.t.z80_buscycles +\r
+ ((Pico.t.refresh_delay + (1<<14)/2) >> 14);\r
+ *(s16 *)(cpu+0x4e) = Pico.t.m68c_cnt - Pico.t.m68c_aim;\r
+ }\r
}\r
\r
PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)\r
{\r
#if defined(EMU_C68K)\r
struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
- CycloneSetSr(context, *(unsigned int *)(cpu+0x44));\r
- context->osp=*(unsigned int *)(cpu+0x48);\r
+ CycloneSetSr(context, *(u32 *)(cpu+0x44));\r
+ context->osp=*(u32 *)(cpu+0x48);\r
memcpy(context->d,cpu,0x40);\r
context->membase = 0;\r
- context->pc = *(unsigned int *)(cpu+0x40);\r
+ context->pc = *(u32 *)(cpu+0x40);\r
CycloneUnpack(context, NULL); // rebase PC\r
context->irq = cpu[0x4c];\r
context->state_flags = 0;\r
#elif defined(EMU_M68K)\r
void *oldcontext = m68ki_cpu_p;\r
m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\r
- m68k_set_reg(M68K_REG_SR, *(unsigned int *)(cpu+0x44));\r
+ m68k_set_reg(M68K_REG_SR, *(u32 *)(cpu+0x44));\r
memcpy(m68ki_cpu_p->dar,cpu,0x40);\r
- m68ki_cpu_p->pc=*(unsigned int *)(cpu+0x40);\r
- m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET]=*(unsigned int *)(cpu+0x48);\r
+ m68ki_cpu_p->pc=*(u32 *)(cpu+0x40);\r
+ m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET]=*(u32 *)(cpu+0x48);\r
CPU_INT_LEVEL = cpu[0x4c] << 8;\r
CPU_STOPPED = cpu[0x4d];\r
m68k_set_context(oldcontext);\r
#elif defined(EMU_F68K)\r
M68K_CONTEXT *context = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
memcpy(context->dreg,cpu,0x40);\r
- context->pc =*(unsigned int *)(cpu+0x40);\r
- context->sr =*(unsigned int *)(cpu+0x44);\r
- context->asp=*(unsigned int *)(cpu+0x48);\r
+ context->pc =*(u32 *)(cpu+0x40);\r
+ context->sr =*(u32 *)(cpu+0x44);\r
+ context->asp=*(u32 *)(cpu+0x48);\r
context->interrupts[0] = cpu[0x4c];\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
- SekCycleCnt = *(unsigned int *)(cpu+0x50);\r
+ if (is_sub) {\r
+ SekCycleCntS68k = *(u32 *)(cpu+0x50);\r
+ SekCycleAimS68k = SekCycleCntS68k - *(s16 *)(cpu+0x4e);\r
+ } else {\r
+ Pico.t.m68c_cnt = *(u32 *)(cpu+0x50);\r
+ Pico.t.m68c_aim = Pico.t.m68c_cnt - *(s16 *)(cpu+0x4e);\r
+ Pico.t.z80_buscycles = 0;\r
+ Pico.t.refresh_delay = 0;\r
+ }\r
}\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
+#include <cpu/cyclone/tools/idle.h>\r
#endif\r
\r
static unsigned short **idledet_ptrs = NULL;\r
\r
void SekInitIdleDet(void)\r
{\r
- unsigned short **tmp = realloc(idledet_ptrs, 0x200*4);\r
- if (tmp == NULL) {\r
- free(idledet_ptrs);\r
- idledet_ptrs = NULL;\r
- }\r
- else\r
- idledet_ptrs = tmp;\r
idledet_count = idledet_bads = 0;\r
idledet_start_frame = Pico.m.frame_count + 360;\r
#ifdef IDLE_STATS\r
CycloneInitIdle();\r
#endif\r
#ifdef EMU_F68K\r
- fm68k_emulate(0, 0, 1);\r
+ fm68k_idle_install();\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
+ if (idledet_count >= 0) switch (bytes)\r
{\r
case 2:\r
if ((*dst & 0xf000) != 0x6000) // not another branch\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
+ if (PicoIn.AHW & (PAHW_MCD|PAHW_32X))\r
break;\r
// with no addons, there should be no need to wait\r
// for byte change anywhere\r
return 1;\r
break;\r
case 12:\r
- if (PicoAHW & (PAHW_MCD|PAHW_32X))\r
+ if (PicoIn.AHW & (PAHW_MCD|PAHW_32X))\r
break;\r
if ( (*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX\r
(dst[1]&0xf100) == 0x0000 && // arithmetic\r
(newop&0x200)?'n':'y', is_main68k?'m':'s', idledet_count);\r
\r
// XXX: probably shouldn't patch RAM too\r
- v = m68k_read16_map[pc >> M68K_MEM_SHIFT];\r
- if (!(v & 0x80000000))\r
+ if (is_main68k)\r
+ v = m68k_read16_map[pc >> M68K_MEM_SHIFT];\r
+ else\r
+ v = s68k_read16_map[pc >> M68K_MEM_SHIFT];\r
+ if (~v & ~((uptr)-1LL >> 1)) // MSB clear?\r
target = (u16 *)((v << 1) + pc);\r
else {\r
if (++idledet_bads > 128)\r
return 1; // don't patch\r
}\r
\r
- if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) {\r
- unsigned short **tmp = realloc(idledet_ptrs, (idledet_count+0x200)*4);\r
+ if (!idledet_ptrs || (idledet_count & 0x1ff) == 0) {\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
+\r
+ idledet_count = -1;\r
+ if (idledet_ptrs)\r
+ free(idledet_ptrs);\r
+ idledet_ptrs = NULL;\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
notaz.gp2x.de / picodrive.git / blobdiff