X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=ce3e3408f7618f78d6852fef5505ab0ba60fe21f;hb=3aa1e148a28da9b4e10e824984f7b3a4908b1ace;hp=e2b16a20251e4f22e6de834b18398bb88c9f643c;hpb=2d0b15bb2c532cacdbc8fcecb915177b1bd5f2af;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index e2b16a2..ce3e340 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -8,23 +8,21 @@
 
 
 #include "PicoInt.h"
-#include "sound/sound.h"
 #include "sound/ym2612.h"
 
-int PicoVer=0x0110;
+int PicoVer=0x0133;
 struct Pico Pico;
 int PicoOpt=0; // disable everything by default
 int PicoSkipFrame=0; // skip rendering frame?
 int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
 int PicoAutoRgnOrder = 0;
-int emustatus = 0;
+int emustatus = 0; // rapid_ym2612, multi_ym_updates
 void (*PicoWriteSound)(int len) = 0; // called once per frame at the best time to send sound buffer (PsndOut) to hardware
 
-struct PicoSRAM SRam;
-int z80startCycle = 0, z80stopCycle = 0; // in 68k cycles
-//int z80ExtraCycles = 0;
+struct PicoSRAM SRam = {0,};
+int z80startCycle, z80stopCycle; // in 68k cycles
 int PicoPad[2];  // Joypads, format is SACB RLDU
-int PicoMCD = 0; // mega CD status: scd_started, reset_pending
+int PicoMCD = 0; // mega CD status: scd_started
 
 // to be called once on emu init
 int PicoInit(void)
@@ -39,9 +37,7 @@ int PicoInit(void)
 
   PicoInitMCD();
 
-  // notaz: sram
   SRam.data=0;
-  SRam.resize=1;
 
   return 0;
 }
@@ -53,7 +49,6 @@ void PicoExit(void)
     PicoExitMCD();
   z80_exit();
 
-  // notaz: sram
   if(SRam.data) free(SRam.data); SRam.data=0;
 }
 
@@ -62,13 +57,10 @@ int PicoReset(int hard)
   unsigned int region=0;
   int support=0,hw=0,i=0;
   unsigned char pal=0;
+  unsigned char sram_reg=Pico.m.sram_reg; // must be preserved
 
   if (Pico.romsize<=0) return 1;
 
-  // setup correct memory map
-  if (PicoMCD & 1)
-       PicoMemSetupCD();
-  else PicoMemSetup();
   PicoMemReset();
   SekReset();
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
@@ -152,124 +144,78 @@ int PicoReset(int hard)
     return 0;
   }
 
+  // reset sram state; enable sram access by default if it doesn't overlap with ROM
+  Pico.m.sram_reg=sram_reg&0x14;
+  if (!(Pico.m.sram_reg&4) && Pico.romsize <= SRam.start) Pico.m.sram_reg |= 1;
 
