-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2009\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
\r
#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
+unsigned int SekCycleCnt;\r
+unsigned int SekCycleAim;\r
\r
\r
/* context */\r
\r
static int SekUnrecognizedOpcode()\r
{\r
- unsigned int pc, op;\r
+ unsigned int pc;\r
pc = SekPc;\r
- op = PicoCpuCM68k.read16(pc);\r
- elprintf(EL_ANOMALY, "Unrecognized Opcode %04x @ %06x", op, pc);\r
- // see if we are not executing trash\r
- if (pc < 0x200 || (pc > Pico.romsize+4 && (pc&0xe00000)!=0xe00000)) {\r
+ elprintf(EL_ANOMALY, "Unrecognized Opcode @ %06x", pc);\r
+ // see if we are still in a mapped region\r
+ pc &= 0x00ffffff;\r
+ if (map_flag_set(m68k_read16_map[pc >> M68K_MEM_SHIFT])) {\r
+ elprintf(EL_STATUS|EL_ANOMALY, "m68k crash @%06x", pc);\r
PicoCpuCM68k.cycles = 0;\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_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
+ 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
}\r
#endif\r
if (Pico.rom==NULL) return 1;\r
\r
#ifdef EMU_C68K\r
- PicoCpuCM68k.state_flags=0;\r
- PicoCpuCM68k.osp=0;\r
- PicoCpuCM68k.srh =0x27; // Supervisor mode\r
- PicoCpuCM68k.irq=0;\r
- PicoCpuCM68k.a[7]=PicoCpuCM68k.read32(0); // Stack Pointer\r
- PicoCpuCM68k.membase=0;\r
- PicoCpuCM68k.pc=PicoCpuCM68k.checkpc(PicoCpuCM68k.read32(4)); // Program Counter\r
+ CycloneReset(&PicoCpuCM68k);\r
#endif\r
#ifdef EMU_M68K\r
m68k_set_context(&PicoCpuMM68k); // if we ever reset m68k, we always need it's context to be set\r
#elif defined(EMU_M68K)\r
SekCycleCnt+=m68k_execute(1);\r
#elif defined(EMU_F68K)\r
- SekCycleCnt+=fm68k_emulate(1, 0, 0);\r
+ SekCycleCnt+=fm68k_emulate(1, 0);\r
#endif\r
}\r
\r
#endif\r
}\r
\r
+// Pack the cpu into a common format:\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
+ 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
+ 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
+ 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
+}\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
+ memcpy(context->d,cpu,0x40);\r
+ context->membase = 0;\r
+ context->pc = *(unsigned int *)(cpu+0x40);\r
+ CycloneUnpack(context, NULL); // rebase PC\r
+ context->irq = cpu[0x4c];\r
+ context->state_flags = 0;\r
+ if (cpu[0x4d])\r
+ context->state_flags |= 1;\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
+ 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
+ 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->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
+}\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 int *idledet_addrs = NULL;\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
- void *tmp = realloc(idledet_addrs, 0x200*4);\r
+ unsigned short **tmp;\r
+ tmp = realloc(idledet_ptrs, 0x200 * sizeof(tmp[0]));\r
if (tmp == NULL) {\r
- free(idledet_addrs);\r
- idledet_addrs = NULL;\r
+ free(idledet_ptrs);\r
+ idledet_ptrs = NULL;\r
}\r
else\r
- idledet_addrs = tmp;\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_emulate(0, 1);\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
int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)\r
{\r
int is_main68k = 1;\r
+ u16 *target;\r
+ uptr v;\r
+\r
#if defined(EMU_C68K)\r
struct Cyclone *cyc = ctx;\r
is_main68k = cyc == &PicoCpuCM68k;\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
- if (pc > Pico.romsize && !(PicoAHW & PAHW_SVP)) {\r
- if (++idledet_bads > 128) return 2; // remove detector\r
+ // XXX: probably shouldn't patch RAM too\r
+ v = m68k_read16_map[pc >> M68K_MEM_SHIFT];\r
+ if (!(v & 0x80000000))\r
+ target = (u16 *)((v << 1) + pc);\r
+ else {\r
+ if (++idledet_bads > 128)\r
+ 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
+ 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
\r
- if (pc < Pico.romsize)\r
- idledet_addrs[idledet_count++] = pc;\r
+ idledet_ptrs[idledet_count++] = target;\r
\r
return 0;\r
}\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_emulate(0, 2);\r
#endif\r
while (idledet_count > 0)\r
{\r
- unsigned short *op = (unsigned short *)&Pico.rom[idledet_addrs[--idledet_count]];\r
+ unsigned short *op = idledet_ptrs[--idledet_count];\r
if ((*op & 0xfd00) == 0x7100)\r
*op &= 0xff, *op |= 0x6600;\r
else if ((*op & 0xfd00) == 0x7500)\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 : SekCycleCnt;\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