Cyclone poll detection problem fixed

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

diff --git a/Pico/Cart.c b/Pico/Cart.c
index 6f97a42..a19dcc8 100644 (file)
--- a/Pico/Cart.c
+++ b/Pico/Cart.c
@@ -400,7 +400,6 @@ static int DecodeSmd(unsigned char *data,int len)
 static unsigned char *cd_realloc(void *old, int filesize)\r
 {\r
   unsigned char *rom;\r
-  dprintf("sizeof(mcd_state): %i", sizeof(mcd_state));\r
   rom=realloc(old, sizeof(mcd_state));\r
   if (rom) memset(rom+0x20000, 0, sizeof(mcd_state)-0x20000);\r
   return rom;\r
@@ -418,7 +417,6 @@ static unsigned char *PicoCartAlloc(int filesize)
   alloc_size&=~0x7ffff; // use alloc size of multiples of 512K, so that memhandlers could be set up more efficiently\r
   if((filesize&0x3fff)==0x200) alloc_size+=0x200;\r
   else if(alloc_size-filesize < 4) alloc_size+=4; // padding for out-of-bound exec protection\r
-  //dprintf("alloc_size: %x\n",  alloc_size);\r
 \r
   // Allocate space for the rom plus padding\r
   rom=(unsigned char *)malloc(alloc_size);\r

diff --git a/Pico/Memory.c b/Pico/Memory.c
index ecc34c2..8dc11bb 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -1,14 +1,12 @@
 // This is part of Pico Library\r
 \r
 // (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
-//#define __debug_io\r
-\r
 #include "PicoInt.h"\r
 \r
 #include "sound/ym2612.h"\r
@@ -357,9 +355,7 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
   if ((a&1)==0) d>>=8;\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -394,9 +390,7 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
   else d = OtherRead16(a, 16);\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -429,9 +423,7 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
   else d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);\r
 \r
 end:\r
-#ifdef __debug_io\r
-  dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -448,9 +440,7 @@ end:
 #if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)\r
 PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -465,9 +455,7 @@ PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)
 \r
 void PicoWrite16(u32 a,u16 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w16: %06x, %04x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -482,9 +470,7 @@ void PicoWrite16(u32 a,u16 d)
 \r
 static void PicoWrite32(u32 a,u32 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w32: %06x, %08x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -607,9 +593,7 @@ unsigned int m68k_read_memory_8(unsigned int a)
   if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)\r
        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
+  elprintf(EL_IO, "r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 unsigned int m68k_read_memory_16(unsigned int a)\r
@@ -618,9 +602,7 @@ unsigned int m68k_read_memory_16(unsigned int a)
   if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)\r
        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
+  elprintf(EL_IO, "r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 unsigned int m68k_read_memory_32(unsigned int a)\r
@@ -630,9 +612,7 @@ unsigned int m68k_read_memory_32(unsigned int a)
        { u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1]; }\r
   else if (a <= 0x78) d = m68k_read_32(a, 0);\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
+  elprintf(EL_IO, "r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
   return d;\r
 }\r
 \r

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index b49eaf2..946125c 100644 (file)
--- a/Pico/MemoryCmn.c
+++ b/Pico/MemoryCmn.c
@@ -201,7 +201,7 @@ static
 void OtherWrite16(u32 a,u32 d)
 {
   if (a==0xa11100)            { z80WriteBusReq(d>>8); return; }
-  if (a==0xa11200)            { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
+  if (a==0xa11200)            { elprintf(EL_BUSREQ, "write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
   if ((a&0xffffe0)==0xa10000) { IoWrite8(a, d); return; } // I/O ports
   if ((a&0xff4000)==0xa00000) { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8); return; } // Z80 ram (MSB only)
   if ((a&0xe700f8)==0xc00010||(a&0xff7ff8)==0xa07f10) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 1a7df25..ed97081 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -48,6 +48,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)\r
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }\r
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }\r
+#define SekIsStoppedS68k() (PicoCpuCS68k.state_flags&1)\r
 #define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))\r
 \r
 #define SekInterrupt(i) PicoCpuCM68k.irq=i\r
@@ -79,6 +80,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
        PicoCpuFS68k.execinfo &= ~FM68K_HALTED; \\r
        if (x) { PicoCpuFS68k.execinfo |= FM68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \\r
 }\r
+#define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)\r
 #define SekShouldInterrupt fm68k_would_interrupt()\r
 \r
 #define SekInterrupt(irq) PicoCpuFM68k.interrupts[0]=irq\r
@@ -111,6 +113,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
        if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \\r
        else PicoCpuMS68k.stopped=0; \\r
 }\r