-  // notaz: sram
-  if(SRam.resize) {
-    int sram_size = 0;
-    if(SRam.data) free(SRam.data); SRam.data=0;
-    Pico.m.sram_reg = 0;
-
-    if(*(Pico.rom+0x1B1) == 'R' && *(Pico.rom+0x1B0) == 'A') {
-      if(*(Pico.rom+0x1B2) & 0x40) {
-        // EEPROM SRAM
-        // what kind of EEPROMs are actually used? X24C02? X24C04? (X24C01 has only 128), but we will support up to 8K
-        SRam.start = PicoRead32(0x1B4) & ~1; // zero address is used for clock by some games
-        SRam.end   = PicoRead32(0x1B8);
-        sram_size  = 0x2000;
-        Pico.m.sram_reg = 4;
-      } else {
-        // normal SRAM
-        SRam.start = PicoRead32(0x1B4) & 0xFFFF00;
-        SRam.end   = PicoRead32(0x1B8) | 1;
-        sram_size  = SRam.end - SRam.start + 1;
-      }
-      Pico.m.sram_reg |= 0x10; // SRAM was detected
-    }
-    if(sram_size <= 0) {
-      // some games may have bad headers, like S&K and Sonic3
-      SRam.start = 0x200000;
-      SRam.end   = 0x203FFF;
-      sram_size  = 0x004000;
-    }
-
-    // enable sram access by default if it doesn't overlap with ROM
-    if(Pico.romsize <= SRam.start) Pico.m.sram_reg |= 1;
-    SRam.reg_back = Pico.m.sram_reg;
-
-    if(sram_size) {
-      SRam.data = (unsigned char *) calloc(sram_size, 1);
-      if(!SRam.data) return 1;
-    }
-    SRam.resize=0;
-    // Dino Dini's Soccer malfunctions if SRAM is not filled with 0xff
-    if (strncmp((char *)Pico.rom+0x150, "IDOND NI'I", 10) == 0)
-      memset(SRam.data, 0xff, sram_size);
-    dprintf("sram: det: %i; eeprom: %i; start: %06x; end: %06x\n",
-      (Pico.m.sram_reg>>4)&1, (Pico.m.sram_reg>>2)&1, SRam.start, SRam.end);
-  }
-
-  Pico.m.sram_reg = SRam.reg_back; // restore sram_reg
-  SRam.changed = 0;
+  elprintf(EL_STATUS, "sram: det: %i; eeprom: %i; start: %06x; end: %06x",
+    (Pico.m.sram_reg>>4)&1, (Pico.m.sram_reg>>2)&1, SRam.start, SRam.end);
 
   return 0;
 }
 
