cyclone_debug improvements pt. 2

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@185 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 21db15e..48f1fed 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-//#define __debug_io\r
+#define __debug_io\r
 \r
 #include "PicoInt.h"\r
 \r
@@ -307,7 +307,7 @@ u8 CPU_CALL PicoRead8(u32 a)
   dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
 #endif\r
 #if defined(EMU_C68K) && defined(EMU_M68K)\r
-  if(a>=Pico.romsize&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b) {\r
+  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {\r
     lastread_a = a;\r
     lastread_d[lrp_cyc++&15] = (u8)d;\r
   }\r
@@ -343,7 +343,7 @@ u16 CPU_CALL PicoRead16(u32 a)
   dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 #endif\r
 #if defined(EMU_C68K) && defined(EMU_M68K)\r
-  if(a>=Pico.romsize&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b) {\r
+  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {\r
     lastread_a = a;\r
     lastread_d[lrp_cyc++&15] = d;\r
   }\r
@@ -374,7 +374,7 @@ u32 CPU_CALL PicoRead32(u32 a)
   dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
 #endif\r
 #if defined(EMU_C68K) && defined(EMU_M68K)\r
-  if(a>=Pico.romsize&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b) {\r
+  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {\r
     lastread_a = a;\r
     lastread_d[lrp_cyc++&15] = d;\r
   }\r
@@ -500,39 +500,72 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a);
 unsigned int  m68k_read_pcrelative_CD32(unsigned int a);\r
 \r
 // these are allowed to access RAM\r
-unsigned int  m68k_read_pcrelative_8 (unsigned int a) {\r
+static unsigned int  m68k_read_8 (unsigned int a, int do_fake) {\r
   a&=0xffffff;\r
   if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);\r
   if(a<Pico.romsize)         return *(u8 *)(Pico.rom+(a^1)); // Rom\r
+  if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
   if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram\r
-  return 0;//(u8)  lastread_d;\r
+  return 0;\r
 }\r
-unsigned int  m68k_read_pcrelative_16(unsigned int a) {\r
+static unsigned int  m68k_read_16(unsigned int a, int do_fake) {\r
   a&=0xffffff;\r
   if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);\r
   if(a<Pico.romsize)         return *(u16 *)(Pico.rom+(a&~1)); // Rom\r
+  if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
   if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram\r
-  return 0;//(u16) lastread_d;\r
+  return 0;\r
 }\r
-unsigned int  m68k_read_pcrelative_32(unsigned int a) {\r
+static unsigned int  m68k_read_32(unsigned int a, int do_fake) {\r
   a&=0xffffff;\r
   if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);\r
   if(a<Pico.romsize)         { u16 *pm=(u16 *)(Pico.rom+(a&~1));     return (pm[0]<<16)|pm[1]; }\r
+  if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];\r
   if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram\r
-  return 0;//lastread_d;\r
+  return 0;\r
 }\r
 \r
-unsigned int m68k_read_immediate_16(unsigned int a)    { return m68k_read_pcrelative_16(a); }\r
-unsigned int m68k_read_immediate_32(unsigned int a)    { return m68k_read_pcrelative_32(a); }\r
-unsigned int m68k_read_disassembler_8 (unsigned int a) { return m68k_read_pcrelative_8 (a); }\r
-unsigned int m68k_read_disassembler_16(unsigned int a) { return m68k_read_pcrelative_16(a); }\r
-unsigned int m68k_read_disassembler_32(unsigned int a) { return m68k_read_pcrelative_32(a); }\r
+unsigned int m68k_read_pcrelative_8 (unsigned int a)   { return m68k_read_8 (a, 1); }\r
+unsigned int m68k_read_pcrelative_16(unsigned int a)   { return m68k_read_16(a, 1); }\r
+unsigned int m68k_read_pcrelative_32(unsigned int a)   { return m68k_read_32(a, 1); }\r
+unsigned int m68k_read_immediate_16(unsigned int a)    { return m68k_read_16(a, 0); }\r
+unsigned int m68k_read_immediate_32(unsigned int a)    { return m68k_read_32(a, 0); }\r
+unsigned int m68k_read_disassembler_8 (unsigned int a) { return m68k_read_8 (a, 0); }\r
+unsigned int m68k_read_disassembler_16(unsigned int a) { return m68k_read_16(a, 0); }\r
+unsigned int m68k_read_disassembler_32(unsigned int a) { return m68k_read_32(a, 0); }\r
 \r
 #ifdef EMU_C68K\r
 // ROM only\r
-unsigned int  m68k_read_memory_8(unsigned int a)  { if(a<Pico.romsize) return  *(u8 *) (Pico.rom+(a^1)); return (u8)  lastread_d[lrp_mus++&15]; }\r
-unsigned int  m68k_read_memory_16(unsigned int a) { if(a<Pico.romsize) return  *(u16 *)(Pico.rom+(a&~1));return (u16) lastread_d[lrp_mus++&15]; }\r
-unsigned int  m68k_read_memory_32(unsigned int a) { if(a<Pico.romsize) {u16 *pm=(u16 *)(Pico.rom+(a&~1));return (pm[0]<<16)|pm[1];} return lastread_d[lrp_mus++&15]; }\r
+unsigned int m68k_read_memory_8(unsigned int a)\r
+{\r
+  u8 d;\r
+  if(a<Pico.romsize) d = *(u8 *) (Pico.rom+(a^1));\r
+  else d = (u8) lastread_d[lrp_mus++&15];\r
+#ifdef __debug_io\r
+  dprintf("r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
+#endif\r
+  return d;\r
+}\r
+unsigned int m68k_read_memory_16(unsigned int a)\r
+{\r
+  u16 d;\r
+  if(a<Pico.romsize) d = *(u16 *)(Pico.rom+(a&~1));\r
+  else d = (u16) lastread_d[lrp_mus++&15];\r
+#ifdef __debug_io\r
+  dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
+#endif\r
+  return d;\r
+}\r
+unsigned int m68k_read_memory_32(unsigned int a)\r
+{\r
+  u32 d;\r
+  if(a<Pico.romsize) {u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1];}\r
+  else d = lastread_d[lrp_mus++&15];\r
+#ifdef __debug_io\r
+  dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
+#endif\r
+  return d;\r
+}\r
 \r
 // ignore writes, Cyclone already done that\r
 void m68k_write_memory_8(unsigned int address, unsigned int value)  { lastwrite_mus_d[lwp_mus++&15] = value; }\r

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 104aef0..e2b16a2 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -431,7 +431,7 @@ static int PicoFrameHints(void)
       getSamples(y);\r
 \r
     // Run scanline:\r
-    if (Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();\r
+    if (Pico.m.dma_bytes) SekCyclesBurn(CheckDMA());\r
     SekRun(cycles_68k);\r
     if ((PicoOpt&4) && Pico.m.z80Run) {\r
       if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80;\r

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index eb10b54..a389c6f 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -110,8 +110,17 @@ extern int SekCycleAimS68k;
 #define SekCyclesResetS68k() {SekCycleCntS68k=SekCycleAimS68k=0;}\r
 #define SekCyclesDoneS68k()  (SekCycleAimS68k-SekCyclesLeftS68k)\r
 \r
-// does not work as expected\r
-//extern int z80ExtraCycles; // extra z80 cycles, used when z80 is [en|dis]abled\r
+// debug cyclone\r
+#if defined(EMU_C68K) && defined(EMU_M68K)\r
+#undef SekSetCyclesLeftNoMCD\r
+#undef SekSetCyclesLeft\r
+#undef SekCyclesBurn\r
+#undef SekEndRun\r
+#define SekSetCyclesLeftNoMCD(c)\r
+#define SekSetCyclesLeft(c)\r
+#define SekCyclesBurn(c)\r
+#define SekEndRun(c)\r
+#endif\r
 \r
 extern int PicoMCD;\r
 \r

diff --git a/Pico/Sek.c b/Pico/Sek.c
index e05f6f4..3ce710f 100644 (file)
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -72,6 +72,12 @@ static int SekUnrecognizedOpcode()
     PicoCpu.stopped = 1;\r
     return 1;\r
   }\r
+#ifdef EMU_M68K // debugging cyclone\r
+  {\r
+    extern int have_illegal;\r
+    have_illegal = 1;\r
+  }\r
+#endif\r
   //exit(1);\r
   return 0;\r
 }\r
@@ -144,6 +150,8 @@ int SekReset()
 #endif\r
 #ifdef EMU_M68K\r
   m68k_set_context(&PicoM68kCPU); // if we ever reset m68k, we always need it's context to be set\r
+  m68ki_cpu.sp[0]=0;\r
+  m68k_set_irq(0);\r
   m68k_pulse_reset();\r
 #endif\r
 \r

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index e0acea9..d70bbb5 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -89,7 +89,7 @@ static void DmaSlow(int len)
 \r
   if(Pico.m.scanline != -1) {\r
     Pico.m.dma_bytes += len;\r
-    if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt+=CheckDMA();\r
+    if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCyclesBurn(CheckDMA());\r
     else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());\r
   } else {\r
     // be approximate in non-accurate mode\r

diff --git a/Pico/cd/Sek.c b/Pico/cd/Sek.c
index 00b3f16..f28b142 100644 (file)
--- a/Pico/cd/Sek.c
+++ b/Pico/cd/Sek.c
@@ -29,7 +29,7 @@ static int new_irq_level(int level)
 }
 
 #ifdef EMU_M68K