+#define SekIsStoppedS68k() (PicoCpuMS68k.stopped==STOP_LEVEL_STOP)\r
 #define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)\r
 \r
 #define SekInterrupt(irq) { \\r
@@ -478,7 +481,8 @@ PICO_INTERNAL void z80_exit(void);
 #define EL_SRAMIO  0x0200 /* sram i/o */\r
 #define EL_EEPROM  0x0400 /* eeprom debug */\r
 #define EL_UIO     0x0800 /* unmapped i/o */\r
-#define EL_IO      0x1000 /* all i/o (TODO) */\r
+#define EL_IO      0x1000 /* all i/o */\r
+#define EL_CDPOLL  0x2000 /* MCD: log poll detection */\r
 \r
 #define EL_STATUS  0x4000 /* status messages */\r
 #define EL_ANOMALY 0x8000 /* some unexpected conditions (during emulation) */\r

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index 9abc253..05ac5d1 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -9,8 +9,7 @@
 \r
 #include "../PicoInt.h"\r
 \r
-#define cdprintf dprintf\r
-//#define cdprintf(x...)\r
+#define cdprintf(x...)\r
 \r
 \r
 #define CDC_DMA_SPEED 256\r
@@ -86,7 +85,7 @@ PICO_INTERNAL void Update_CDC_TRansfer(int which)
 \r
                        if (Pico_mcd->s68k_regs[0x33] & (1<<5))\r
                        {\r
-                               dprintf("cdc DTE irq 5");\r
+                               elprintf(EL_INTS, "cdc DTE irq 5");\r
                                SekInterruptS68k(5);\r
                        }\r
                }\r
@@ -139,7 +138,7 @@ PICO_INTERNAL void Update_CDC_TRansfer(int which)
        else if (which == 4) // PCM RAM (check: popful Mail)\r
        {\r
                dep = (DMA_Adr & 0x03FF) << 2;\r
-               dprintf("CD DMA # %04x -> PCM[%i] # %04x, len=%i",\r
+               cdprintf("CD DMA # %04x -> PCM[%i] # %04x, len=%i",\r
                        Pico_mcd->cdc.DAC.N, Pico_mcd->pcm.bank, dep, length);\r
                dest = (unsigned short *) (Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank] + dep);\r
 \r
@@ -212,7 +211,7 @@ PICO_INTERNAL_ASM unsigned short Read_CDC_Host(int is_sub)
                        Pico_mcd->cdc.IFSTAT &= ~0x40;\r
 \r
                        if (Pico_mcd->s68k_regs[0x33]&(1<<5)) {\r
-                               dprintf("m68k: s68k irq 5");\r
+                               elprintf(EL_INTS, "m68k: s68k irq 5");\r
                                SekInterruptS68k(5);\r
                        }\r
 \r
@@ -510,7 +509,7 @@ PICO_INTERNAL void CDD_Export_Status(void)
 \r
        if (Pico_mcd->s68k_regs[0x33] & (1<<4))\r
        {\r
-               dprintf("cdd export irq 4");\r
+               elprintf(EL_INTS, "cdd export irq 4");\r
                SekInterruptS68k(4);\r
        }\r
 \r

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 0be0a42..b919ee8 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -3,8 +3,6 @@
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas\r
 \r
 \r
-//#define __debug_io\r
-\r
 #include "../PicoInt.h"\r
 \r
 #include "../sound/ym2612.h"\r
@@ -20,15 +18,10 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED\r
 #endif\r
 \r
-//#define __debug_io\r
-//#define __debug_io2\r
-\r
 //#define rdprintf dprintf\r
 #define rdprintf(...)\r
 //#define wrdprintf dprintf\r
 #define wrdprintf(...)\r
-#define plprintf dprintf\r
-//#define plprintf(...)\r
 \r
 #ifdef EMU_CORE_DEBUG\r
 extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16];\r