-static int dma_timings[] = {
+
+// dma2vram settings are just hacks to unglitch Legend of Galahad (needs <= 104 to work)
+// same for Outrunners (92-121, when active is set to 24)
+static const int dma_timings[] = {
 83,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
 102, 205, 204, 102, // vblank: 40cell:
-8,    16,  15,   8, // active: 32cell:
-9,    18,  17,   9  // ...
+16,   16,  15,   8, // active: 32cell:
+24,   18,  17,   9  // ...
 };
 
-static int dma_bsycles[] = {
-(488<<8)/83,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
+static const int dma_bsycles[] = {
+(488<<8)/82,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
 (488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,
-(488<<8)/8,   (488<<8)/16,  (488<<8)/15,  (488<<8)/8,
-(488<<8)/9,   (488<<8)/18,  (488<<8)/17,  (488<<8)/9
+(488<<8)/16,  (488<<8)/16,  (488<<8)/15,  (488<<8)/8,
+(488<<8)/24,  (488<<8)/18,  (488<<8)/17,  (488<<8)/9
 };
 
-//static
-int CheckDMA(void)
+PICO_INTERNAL int CheckDMA(void)
 {
-  int burn = 0, bytes_can = 0, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes
-  int bytes = Pico.m.dma_bytes;
+  int burn = 0, xfers_can, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes
+  int xfers = Pico.m.dma_xfers;
   int dma_op1;
 
   if(!(dma_op&2)) dma_op = (Pico.video.type==1) ? 0 : 1; // setting dma_timings offset here according to Gens
   dma_op1 = dma_op;
   if(Pico.video.reg[12] & 1) dma_op |= 4; // 40 cell mode?
   if(!(Pico.video.status&8)&&(Pico.video.reg[1]&0x40)) dma_op|=8; // active display?
-  bytes_can = dma_timings[dma_op];
-
-  if(bytes <= bytes_can) {
+  xfers_can = dma_timings[dma_op];
+  if(xfers <= xfers_can) {
     if(dma_op&2) Pico.video.status&=~2; // dma no longer busy
     else {
-      burn = bytes * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..
-      //SekCycleCnt-=Pico.m.dma_endcycles;
-      //Pico.m.dma_endcycles = 0;
+      burn = xfers * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..
     }
-    Pico.m.dma_bytes = 0;
+    Pico.m.dma_xfers = 0;
   } else {
     if(!(dma_op&2)) burn = 488;
-    Pico.m.dma_bytes -= bytes_can;
+    Pico.m.dma_xfers -= xfers_can;
   }
 
-  //SekCycleCnt+=burn;
-  dprintf("~Dma %i op=%i can=%i burn=%i [%i|%i]", Pico.m.dma_bytes, dma_op1, bytes_can, burn, Pico.m.scanline, SekCyclesDone());
+  elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%i]", Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());
   //dprintf("~aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);
   return burn;
 }
 
-static __inline void SekRun(int cyc)
+static __inline void SekRunM68k(int cyc)
 {
   int cyc_do;
   SekCycleAim+=cyc;
-  //dprintf("aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);
+  //printf("aim: %i, cnt: %i\n", SekCycleAim, SekCycleCnt);
   if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
-  //dprintf("cyc_do: %i", cyc_do);
+  //printf("cyc_do: %i\n", cyc_do);
 #if   defined(EMU_C68K) && defined(EMU_M68K)
   // this means we do run-compare Cyclone vs Musashi
   SekCycleCnt+=CM_compareRun(cyc_do);
 #elif defined(EMU_C68K)
-  PicoCpu.cycles=cyc_do;
-  CycloneRun(&PicoCpu);
-  SekCycleCnt+=cyc_do-PicoCpu.cycles;
-#elif defined(EMU_A68K)
-  m68k_ICount=cyc_do;
-  M68000_RUN();
-  SekCycleCnt+=cyc_do-m68k_ICount;
+  PicoCpuCM68k.cycles=cyc_do;
+  CycloneRun(&PicoCpuCM68k);
+  SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+  SekCycleCnt+=m68k_emulate(cyc_do);
 #endif
 }
 
@@ -281,48 +227,36 @@ static __inline void SekStep(void)
   // this means we do run-compare Cyclone vs Musashi
   SekCycleCnt+=CM_compareRun(1);
 #elif defined(EMU_C68K)
-  PicoCpu.cycles=1;
-  CycloneRun(&PicoCpu);
-  SekCycleCnt+=1-PicoCpu.cycles;
-#elif defined(EMU_A68K)
-  m68k_ICount=1;
-  M68000_RUN();
-  SekCycleCnt+=1-m68k_ICount;
+  PicoCpuCM68k.cycles=1;
+  CycloneRun(&PicoCpuCM68k);
+  SekCycleCnt+=1-PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(1);
+#elif defined(EMU_F68K)
+  SekCycleCnt+=m68k_emulate(1);
 #endif
   SekCycleAim=realaim;
 }
 
 static int CheckIdle(void)
 {
-#if 1
-  unsigned char state[0x88];
-
-  memset(state,0,sizeof(state));
+  int i, state[0x22];
 
   // See if the state is the same after 2 steps:
-  SekState(state); SekStep(); SekStep(); SekState(state+0x44);
-  if (memcmp(state,state+0x44,0x44)==0) return 1;
-#else
-  unsigned char state[0x44];
-  static unsigned char oldstate[0x44];
-
-  SekState(state);
-  if(memcmp(state,oldstate,0x40)==0) return 1;
-  memcpy(oldstate, state, 0x40);
-#endif
+  SekState(state); SekStep(); SekStep(); SekState(state+0x11);
+  for (i = 0x10; i >= 0; i--)
+    if (state[i] != state[i+0x11]) return 0;
 
-  return 0;
+  return 1;
 }
 
+
 // to be called on 224 or line_sample scanlines only
 static __inline void getSamples(int y)
 {
   static int curr_pos = 0;
 
   if(y == 224) {
-    //dprintf("sta%i: %i [%i]", (emustatus & 2), emustatus, y);
     if(emustatus & 2)
          curr_pos += sound_render(curr_pos, PsndLen-PsndLen/2);
     else curr_pos  = sound_render(0, PsndLen);
@@ -338,150 +272,37 @@ static __inline void getSamples(int y)
   }
 }
 
-//extern UINT32 mz80GetRegisterValue(void *, UINT32);
-
-// Accurate but slower frame which does hints
-static int PicoFrameHints(void)
-{
-  struct PicoVideo *pv=&Pico.video;
-  int total_z80=0,lines,y,lines_vis = 224,z80CycleAim = 0,line_sample;
-  const int cycles_68k=488,cycles_z80=228; // both PAL and NTSC compile to same values
-  int skip=PicoSkipFrame || (PicoOpt&0x10);
-  int hint; // Hint counter
-
-  if(Pico.m.pal) { //
-    //cycles_68k = (int) ((double) OSC_PAL  /  7 / 50 / 312 + 0.4); // should compile to a constant (488)
-    //cycles_z80 = (int) ((double) OSC_PAL  / 15 / 50 / 312 + 0.4); // 228
-    lines  = 312;    // Steve Snake says there are 313 lines, but this seems to also work well
-    line_sample = 68;
-    if(pv->reg[1]&8) lines_vis = 240;
-  } else {
-    //cycles_68k = (int) ((double) OSC_NTSC /  7 / 60 / 262 + 0.4); // 488
-    //cycles_z80 = (int) ((double) OSC_NTSC / 15 / 60 / 262 + 0.4); // 228
-    lines  = 262;
-    line_sample = 93;
-  }
-
-  SekCyclesReset();
-  //z80ExtraCycles = 0;
-
-  if(PicoOpt&4)
-    z80CycleAim = 0;
-//    z80_resetCycles();
-
-  pv->status&=~0x88; // clear V-Int, come out of vblank
-
-  hint=pv->reg[10]; // Load H-Int counter
-  //dprintf("-hint: %i", hint);
-
-  for (y=0;y<lines;y++)
-  {
-    Pico.m.scanline=(short)y;
-
-    // pad delay (for 6 button pads)
-    if(PicoOpt&0x20) {
-      if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0;
-      if(Pico.m.padDelay[1]++ > 25) Pico.m.padTHPhase[1]=0;
-    }
-
-    // H-Interrupts:
-    if(y <= lines_vis && --hint < 0) // y <= lines_vis: Comix Zone, Golden Axe
-    {
-      //dprintf("rhint:old @ %06x", SekPc);
-      hint=pv->reg[10]; // Reload H-Int counter
-      pv->pending_ints|=0x10;
-      if (pv->reg[0]&0x10) SekInterrupt(4);
-      //dprintf("rhint: %i @ %06x [%i|%i]", hint, SekPc, y, SekCycleCnt);
-      //dprintf("hint_routine: %x", (*(unsigned short*)(Pico.ram+0x0B84)<<16)|*(unsigned short*)(Pico.ram+0x0B86));
-    }
-
-    // V-Interrupt:
-    if (y == lines_vis)
-    {
-      dprintf("vint: @ %06x [%i|%i], aim=%i cnt=%i", SekPc, y, SekCycleCnt, SekCycleAim, SekCycleCnt);
-      pv->status|=0x08; // go into vblank
-      if(!Pico.m.dma_bytes||(Pico.video.reg[0x17]&0x80)) {
-        // there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)
-        SekRun(128); SekCycleAim-=128; // 128; ?
-      }
-      dprintf("[%i|%i], aim=%i cnt=%i @ %x", y, SekCycleCnt, SekCycleAim, SekCycleCnt, SekPc);
-      pv->status|=0x80; // V-Int happened
-      pv->pending_ints|=0x20;
-      if(pv->reg[1]&0x20) SekInterrupt(6);
-      if(Pico.m.z80Run && (PicoOpt&4)) // ?
-        z80_int();
-      //dprintf("zint: [%i|%i] zPC=%04x", Pico.m.scanline, SekCyclesDone(), mz80GetRegisterValue(NULL, 0));
-    }
-
-    // decide if we draw this line
-#if CAN_HANDLE_240_LINES
-    if(!skip && ((!(pv->reg[1]&8) && y<224) || ((pv->reg[1]&8) && y<240)) )
-#else
-    if(!skip && y<224)
-#endif
-      PicoLine(y);
-
-    if(PicoOpt&1)
-      sound_timers_and_dac(y);
-
-    // get samples from sound chips
-    if(y == 32 && PsndOut)
-      emustatus &= ~1;
-    else if((y == 224 || y == line_sample) && PsndOut)
-      getSamples(y);
-
-    // Run scanline:
-    if (Pico.m.dma_bytes) SekCyclesBurn(CheckDMA());
-    SekRun(cycles_68k);
-    if ((PicoOpt&4) && Pico.m.z80Run) {
-      if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80;
-      else {
-        int cnt = SekCyclesDone() - z80startCycle;
-        cnt = (cnt>>1)-(cnt>>5);
-        //if (cnt > cycles_z80) printf("FIXME: z80 cycles: %i\n", cnt);
-        if (cnt > cycles_z80) cnt = cycles_z80;
-        Pico.m.z80Run |= 2;
-        z80CycleAim+=cnt;
-      }
-      total_z80+=z80_run(z80CycleAim-total_z80);
-    }
-  }
-
-  // draw a frame just after vblank in alternative render mode
-  if(!PicoSkipFrame && (PicoOpt&0x10))
-    PicoFrameFull();
 
-  return 0;
-}
+#include "PicoFrameHints.c"
 
-// helper z80 runner
+// helper z80 runner. Runs only if z80 is enabled at this point
+// (z80WriteBusReq will handle the rest)
 static void PicoRunZ80Simple(int line_from, int line_to)
 {
-  int line_from_r=line_from, line_to_r=line_to, line = line_from;
+  int line_from_r=line_from, line_to_r=line_to, line=0;
   int line_sample = Pico.m.pal ? 68 : 93;
-  extern const unsigned short vcounts[];
 
-  if(!(PicoOpt&4) || Pico.m.z80Run == 0) { line_from_r = line_to_r; line_to_r = 0; }
-
-  if(z80startCycle != 0) {
-    line_from_r = vcounts[z80startCycle>>8]+1;
-    z80startCycle = 0;
-  }
-  if(z80stopCycle != 0) {
-    line_to_r = vcounts[z80stopCycle>>8]+1;
-    z80stopCycle = 0;
+  if (!(PicoOpt&4) || Pico.m.z80Run == 0) line_to_r = 0;
+  else {
+    extern const unsigned short vcounts[];
+    if (z80startCycle) {
+      line = vcounts[z80startCycle>>8];
+      if (line > line_from)
+        line_from_r = line;
+    }
+    z80startCycle = SekCyclesDone();
   }
 
-  if(PicoOpt&1) {
+  if (PicoOpt&1) {
     // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers
-    for(; line < line_to; line++) {
+    for (line = line_from; line < line_to; line++) {
       sound_timers_and_dac(line);
-      if((line == 224 || line == line_sample) && PsndOut) getSamples(line);
-      if(line == 32 && PsndOut) emustatus &= ~1;
-      if(line >= line_from_r && line < line_to_r)
+      if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);
+      if (line == 32 && PsndOut) emustatus &= ~1;
+      if (line >= line_from_r && line < line_to_r)
         z80_run(228);
     }
-  } else if(line_to_r-line_from_r > 0) {
+  } else if (line_to_r-line_from_r > 0) {
     z80_run(228*(line_to_r-line_from_r));
     // samples will be taken by caller
   }
@@ -494,42 +315,44 @@ static int PicoFrameSimple(void)
   int y=0,line=0,lines=0,lines_step=0,sects;
   int cycles_68k_vblock,cycles_68k_block;
 
-  // we don't emulate DMA timing in this mode
-  if (Pico.m.dma_bytes) {
-    Pico.m.dma_bytes=0;
-    Pico.video.status&=~2;
-  }
-
-  if (Pico.m.pal) {
-    // M68k cycles/frame: 152009.78
+  // split to 16 run calls for active scan, for vblank split to 2 (ntsc), 3 (pal 240), 4 (pal 224)
+  if (Pico.m.pal && (pv->reg[1]&8)) { // 240 lines
     if(pv->reg[1]&8) { // 240 lines
-      cycles_68k_block  = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 15 + 0.4); // 16 sects, 16*15=240, 7308
-      cycles_68k_vblock = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 24 + 0.4); // 3 sects, 3*24=72, 35163?
+      cycles_68k_block  = 7329;  // (488*240+148)/16.0, -4
+      cycles_68k_vblock = 11640; // (72*488-148-68)/3.0, 0
       lines_step = 15;
     } else {
-      cycles_68k_block  = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 14 + 0.4); // 16*14=224
-      cycles_68k_vblock = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 22 + 0.4); // 4 sects, 4*22=88
+      cycles_68k_block  = 6841;  // (488*224+148)/16.0, -4
+      cycles_68k_vblock = 10682; // (88*488-148-68)/4.0, 0
       lines_step = 14;
     }
   } else {
     // M68k cycles/frame: 127840.71
-    cycles_68k_block  = (int) ((double) OSC_NTSC /  7 / 60 / 262 * 14 + 0.4); // 16*14=224, 6831
-    cycles_68k_vblock = (int) ((double) OSC_NTSC /  7 / 60 / 262 * 19 + 0.4); // 2 sects, 2*19=38, 18544
+    cycles_68k_block  = 6841; // (488*224+148)/16.0, -4
+    cycles_68k_vblock = 9164; // (38*488-148-68)/2.0, 0
     lines_step = 14;
   }
 
+  // we don't emulate DMA timing in this mode
+  if (Pico.m.dma_xfers) {
+    Pico.m.dma_xfers=0;
+    Pico.video.status&=~2;
+  }
+
+  // VDP FIFO too
+  pv->lwrite_cnt = 0;
+  Pico.video.status|=0x200;
+
   Pico.m.scanline=-1;
+  z80startCycle=0;
 
   SekCyclesReset();
 
-  if(PicoOpt&4)
-    z80_resetCycles();
-
   // 6 button pad: let's just say it timed out now
   Pico.m.padTHPhase[0]=Pico.m.padTHPhase[1]=0;
 
   // ---- Active Scan ----
-  pv->status&=~88; // clear V-Int, come out of vblank
+  pv->status&=~0x88; // clear V-Int, come out of vblank
 
   // Run in sections:
   for(sects=16; sects; sects--)
@@ -537,7 +360,7 @@ static int PicoFrameSimple(void)
     if (CheckIdle()) break;
 
     lines += lines_step;
-    SekRun(cycles_68k_block);
+    SekRunM68k(cycles_68k_block);
 
     PicoRunZ80Simple(line, lines);
     line=lines;
@@ -547,27 +370,29 @@ static int PicoFrameSimple(void)
   if(sects) {
     int c = sects*cycles_68k_block;
 
-    lines += sects*lines_step;
-    PicoRunZ80Simple(line, lines);
-    // this is for approriate line counter, etc
+    // this "run" is for approriate line counter, etc
     SekCycleCnt += c;
     SekCycleAim += c;
+
+    lines += sects*lines_step;
+    PicoRunZ80Simple(line, lines);
   }
 
   // here we render sound if ym2612 is disabled
-  if(!(PicoOpt&1) && PsndOut) {
+  if (!(PicoOpt&1) && PsndOut) {
     int len = sound_render(0, PsndLen);
-    if(PicoWriteSound) PicoWriteSound(len);
+    if (PicoWriteSound) PicoWriteSound(len);
     // clear sound buffer
     sound_clear();
   }
 
   // render screen
-  if(!PicoSkipFrame) {
-    if(!(PicoOpt&0x10))
+  if (!PicoSkipFrame)
+  {
+    if (!(PicoOpt&0x10))
       // Draw the screen
 #if CAN_HANDLE_240_LINES
-      if(pv->reg[1]&8) {
+      if (pv->reg[1]&8) {
         for (y=0;y<240;y++) PicoLine(y);
       } else {
         for (y=0;y<224;y++) PicoLine(y);
@@ -578,6 +403,11 @@ static int PicoFrameSimple(void)
     else PicoFrameFull();
   }
 
+  // a gap between flags set and vint
+  pv->pending_ints|=0x20;
+  pv->status|=8; // go into vblank
+  SekRunM68k(68+4);
+
   // ---- V-Blanking period ----
   // fix line counts
   if(Pico.m.pal) {
@@ -596,27 +426,24 @@ static int PicoFrameSimple(void)
     lines_step = 19;
   }
 
-  //dprintf("vint: @ %06x [%i]", SekPc, SekCycleCnt);
-  pv->pending_ints|=0x20;
   if (pv->reg[1]&0x20) SekInterrupt(6); // Set IRQ
-  pv->status|=0x88; // V-Int happened / go into vblank
-  if(Pico.m.z80Run && (PicoOpt&4)) // ?
+  if (Pico.m.z80Run && (PicoOpt&4))
     z80_int();
 
-  while(sects) {
+  while (sects) {
     lines += lines_step;
 
-    SekRun(cycles_68k_vblock);
+    SekRunM68k(cycles_68k_vblock);
 
     PicoRunZ80Simple(line, lines);
     line=lines;
 
     sects--;
-    if(sects && CheckIdle()) break;
+    if (sects && CheckIdle()) break;
   }
 
   // run Z80 for remaining sections
-  if(sects) {
+  if (sects) {
     lines += sects*lines_step;
     PicoRunZ80Simple(line, lines);
   }
@@ -653,36 +480,62 @@ int PicoFrame(void)
   return 0;
 }
 
+void PicoFrameDrawOnly(void)
+{
+  int y;
+  PicoFrameStart();
+  for (y=0;y<224;y++) PicoLine(y);
+}
+
 // callback to output message from emu
 void (*PicoMessage)(const char *msg)=NULL;
 
-#if defined(__DEBUG_PRINT) || defined(WIN32)
+#if 1 // defined(__DEBUG_PRINT)
 // tmp debug: dump some stuff
 #define bit(r, x) ((r>>x)&1)
 void z80_debug(char *dstr);
-char *debugString()
+char *debugString(void)
 {
 #if 1
   static char dstr[1024];
-  unsigned char *reg=Pico.video.reg, r;
-
-  // dump some info
-  sprintf(dstr, "mode set 1: %02x\n", (r=reg[0]));
-  sprintf(dstr, "%sdisplay_disable: %i, M3: %i, palette: %i, ?, hints: %i\n\n", dstr, bit(r,0), bit(r,1), bit(r,2), bit(r,4));
-  sprintf(dstr, "%smode set 2: %02x\n",  dstr,  (r=reg[1]));
-  sprintf(dstr, "%sSMS/genesis: %i, pal: %i, dma: %i, vints: %i, disp: %i, TMS9918: %i\n\n",dstr, bit(r,2), bit(r,3), bit(r,4), bit(r,5), bit(r,6), bit(r,7));
-  sprintf(dstr, "%smode set 3: %02x\n",  dstr,  (r=reg[0xB]));
-  sprintf(dstr, "%sLSCR: %i, HSCR: %i, 2cell vscroll: %i, IE2: %i\n\n", dstr, bit(r,0), bit(r,1), bit(r,2), bit(r,3));
-  sprintf(dstr, "%smode set 4: %02x\n",  dstr,  (r=reg[0xC]));
-  sprintf(dstr, "%sinterlace: %i%i; cells: %i; shadow: %i\n\n", dstr, bit(r,2), bit(r,1), (r&0x80) ? 40 : 32,  bit(r,3));
-  sprintf(dstr, "%sscroll size: w: %i; h: %i\n\n",  dstr, reg[0x10]&3, (reg[0x10]&0x30)>>4);
-  sprintf(dstr, "%sSRAM: det: %i; eeprom: %i\n",  dstr, bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2));
-  sprintf(dstr, "%sCPU state: PC: %06x cycles: %i\n", dstr, SekPc, SekCyclesDoneT());
-#ifdef EMU_C68K
-  for(r=0; r < 8; r++)
-    sprintf(dstr, "%sd%i=%08x, a%i=%08x\n", dstr, r, PicoCpu.d[r], r, PicoCpu.a[r]);
+  struct PicoVideo *pv=&Pico.video;
+  unsigned char *reg=pv->reg, r;
+  char *dstrp;
+
+  dstrp = dstr;
+  sprintf(dstrp, "mode set 1: %02x\n", (r=reg[0])); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "display_disable: %i, M3: %i, palette: %i, ?, hints: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,4));
+  dstrp+=strlen(dstrp);
+  sprintf(dstrp, "mode set 2: %02x\n", (r=reg[1])); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "SMS/gen: %i, pal: %i, dma: %i, vints: %i, disp: %i, TMS: %i\n", bit(r,2), bit(r,3), bit(r,4),
+  	bit(r,5), bit(r,6), bit(r,7)); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "mode set 3: %02x\n", (r=reg[0xB])); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "LSCR: %i, HSCR: %i, 2cell vscroll: %i, IE2: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,3)); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "mode set 4: %02x\n", (r=reg[0xC])); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "interlace: %i%i, cells: %i, shadow: %i\n", bit(r,2), bit(r,1), (r&0x80) ? 40 : 32,  bit(r,3));
+  dstrp+=strlen(dstrp);
+  sprintf(dstrp, "scroll size: w: %i, h: %i  SRAM: %i; eeprom: %i (%i)\n", reg[0x10]&3, (reg[0x10]&0x30)>>4,
+  	bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2), SRam.eeprom_type); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status);
+  dstrp+=strlen(dstrp);
+#if defined(EMU_C68K)
+  sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpuCM68k.state_flags, SekCyclesDoneT());
+  dstrp+=strlen(dstrp);
+  sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpuCM68k.d[0], PicoCpuCM68k.a[0], PicoCpuCM68k.osp, PicoCpuCM68k.irq); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "d1=%08x, a1=%08x,  sr=%04x\n", PicoCpuCM68k.d[1], PicoCpuCM68k.a[1], CycloneGetSr(&PicoCpuCM68k)); dstrp+=strlen(dstrp);
+  for(r=2; r < 8; r++) {
+    sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpuCM68k.d[r], r, PicoCpuCM68k.a[r]); dstrp+=strlen(dstrp);
+  }
+#elif defined(EMU_M68K)
+  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuMM68k.int_level>>8); dstrp+=strlen(dstrp);
+#elif defined(EMU_F68K)
+  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuFM68k.interrupts[0]); dstrp+=strlen(dstrp);
 #endif
-  z80_debug(dstr);
+  sprintf(dstrp, "z80Run: %i, pal: %i, frame#: %i\n", Pico.m.z80Run, Pico.m.pal, Pico.m.frame_count); dstrp+=strlen(dstrp);
+  z80_debug(dstrp); dstrp+=strlen(dstrp);
+  if (strlen(dstr) > sizeof(dstr))
+    printf("warning: debug buffer overflow (%i/%i)\n", strlen(dstr), sizeof(dstr));
 
 #else
   struct PicoVideo *pvid=&Pico.video;
@@ -713,7 +566,7 @@ char *debugString()
     code2 = sprite[1];
     sx = (code2>>16)&0x1ff;
 
-    dprintf("#%02i x: %03i y: %03i %ix%i", u, sx, sy, ((code>>26)&3)+1, height);
+    printf("#%02i x: %03i y: %03i %ix%i\n", u, sx, sy, ((code>>26)&3)+1, height);
 
     link=(code>>16)&0x7f;
     if(!link) break; // End of sprites