-static int SekIntAckS68k(int level)
+static int SekIntAckS68kM(int level)
 {
   int level_new = new_irq_level(level);
   dprintf("s68kACK %i -> %i", level, level_new);
@@ -82,7 +82,7 @@ int SekInitS68k()
     m68k_set_context(&PicoS68kCPU);
     m68k_set_cpu_type(M68K_CPU_TYPE_68000);
     m68k_init();
-    m68k_set_int_ack_callback(SekIntAckS68k);
+    m68k_set_int_ack_callback(SekIntAckS68kM);
 //  m68k_pulse_reset(); // not yet, memmap is not set up
     m68k_set_context(oldcontext);
   }
@@ -111,6 +111,8 @@ int SekResetS68k()
     void *oldcontext = m68ki_cpu_p;
 
     m68k_set_context(&PicoS68kCPU);
+    m68ki_cpu.sp[0]=0;
+    m68k_set_irq(0);
     m68k_pulse_reset();
     m68k_set_context(oldcontext);
   }

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index abb6be4..1654dfa 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -5,9 +5,8 @@ CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-\r
 \r
 # settings\r
-dprint = 1\r
 #mz80 = 1\r
-#debug_cyclone = 1\r
+debug_cyclone = 0\r
 asm_memory = 1\r
 asm_render = 1\r
 asm_ym2612 = 1\r
@@ -18,8 +17,19 @@ asm_cdmemory = 1
 #use_musashi = 1\r
 #up = 1\r
 \r
+\r
+ifeq "$(debug_cyclone)" "1"\r
+use_cyclone = 1\r
+use_musashi = 1\r
+asm_memory = 0\r
+asm_cdmemory = 0\r
+endif\r
+ifneq "$(use_musashi)" "1"\r
+use_cyclone = 1\r
+endif\r
+\r
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK\r
-COPT_COMMON = -static -O3 -ftracer -fstrength-reduce -Wall -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
+COPT_COMMON = -static -Wall -O3 -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s\r
 ifeq "$(profile)" "1"\r
 COPT_COMMON += -fprofile-generate\r
 endif\r
@@ -82,12 +92,17 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
 # mp3\r
 OBJS += mp3.o\r
+# debug\r
+ifeq "$(debug_cyclone)" "1"\r
+OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o\r
+endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r
 DEFINC += -DEMU_M68K\r
 OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o\r
 OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o\r
-else\r
+endif\r
+ifeq "$(use_cyclone)" "1"\r
 DEFINC += -DEMU_C68K\r
 OBJS += ../../cpu/Cyclone/proj/Cyclone.o\r
 endif\r