@@ -71,7 +64,7 @@ static u32 m68k_reg_read16(u32 a)
       d = Read_CDC_Host(0);\r
       goto end;\r
     case 0xA:\r
-      dprintf("m68k FIXME: reserved read");\r
+      elprintf(EL_UIO, "m68k FIXME: reserved read");\r
       goto end;\r
     case 0xC:\r
       d = Pico_mcd->m.timer_stopwatch >> 16;\r
@@ -85,11 +78,10 @@ static u32 m68k_reg_read16(u32 a)
     goto end;\r
   }\r
 \r
-  dprintf("m68k_regs FIXME invalid read @ %02x", a);\r
+  elprintf(EL_UIO, "m68k_regs FIXME invalid read @ %02x", a);\r
 \r
 end:\r
 \r
-  // dprintf("ret = %04x", d);\r
   return d;\r
 }\r
 #endif\r
@@ -105,7 +97,7 @@ void m68k_reg_write8(u32 a, u32 d)
   switch (a) {\r
     case 0:\r
       d &= 1;\r
-      if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { dprintf("m68k: s68k irq 2"); SekInterruptS68k(2); }\r
+      if ((d&1) && (Pico_mcd->s68k_regs[0x33]&(1<<2))) { elprintf(EL_INTS, "m68k: s68k irq 2"); SekInterruptS68k(2); }\r
       return;\r
     case 1:\r
       d &= 3;\r
@@ -149,7 +141,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT\r
       if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        plprintf("s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
       }\r
 #endif\r
       return;\r
@@ -169,7 +161,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT\r
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        plprintf("s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
       }\r
 #endif\r
       return;\r
@@ -180,13 +172,13 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT\r
       if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        plprintf("s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
       }\r
 #endif\r
       return;\r
   }\r
 \r
-  dprintf("m68k FIXME: invalid write? [%02x] %02x", a, d);\r
+  elprintf(EL_UIO, "m68k FIXME: invalid write? [%02x] %02x", a, d);\r
 }\r
 \r
 #ifndef _ASM_CD_MEMORY_C\r
