adjustments for CPU core changes

[picodrive.git] / Pico / _cyclone_debug.c

diff --git a/Pico/_cyclone_debug.c b/Pico/_cyclone_debug.c
index 25e94d6..9112c09 100644 (file)
--- a/Pico/_cyclone_debug.c
+++ b/Pico/_cyclone_debug.c
@@ -53,24 +53,21 @@ int CM_compareRun(int cyc)
       //m68ki_cpu.s_flag = SFLAG_SET;\r
       //PicoCpu.srh|=0x20;\r
     }\r
-    if (PicoCpu.a[7] < 0x00ff0000 || PicoCpu.a[7] >= 0x01000000)\r
-    {\r
-      PicoCpu.a[7] = m68ki_cpu.dar[15] = 0xff8000;\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
 \r
-    //if (Pico.m.frame_count > 1400)\r
-    //  dprintf("---");\r
+    /*\r
+    dprintf("---");\r
     {\r
       char buff[128];\r
       dprintf("---");\r
       m68k_disassemble(buff, pppc, M68K_CPU_TYPE_68000);\r
       dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
     }\r
+    */\r
 \r
     PicoCpu.cycles=1;\r
     CycloneRun(&PicoCpu);\r
@@ -137,7 +134,7 @@ int CM_compareRun(int cyc)
 \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[0]);\r
+      dprintf("OSP: %06x vs %06x", PicoCpu.osp, m68ki_cpu.sp[((mu_sr>>11)&4)^4]);\r
       err=1;\r
     }\r
 \r
@@ -149,6 +146,12 @@ int CM_compareRun(int cyc)
 \r
     if(err) dumpPCandExit();\r
 \r
+/*\r
+    if (PicoCpu.a[7] < 0x00ff0000 || PicoCpu.a[7] >= 0x01000000)\r
+    {\r
+      PicoCpu.a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
+    }\r
+*/\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