#undef dprintf\r
#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
\r
+#if defined(EMU_C68K)\r
+#define other_get_sr() CycloneGetSr(&PicoCpuCM68k)\r
+#define other_dar(i) PicoCpuCM68k.d[i]\r
+#define other_osp PicoCpuCM68k.osp\r
+#define other_get_irq() PicoCpuCM68k.irq\r
+#define other_set_irq(irq) PicoCpuCM68k.irq=irq\r
+#define other_is_stopped() (PicoCpuCM68k.state_flags&1)\r
+#define other_is_tracing() ((PicoCpuCM68k.state_flags&2)?1:0)\r
+#elif defined(EMU_F68K)\r
+#define other_get_sr() PicoCpuFM68k.sr\r
+#define other_dar(i) ((unsigned int*)PicoCpuFM68k.dreg)[i]\r
+#define other_osp PicoCpuFM68k.asp\r
+#define other_get_irq() PicoCpuFM68k.interrupts[0]\r
+#define other_set_irq(irq) PicoCpuFM68k.interrupts[0]=irq\r
+#define other_is_stopped() ((PicoCpuFM68k.execinfo&FM68K_HALTED)?1:0)\r
+#define other_is_tracing() ((PicoCpuFM68k.execinfo&FM68K_EMULATE_TRACE)?1:0)\r
+#else\r
+#error other core missing, don't compile this file\r
+#endif\r
+\r
+static int otherRun(void)\r
+{\r
+#if defined(EMU_C68K)\r
+ PicoCpuCM68k.cycles=1;\r
+ CycloneRun(&PicoCpuCM68k);\r
+ return 1-PicoCpuCM68k.cycles;\r
+#elif defined(EMU_F68K)\r
+ return fm68k_emulate(1);\r
+#endif\r
+}\r
+\r
//static\r
void dumpPCandExit()\r
{\r
dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
dprintf(" this | prev");\r
for(i=0; i < 8; i++)\r
- dprintf("d%i=%08x, a%i=%08x | d%i=%08x, a%i=%08x", i, PicoCpuCM68k.d[i], i, PicoCpuCM68k.a[i], i, old_regs[i], i, old_regs[i+8]);\r
- dprintf("SR: %04x | %04x (??s? 0iii 000x nzvc)", CycloneGetSr(&PicoCpuCM68k), old_sr);\r
+ dprintf("d%i=%08x, a%i=%08x | d%i=%08x, a%i=%08x", i, other_dar(i), i, other_dar(i+8), i, old_regs[i], i, old_regs[i+8]);\r
+ dprintf("SR: %04x | %04x (??s? 0iii 000x nzvc)", other_get_sr(), old_sr);\r
dprintf("last_read: %08x @ %06x", lastread_d[--lrp_cyc&15], lastread_a);\r
dprintf("ops done: %i", ops);\r
exit(1);\r
int CM_compareRun(int cyc)\r
{\r
char *str;\r
- int cyc_done=0, cyc_cyclone, cyc_musashi, err=0;\r
+ int cyc_done=0, cyc_other, cyc_musashi, err=0;\r
unsigned int i, mu_sr;\r
\r
lrp_cyc = lrp_mus = 0;\r
{\r
have_illegal = 0;\r
m68ki_cpu.pc += 2;\r
+#ifdef EMU_C68K\r
PicoCpuCM68k.pc=PicoCpuCM68k.checkpc(PicoCpuCM68k.pc + 2);\r
+#endif\r
}\r
// hacks for test_misc2\r
if (m68ki_cpu.pc == 0x0002e0 && m68k_read_disassembler_16(m68ki_cpu.pc) == 0x4e73)\r
\r
pppc = SekPc;\r
ppop = m68k_read_disassembler_16(pppc);\r
- memcpy(old_regs, PicoCpuCM68k.d, 4*16);\r
- old_sr = CycloneGetSr(&PicoCpuCM68k);\r
+ memcpy(old_regs, &other_dar(0), 4*16);\r
+ old_sr = other_get_sr();\r
\r
#if 0\r
{\r
\r
if (dbg_irq_level)\r
{\r
- PicoCpuCM68k.irq=dbg_irq_level;\r
+ other_set_irq(dbg_irq_level);\r
m68k_set_irq(dbg_irq_level);\r
dbg_irq_level=0;\r
}\r
\r
- PicoCpuCM68k.cycles=1;\r
- CycloneRun(&PicoCpuCM68k);\r
- cyc_cyclone=1-PicoCpuCM68k.cycles;\r
+ cyc_other=otherRun();\r
cyc_musashi=m68k_execute(1);\r
\r
- if(cyc_cyclone != cyc_musashi) {\r
- dprintf("cycles: %i vs %i", cyc_cyclone, cyc_musashi);\r
+ if (cyc_other != cyc_musashi) {\r
+ dprintf("cycles: %i vs %i", cyc_other, cyc_musashi);\r
err=1;\r
}\r
\r
- if(lrp_cyc != lrp_mus) {\r
+ if (lrp_cyc != lrp_mus) {\r
dprintf("lrp: %i vs %i", lrp_cyc&15, lrp_mus&15);\r
err=1;\r
}\r
\r
- if(lwp_cyc != lwp_mus) {\r
+ if (lwp_cyc != lwp_mus) {\r
dprintf("lwp: %i vs %i", lwp_cyc&15, lwp_mus&15);\r
err=1;\r
}\r
\r
- for(i=0; i < 16; i++) {\r
- if(lastwrite_cyc_d[i] != lastwrite_mus_d[i]) {\r
+ for (i=0; i < 16; i++) {\r
+ if (lastwrite_cyc_d[i] != lastwrite_mus_d[i]) {\r
dprintf("lastwrite: [%i]= %08x vs %08x", i, lastwrite_cyc_d[i], lastwrite_mus_d[i]);\r
- err=1;\r
+ err=1;\r
break;\r
}\r
}\r
\r
// compare PC\r
m68ki_cpu.pc&=~1;\r
- if( SekPc != (m68ki_cpu.pc/*&0xffffff*/) ) {\r
- dprintf("PC: %06x vs %06x", SekPc, m68ki_cpu.pc/*&0xffffff*/);\r
+ if ( SekPc != (m68ki_cpu.pc&0xffffff) ) {\r
+ dprintf("PC: %06x vs %06x", SekPc, m68ki_cpu.pc&0xffffff);\r
err=1;\r
}\r
\r
#endif\r
\r
// compare regs\r
- for(i=0; i < 16; i++) {\r
- if(PicoCpuCM68k.d[i] != m68ki_cpu.dar[i]) {\r
+ for (i=0; i < 16; i++) {\r
+ if (other_dar(i) != m68ki_cpu.dar[i]) {\r
str = (i < 8) ? "d" : "a";\r
- dprintf("reg: %s%i: %08x vs %08x", str, i&7, PicoCpuCM68k.d[i], m68ki_cpu.dar[i]);\r
+ dprintf("reg: %s%i: %08x vs %08x", str, i&7, other_dar(i), m68ki_cpu.dar[i]);\r
err=1;\r
}\r
}\r
\r
// SR\r
- if((CycloneGetSr(&PicoCpuCM68k)) != (mu_sr = m68k_get_reg(NULL, M68K_REG_SR))) {\r
- dprintf("SR: %04x vs %04x (??s? 0iii 000x nzvc)", CycloneGetSr(&PicoCpuCM68k), mu_sr);\r
+ if (other_get_sr() != (mu_sr = m68k_get_reg(NULL, M68K_REG_SR))) {\r
+ dprintf("SR: %04x vs %04x (??s? 0iii 000x nzvc)", other_get_sr(), mu_sr);\r
err=1;\r
}\r
\r
// IRQl\r
- if(PicoCpuCM68k.irq != (m68ki_cpu.int_level>>8)) {\r
- dprintf("IRQ: %i vs %i", PicoCpuCM68k.irq, (m68ki_cpu.int_level>>8));\r
+ if (other_get_irq() != (m68ki_cpu.int_level>>8)) {\r
+ dprintf("IRQ: %i vs %i", other_get_irq(), (m68ki_cpu.int_level>>8));\r
err=1;\r
}\r
\r
// OSP/USP\r
- if(PicoCpuCM68k.osp != m68ki_cpu.sp[((mu_sr>>11)&4)^4]) {\r
- dprintf("OSP: %06x vs %06x", PicoCpuCM68k.osp, m68ki_cpu.sp[((mu_sr>>11)&4)^4]);\r
+ if (other_osp != m68ki_cpu.sp[((mu_sr>>11)&4)^4]) {\r
+ dprintf("OSP: %06x vs %06x", other_osp, m68ki_cpu.sp[((mu_sr>>11)&4)^4]);\r
err=1;\r
}\r
\r
// stopped\r
- if(((PicoCpuCM68k.state_flags&1) && !m68ki_cpu.stopped) || (!(PicoCpuCM68k.state_flags&1) && m68ki_cpu.stopped)) {\r
- dprintf("stopped: %i vs %i", PicoCpuCM68k.state_flags&1, m68ki_cpu.stopped);\r
+ if ((other_is_stopped() && !m68ki_cpu.stopped) || (!other_is_stopped() && m68ki_cpu.stopped)) {\r
+ dprintf("stopped: %i vs %i", other_is_stopped(), m68ki_cpu.stopped);\r
err=1;\r
}\r
\r
// tracing\r
- if(((PicoCpuCM68k.state_flags&2) && !m68ki_tracing) || (!(PicoCpuCM68k.state_flags&2) && m68ki_tracing)) {\r
- dprintf("tracing: %i vs %i", PicoCpuCM68k.state_flags&2, m68ki_tracing);\r
+ if((other_is_tracing() && !m68ki_tracing) || (!other_is_tracing() && m68ki_tracing)) {\r
+ dprintf("tracing: %i vs %i", other_is_tracing(), m68ki_tracing);\r
err=1;\r
}\r
\r
PicoCpuCM68k.a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
#endif\r
\r
- cyc_done += cyc_cyclone;\r
+ cyc_done += cyc_other;\r
ops++;\r
}\r
\r
notaz.gp2x.de / picodrive.git / blobdiff