@@ -195,6 +187,8 @@ static
 u32 s68k_poll_detect(u32 a, u32 d)\r
 {\r
 #ifdef USE_POLL_DETECT\r
+  // needed mostly for Cyclone, which doesn't always check it's cycle counter\r
+  if (SekIsStoppedS68k()) return d;\r
   // polling detection\r
   if (a == (s68k_poll_adclk&0xff)) {\r
     unsigned int clkdiff = SekCyclesDoneS68k() - (s68k_poll_adclk>>8);\r
@@ -203,7 +197,7 @@ u32 s68k_poll_detect(u32 a, u32 d)
       //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt);\r
       if (s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(1);\r
-        plprintf("s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a);\r
+        elprintf(EL_CDPOLL, "s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a);\r
       }\r
       s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;\r
       return d;\r
@@ -374,7 +368,7 @@ void s68k_reg_write8(u32 a, u32 d)
 \r
   if ((a&0x1f0) == 0x10 || (a >= 0x38 && a < 0x42))\r
   {\r
-    dprintf("s68k FIXME: invalid write @ %02x?", a);\r
+    elprintf(EL_UIO, "s68k FIXME: invalid write @ %02x?", a);\r
     return;\r
   }\r
 \r
@@ -410,7 +404,7 @@ static u32 OtherRead16End(u32 a, int realsize)
     goto end;\r
   }\r
 \r
-  dprintf("m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);\r
+  elprintf(EL_UIO, "m68k FIXME: unusual r%i: %06x @%06x", realsize&~1, (a&0xfffffe)+(realsize&1), SekPc);\r
 \r
 end:\r
   return d;\r
@@ -434,7 +428,7 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
     return;\r
   }\r
 \r
-  dprintf("m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
+  elprintf(EL_UIO, "m68k FIXME: strange w%i: [%06x], %08x @%06x", realsize, a&0xffffff, d, SekPc);\r
 }\r
 \r
 #define _CD_MEMORY_C\r
@@ -521,9 +515,7 @@ u32 PicoReadM68k8(u32 a)
   }\r
 \r
 \r
-#ifdef __debug_io\r
-  dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -608,9 +600,7 @@ static u32 PicoReadM68k16(u32 a)
   }\r
 \r
 \r
-#ifdef __debug_io\r
-  dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -704,9 +694,7 @@ static u32 PicoReadM68k32(u32 a)
   }\r
 \r
 \r
