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, PicoCpu.d[i], i, PicoCpu.a[i], i, old_regs[i], i, old_regs[i+8]);\r
- dprintf("SR: %04x | %04x (??s? 0iii 000x nzvc)", CycloneGetSr(&PicoCpu), old_sr);\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("last_read: %08x @ %06x", lastread_d[--lrp_cyc&15], lastread_a);\r
dprintf("ops done: %i", ops);\r
exit(1);\r
{\r
have_illegal = 0;\r
m68ki_cpu.pc += 2;\r
- PicoCpu.pc=PicoCpu.checkpc(PicoCpu.pc + 2);\r
+ PicoCpuCM68k.pc=PicoCpuCM68k.checkpc(PicoCpuCM68k.pc + 2);\r
}\r
// hacks for test_misc2\r
if (m68ki_cpu.pc == 0x0002e0 && m68k_read_disassembler_16(m68ki_cpu.pc) == 0x4e73)\r
// get out of "priviledge violation" loop\r
have_illegal = 1;\r
//m68ki_cpu.s_flag = SFLAG_SET;\r
- //PicoCpu.srh|=0x20;\r
+ //PicoCpuCM68k.srh|=0x20;\r
}\r
\r
pppc = SekPc;\r
ppop = m68k_read_disassembler_16(pppc);\r
- memcpy(old_regs, PicoCpu.d, 4*16);\r
- old_sr = CycloneGetSr(&PicoCpu);\r
+ memcpy(old_regs, PicoCpuCM68k.d, 4*16);\r
+ old_sr = CycloneGetSr(&PicoCpuCM68k);\r
\r
#if 0\r
{\r
dprintf("---");\r
m68k_disassemble(buff, pppc, M68K_CPU_TYPE_68000);\r
dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
- //dprintf("A7: %08x", PicoCpu.a[7]);\r
+ //dprintf("A7: %08x", PicoCpuCM68k.a[7]);\r
}\r
#endif\r
\r
if (dbg_irq_level)\r
{\r
- PicoCpu.irq=dbg_irq_level;\r
+ PicoCpuCM68k.irq=dbg_irq_level;\r
m68k_set_irq(dbg_irq_level);\r
dbg_irq_level=0;\r
}\r
\r
- PicoCpu.cycles=1;\r
- CycloneRun(&PicoCpu);\r
- cyc_cyclone=1-PicoCpu.cycles;\r
+ PicoCpuCM68k.cycles=1;\r
+ CycloneRun(&PicoCpuCM68k);\r
+ cyc_cyclone=1-PicoCpuCM68k.cycles;\r
cyc_musashi=m68k_execute(1);\r
\r
if(cyc_cyclone != cyc_musashi) {\r
\r
// compare regs\r
for(i=0; i < 16; i++) {\r
- if(PicoCpu.d[i] != m68ki_cpu.dar[i]) {\r
+ if(PicoCpuCM68k.d[i] != m68ki_cpu.dar[i]) {\r
str = (i < 8) ? "d" : "a";\r
- dprintf("reg: %s%i: %08x vs %08x", str, i&7, PicoCpu.d[i], m68ki_cpu.dar[i]);\r
+ dprintf("reg: %s%i: %08x vs %08x", str, i&7, PicoCpuCM68k.d[i], m68ki_cpu.dar[i]);\r
err=1;\r
}\r
}\r
\r
// SR\r
- if((CycloneGetSr(&PicoCpu)) != (mu_sr = m68k_get_reg(NULL, M68K_REG_SR))) {\r
- dprintf("SR: %04x vs %04x (??s? 0iii 000x nzvc)", CycloneGetSr(&PicoCpu), mu_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
err=1;\r
}\r
\r
// IRQl\r
- if(PicoCpu.irq != (m68ki_cpu.int_level>>8)) {\r
- dprintf("IRQ: %i vs %i", PicoCpu.irq, (m68ki_cpu.int_level>>8));\r
+ if(PicoCpuCM68k.irq != (m68ki_cpu.int_level>>8)) {\r
+ dprintf("IRQ: %i vs %i", PicoCpuCM68k.irq, (m68ki_cpu.int_level>>8));\r
err=1;\r
}\r
\r
// OSP/USP\r
- if(PicoCpu.osp != m68ki_cpu.sp[((mu_sr>>11)&4)^4]) {\r
- dprintf("OSP: %06x vs %06x", PicoCpu.osp, m68ki_cpu.sp[((mu_sr>>11)&4)^4]);\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
err=1;\r
}\r
\r
// stopped\r
- if(((PicoCpu.state_flags&1) && !m68ki_cpu.stopped) || (!(PicoCpu.state_flags&1) && m68ki_cpu.stopped)) {\r
- dprintf("stopped: %i vs %i", PicoCpu.state_flags&1, m68ki_cpu.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
err=1;\r
}\r
\r
// tracing\r
- if(((PicoCpu.state_flags&2) && !m68ki_tracing) || (!(PicoCpu.state_flags&2) && m68ki_tracing)) {\r
- dprintf("tracing: %i vs %i", PicoCpu.state_flags&2, m68ki_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
err=1;\r
}\r
\r
if(err) dumpPCandExit();\r
\r
#if 0\r
- if (PicoCpu.a[7] < 0x00ff0000 || PicoCpu.a[7] >= 0x01000000)\r
+ if (PicoCpuCM68k.a[7] < 0x00ff0000 || PicoCpuCM68k.a[7] >= 0x01000000)\r
{\r
- PicoCpu.a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
+ PicoCpuCM68k.a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
}\r
#endif\r
#if 0\r
m68k_set_reg(M68K_REG_SR, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000)); // broken\r
- CycloneSetSr(&PicoCpu, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000));\r
- PicoCpu.stopped = m68ki_cpu.stopped = 0;\r
- if(SekPc > 0x400 && (PicoCpu.a[7] < 0xff0000 || PicoCpu.a[7] > 0xffffff))\r
- PicoCpu.a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
+ CycloneSetSr(&PicoCpuCM68k, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000));\r
+ PicoCpuCM68k.stopped = m68ki_cpu.stopped = 0;\r
+ if(SekPc > 0x400 && (PicoCpuCM68k.a[7] < 0xff0000 || PicoCpuCM68k.a[7] > 0xffffff))\r
+ PicoCpuCM68k.a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
#endif\r
\r
cyc_done += cyc_cyclone;\r
notaz.gp2x.de / picodrive.git / blobdiff