-#ifdef __debug_io\r
-  dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   if (a>=Pico.romsize) {\r
     lastread_a = a;\r
@@ -725,9 +713,7 @@ void PicoWriteM68k8(u32 a,u8 d);
 #else\r
 void PicoWriteM68k8(u32 a,u8 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
-#endif\r
+  elprintf(EL_IO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -778,9 +764,7 @@ void PicoWriteM68k16(u32 a,u16 d);
 #else\r
 static void PicoWriteM68k16(u32 a,u16 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w16: %06x, %04x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w16: %06x, %04x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -824,7 +808,7 @@ static void PicoWriteM68k16(u32 a,u16 d)
 #ifdef USE_POLL_DETECT\r
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {\r
         SekSetStopS68k(0); s68k_poll_adclk = 0;\r
-        plprintf("s68k poll release, a=%02x\n", a);\r
+        elprintf(EL_CDPOLL, "s68k poll release, a=%02x\n", a);\r
       }\r
 #endif\r
       return;\r
@@ -850,9 +834,7 @@ void PicoWriteM68k32(u32 a,u32 d);
 #else\r
 static void PicoWriteM68k32(u32 a,u32 d)\r
 {\r
-#ifdef __debug_io\r
-  dprintf("w32: %06x, %08x", a&0xffffff, d);\r
-#endif\r
+  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -968,7 +950,6 @@ static u32 PicoReadS68k8(u32 a)
       d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];\r
       if (a&1) d &= 0x0f;\r
       else d >>= 4;\r
-      dprintf("FIXME: decode");\r
     } else {\r
       // allow access in any mode, like Gens does\r
       d = Pico_mcd->word_ram2M[(a^1)&0x3ffff];\r
@@ -991,7 +972,7 @@ static u32 PicoReadS68k8(u32 a)
 \r
   // PCM\r
   if ((a&0xff8000)==0xff0000) {\r
-    dprintf("s68k_pcm r8: [%06x] @%06x", a, SekPcS68k);\r
+    elprintf(EL_IO, "s68k_pcm r8: [%06x] @%06x", a, SekPcS68k);\r
     a &= 0x7fff;\r
     if (a >= 0x2000)\r
       d = Pico_mcd->pcm_ram_b[Pico_mcd->pcm.bank][(a>>1)&0xfff];\r
@@ -1000,7 +981,7 @@ static u32 PicoReadS68k8(u32 a)
       d = Pico_mcd->pcm.ch[a>>2].addr >> PCM_STEP_SHIFT;\r
       if (a & 2) d >>= 8;\r
     }\r
-    dprintf("ret = %02x", (u8)d);\r
+    elprintf(EL_IO, "ret = %02x", (u8)d);\r
     goto end;\r
   }\r
 \r
@@ -1010,13 +991,11 @@ static u32 PicoReadS68k8(u32 a)
     goto end;\r
   }\r
 \r
-  dprintf("s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);\r
+  elprintf(EL_UIO, "s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);\r
 \r
   end:\r
 \r
-#ifdef __debug_io2\r
-  dprintf("s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);\r
-#endif\r
+  elprintf(EL_IO, "s68k r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPcS68k);\r
 #ifdef EMU_CORE_DEBUG\r
   lastread_a = ab;\r
   lastread_d[lrp_cyc++&15] = d;\r
@@ -1064,7 +1043,6 @@ static u32 PicoReadS68k16(u32 a)
       int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
       d = Pico_mcd->word_ram1M[bank][((a>>1)^1)&0x1ffff];\r
       d |= d << 4; d &= ~0xf0;\r
-      dprintf("FIXME: decode");\r
     } else {\r
       // allow access in any mode, like Gens does\r
       d = *(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe));\r
@@ -1110,13 +1088,11 @@ static u32 PicoReadS68k16(u32 a)
     goto end;\r
   }\r
 \r
-  dprintf("s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);\r
+  elprintf(EL_UIO, "s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);\r
 \r
   end:\r
 \r
-#ifdef __debug_io2\r
-  dprintf("s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);\r
-#endif\r
+  elprintf(EL_IO, "s68k r16: %06x, %04x  @%06x", a&0xffffff, d, SekPcS68k);\r
 #ifdef EMU_CORE_DEBUG\r
   lastread_a = ab;\r
   lastread_d[lrp_cyc++&15] = d;\r
@@ -1220,13 +1196,11 @@ static u32 PicoReadS68k32(u32 a)
     goto end;\r
   }\r
 \r
-  dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
+  elprintf(EL_UIO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
 \r
   end:\r
 \r
-#ifdef __debug_io2\r
-  dprintf("s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
-#endif\r
+  elprintf(EL_IO, "s68k r32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
 #ifdef EMU_CORE_DEBUG\r
   if (ab > 0x78) { // not vectors and stuff\r
     lastread_a = ab;\r
@@ -1296,9 +1270,7 @@ void PicoWriteS68k8(u32 a,u8 d);
 #else\r
 static void PicoWriteS68k8(u32 a,u8 d)\r
 {\r
-#ifdef __debug_io2\r
-  dprintf("s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);\r
-#endif\r
+  elprintf(EL_IO, "s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);\r
 \r
   a&=0xffffff;\r
 \r
@@ -1366,7 +1338,7 @@ static void PicoWriteS68k8(u32 a,u8 d)
     return;\r
   }\r
 \r
-  dprintf("s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);\r
+  elprintf(EL_UIO, "s68k w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPcS68k);\r
 }\r
 #endif\r
 \r
@@ -1376,9 +1348,7 @@ void PicoWriteS68k16(u32 a,u16 d);
 #else\r
 static void PicoWriteS68k16(u32 a,u16 d)\r
 {\r
-#ifdef __debug_io2\r
-  dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
-#endif\r
+  elprintf(EL_IO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
 \r
   a&=0xfffffe;\r
 \r
@@ -1456,7 +1426,7 @@ static void PicoWriteS68k16(u32 a,u16 d)
     return;\r
   }\r
 \r
-  dprintf("s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
+  elprintf(EL_UIO, "s68k w16: %06x, %04x @%06x", a&0xffffff, d, SekPcS68k);\r
 }\r
 #endif\r
 \r
@@ -1466,9 +1436,7 @@ void PicoWriteS68k32(u32 a,u32 d);
 #else\r
 static void PicoWriteS68k32(u32 a,u32 d)\r
 {\r
-#ifdef __debug_io2\r
-  dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
-#endif\r
+  elprintf(EL_IO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
 \r
   a&=0xfffffe;\r
 \r
@@ -1558,7 +1526,7 @@ static void PicoWriteS68k32(u32 a,u32 d)
     return;\r
   }\r
 \r
-  dprintf("s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
+  elprintf(EL_UIO, "s68k w32: %06x, %08x @%06x", a&0xffffff, d, SekPcS68k);\r
 }\r
 #endif\r
 \r
@@ -1586,7 +1554,7 @@ static __inline int PicoMemBaseM68k(u32 pc)
   }\r
 \r
   // Error - Program Counter is invalid\r
-  dprintf("m68k FIXME: unhandled jump to %06x", pc);\r
+  elprintf(EL_ANOMALY, "m68k FIXME: unhandled jump to %06x", pc);\r
 \r
   return (int)Pico_mcd->bios;\r
 }\r
@@ -1617,7 +1585,7 @@ static __inline int PicoMemBaseS68k(u32 pc)
   }\r
 \r
   // Error - Program Counter is invalid\r
-  dprintf("s68k FIXME: unhandled jump to %06x", pc);\r
+  elprintf(EL_ANOMALY, "s68k FIXME: unhandled jump to %06x", pc);\r
 \r
   return (int)Pico_mcd->prg_ram;\r
 }\r
@@ -1658,7 +1626,6 @@ void PicoMemResetCD(int r3)
 \r
 PICO_INTERNAL void PicoMemSetupCD(void)\r
 {\r
-  dprintf("PicoMemSetupCD()");\r
 #ifdef EMU_C68K\r
   // Setup m68k memory callbacks:\r
   PicoCpuCM68k.checkpc=PicoCheckPcM68k;\r
@@ -1757,7 +1724,7 @@ unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
       int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
       return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff));\r
     }\r
-    dprintf("s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);\r
+    elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);\r
   } else {\r
     if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram\r
     if(a<0x20000)              return *(u8 *)(Pico.rom+(a^1)); // Bios\r
@@ -1769,7 +1736,7 @@ unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
         return *(u8 *)(Pico_mcd->word_ram1M[bank]+((a^1)&0x1ffff));\r
       }\r
     }\r
-    dprintf("m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);\r
+    elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD8 FIXME: can't handle %06x", a);\r
   }\r
   return 0;//(u8)  lastread_d;\r
 }\r
@@ -1784,7 +1751,7 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
       int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
       return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
     }\r
-    dprintf("s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);\r
+    elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);\r
   } else {\r
     if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram\r
     if(a<0x20000)              return *(u16 *)(Pico.rom+(a&~1)); // Bios\r
@@ -1796,7 +1763,7 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
         return *(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
       }\r
     }\r
-    dprintf("m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);\r
+    elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD16 FIXME: can't handle %06x", a);\r
   }\r
   return 0;\r
 }\r
@@ -1813,7 +1780,7 @@ unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
       pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe));\r
       return (pm[0]<<16)|pm[1];\r
     }\r
-    dprintf("s68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);\r
+    elprintf(EL_ANOMALY, "s68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);\r
   } else {\r
     if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram\r
     if(a<0x20000)              { u16 *pm=(u16 *)(Pico.rom+(a&~1));     return (pm[0]<<16)|pm[1]; }\r
@@ -1826,7 +1793,7 @@ unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
         return (pm[0]<<16)|pm[1];\r
       }\r
     }\r
-    dprintf("m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);\r
+    elprintf(EL_ANOMALY, "m68k_read_pcrelative_CD32 FIXME: can't handle %06x", a);\r
   }\r
   return 0;\r
 }\r

diff --git a/Pico/cd/Sek.c b/Pico/cd/Sek.c
index 8e5e45f..47370da 100644 (file)
--- a/Pico/cd/Sek.c
+++ b/Pico/cd/Sek.c
@@ -40,14 +40,14 @@ static int SekIntAckS68k(int level)
 {
   int level_new = new_irq_level(level);
 
-  dprintf("s68kACK %i -> %i", level, level_new);
+  elprintf(EL_INTS, "s68kACK %i -> %i", level, level_new);
   PicoCpuCS68k.irq = level_new;
   return CYCLONE_INT_ACK_AUTOVECTOR;
 }
 
 static void SekResetAckS68k(void)
 {
-  dprintf("s68k: Reset encountered @ %06x", SekPcS68k);
+  elprintf(EL_ANOMALY, "s68k: Reset encountered @ %06x", SekPcS68k);
 }
 
 static int SekUnrecognizedOpcodeS68k(void)
@@ -55,7 +55,7 @@ static int SekUnrecognizedOpcodeS68k(void)
   unsigned int pc, op;
   pc = SekPcS68k;
   op = PicoCpuCS68k.read16(pc);
-  dprintf("Unrecognized Opcode %04x @ %06x", op, pc);
+  elprintf(EL_ANOMALY, "Unrecognized Opcode %04x @ %06x", op, pc);
   //exit(1);
   return 0;
 }
@@ -66,7 +66,7 @@ static int SekIntAckMS68k(int level)
 {
 #ifndef EMU_CORE_DEBUG
   int level_new = new_irq_level(level);
-  dprintf("s68kACK %i -> %i", level, level_new);
+  elprintf(EL_INTS, "s68kACK %i -> %i", level, level_new);
   CPU_INT_LEVEL = level_new << 8;
 #else
   CPU_INT_LEVEL = 0;
@@ -79,7 +79,7 @@ static int SekIntAckMS68k(int level)
 static void SekIntAckFS68k(unsigned level)
 {
   int level_new = new_irq_level(level);
-  dprintf("s68kACK %i -> %i", level, level_new);
+  elprintf(EL_INTS, "s68kACK %i -> %i", level, level_new);
 #ifndef EMU_CORE_DEBUG
   PicoCpuFS68k.interrupts[0] = level_new;
 #else

diff --git a/Pico/cd/cd_file.c b/Pico/cd/cd_file.c
index 1a4d62a..9c898a9 100644 (file)
--- a/Pico/cd/cd_file.c
+++ b/Pico/cd/cd_file.c
@@ -10,8 +10,7 @@
 #include "../PicoInt.h"
 #include "cd_file.h"
 
-#define cdprintf dprintf
-//#define cdprintf(x...)
+#define cdprintf(x...)
 //#define cdprintf(f,...) printf(f "\n",##__VA_ARGS__) // tmp
 #define DEBUG_CD
 
@@ -279,7 +278,7 @@ PICO_INTERNAL int FILE_Read_One_LBA_CDC(void)
                {
                        if (Pico_mcd->s68k_regs[0x33] & (1<<5))
                        {
-                               dprintf("cdc dec irq 5");
+                               elprintf(EL_INTS, "cdc dec irq 5");
                                SekInterruptS68k(5);
                        }
 

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 61482e1..713b995 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -13,8 +13,7 @@
 #include "cd_sys.h"\r
 #include "cd_file.h"\r
 \r
-#define cdprintf dprintf\r
-//#define cdprintf(x...)\r
+#define cdprintf(x...)\r
 #define DEBUG_CD\r
 \r
 #define TRAY_OPEN      0x0500          // TRAY OPEN CDD status\r

diff --git a/Pico/cd/gfx_cd.c b/Pico/cd/gfx_cd.c
index 630109c..bee0b94 100644 (file)
--- a/Pico/cd/gfx_cd.c
+++ b/Pico/cd/gfx_cd.c
@@ -77,7 +77,7 @@ static void gfx_completed(void)
        _rot_comp.Reg_64  = 0;
        if (Pico_mcd->s68k_regs[0x33] & (1<<1))
        {
-               dprintf("gfx_cd irq 1");
+               elprintf(EL_INTS, "gfx_cd irq 1");
                SekInterruptS68k(1);
        }
 }

diff --git a/platform/common/lprintf.h b/platform/common/lprintf.h
index 1d30472..34ec6b7 100644 (file)
--- a/platform/common/lprintf.h
+++ b/platform/common/lprintf.h
@@ -1,9 +1,2 @@
-#if defined(__GP2X__)
- #include <stdio.h>
- #define lprintf printf
-#elif defined(PSP)
- extern void lprintf(const char *fmt, ...);
-#else
- #include "giz.h"
-#endif
+extern void lprintf(const char *fmt, ...);
 

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index eeb37c7..7c083c1 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -34,7 +34,7 @@ endif
 DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK\r
 COPT_COMMON = -static -Wall -Winline\r
 ifeq ($(DEBUG),)\r
-COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
 else\r
 COPT_COMMON += -ggdb\r
 endif\r

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 701bcd8..3f2ed3f 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -43,7 +43,7 @@ char romFileName[PATH_MAX];
 \r
 extern int crashed_940;\r
 \r
-static short sndBuffer[2*44100/50];\r
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
 static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int osd_fps_x;\r
 static int combo_keys = 0, combo_acts = 0;     // keys and actions which need button combos\r

diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c
index 4995f08..3ed64fb 100644 (file)
--- a/platform/gp2x/gp2x.c
+++ b/platform/gp2x/gp2x.c
@@ -22,6 +22,7 @@
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
+#include <stdarg.h>\r
 #include <string.h>\r
 #include <unistd.h>\r
 #include <sys/mman.h>\r
@@ -375,4 +376,13 @@ void gp2x_deinit(void)
        }\r
 }\r
 \r
+/* lprintf */\r
+void lprintf(const char *fmt, ...)\r
+{\r
+       va_list vl;\r
+\r
+       va_start(vl, fmt);\r
+       vprintf(fmt, vl);\r
+       va_end(vl);\r
+}\r
 \r

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 8b4968c..ddb9d2e 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -155,11 +155,12 @@ static void cdload_progress_cb(int percent)
 \r
        smalltext_out16(1, 3*10, "Processing CD image / MP3s", 0xffff);\r
        smalltext_out16_lim(1, 4*10, romFileName, 0xffff, 80);\r
-       dst += 30;\r
+       dst += 320*30;\r
 \r
        if (len > 320) len = 320;\r
        for (ln = 8; ln > 0; ln--, dst += 320)\r
                memset(dst, 0xff, len*2);\r
+       menu_flip();\r
        cdload_called = 1;\r
 }\r
 \r
@@ -182,7 +183,7 @@ void menu_romload_prepare(const char *rom_name)
 \r
 void menu_romload_end(void)\r
 {\r
-       PicoCartLoadProgressCB = NULL;\r
+       PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;\r
        smalltext_out16(1, cdload_called ? 60 : 30, "Starting emulation...", 0xffff);\r
        menu_flip();\r
 }\r

diff --git a/platform/gp2x/port_config.h b/platform/gp2x/port_config.h
index 5d9bf04..1503593 100644 (file)
--- a/platform/gp2x/port_config.h
+++ b/platform/gp2x/port_config.h
@@ -18,7 +18,7 @@
 #define CAN_HANDLE_240_LINES   1\r
 \r
 // logging emu events\r
-#define EL_LOGMASK 0 // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff\r
+#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff\r
 \r
 //#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
 #define dprintf(x...)\r

diff --git a/platform/linux/gp2x.c b/platform/linux/gp2x.c
index 3b43c3d..b89990b 100644 (file)
--- a/platform/linux/gp2x.c
+++ b/platform/linux/gp2x.c
@@ -428,5 +428,13 @@ void spend_cycles(int c)
        usleep(c/200);
 }
 
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+       va_list vl;
 
+       va_start(vl, fmt);
+       vprintf(fmt, vl);
+       va_end(vl);
+}