X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=b5e4e28e6ba6260b8b023593e4cf211318b0d0c5;hb=5ed2a20eaa264c72c1375943dd153c8c05403504;hp=f821cf417fc169741fcaad22db482341411bd7b5;hpb=b837b69b3fcff1737431c8be1c78d1cfd64003a6;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index f821cf4..b5e4e28 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -1,103 +1,99 @@
-// This is part of Pico Library
+// PicoDrive
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006-2008 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
 
 
 #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 PicoOpt = 0;
+int PicoSkipFrame = 0; // skip rendering frame?
+int emustatus = 0;     // rapid_ym2612, multi_ym_updates
+int PicoPad[2];        // Joypads, format is SACB RLDU
+int PicoPadInt[2];     // internal copy
+int PicoAHW = 0;       // active addon hardware: scd_active, 32x_active, svp_active, pico_active
 int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
-int emustatus = 0;
-void (*PicoWriteSound)(void) = 0; // called once per frame at the best time to send sound buffer (PsndOut) to hardware
+int PicoAutoRgnOrder = 0;
+struct PicoSRAM SRam = {0,};
 
-struct PicoSRAM SRam;
-int z80startCycle = 0, z80stopCycle = 0; // in 68k cycles
-//int z80ExtraCycles = 0;
-int PicoPad[2];  // Joypads, format is SACB RLDU
-int PicoMCD = 0; // mega CD status: scd_started, reset_pending
+void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
+void (*PicoResetHook)(void) = NULL;
+void (*PicoLineHook)(void) = NULL;
 
 // to be called once on emu init
-int PicoInit(void)
+void PicoInit(void)
 {
   // Blank space for state:
   memset(&Pico,0,sizeof(Pico));
   memset(&PicoPad,0,sizeof(PicoPad));
+  memset(&PicoPadInt,0,sizeof(PicoPadInt));
 
   // Init CPUs:
   SekInit();
   z80_init(); // init even if we aren't going to use it
 
   PicoInitMCD();
+  PicoSVPInit();
 
-  // notaz: sram
   SRam.data=0;
-  SRam.resize=1;
-
-  return 0;
 }
 
 // to be called once on emu exit
 void PicoExit(void)
 {
-  PicoExitMCD();
+  if (PicoAHW & PAHW_MCD)
+    PicoExitMCD();
   z80_exit();
 
-  // notaz: sram
-  if(SRam.data) free(SRam.data); SRam.data=0;
+  if (SRam.data) free(SRam.data); SRam.data=0;
 }
 
-int PicoReset(int hard)
+void PicoPower(void)
 {
-  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;
+  Pico.m.frame_count = 0;
 
-  // setup correct memory map
-  if (PicoMCD & 1)
-       PicoMemSetupCD();
-  else PicoMemSetup();
-  PicoMemReset();
-  SekReset();
-  SekCycleCntT=0;
-  z80_reset();
+  // clear all memory of the emulated machine
+  memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
 
-  // reset VDP state, VRAM and PicoMisc
-  //memset(&Pico.video,0,sizeof(Pico.video));
-  //memset(&Pico.vram,0,sizeof(Pico.vram));
+  memset(&Pico.video,0,sizeof(Pico.video));
   memset(&Pico.m,0,sizeof(Pico.m));
-  Pico.video.pending_ints=0;
-  emustatus = 0;
 
-  if(hard) {
-    // clear all memory of the emulated machine
-    memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
-  }
+  Pico.video.pending_ints=0;
+  z80_reset();
 
   // default VDP register values (based on Fusion)
   Pico.video.reg[0] = Pico.video.reg[1] = 0x04;
   Pico.video.reg[0xc] = 0x81;
   Pico.video.reg[0xf] = 0x02;
-  Pico.m.dirtyPal = 1;
 
-  if(PicoRegionOverride)
+  if (PicoAHW & PAHW_MCD)
+    PicoPowerMCD();
+
+  Pico.m.sram_reg=sram_reg;
+  PicoReset();
+}
+
+PICO_INTERNAL void PicoDetectRegion(void)
+{
+  int support=0, hw=0, i;
+  unsigned char pal=0;
+
+  if (PicoRegionOverride)
   {
     support = PicoRegionOverride;
   }
   else
   {
     // Read cartridge region data:
-    region=PicoRead32(0x1f0);
+    int region=PicoRead32(0x1f0);
 
     for (i=0;i<4;i++)
     {
@@ -106,9 +102,12 @@ int PicoReset(int hard)
       c=region>>(i<<3); c&=0xff;
       if (c<=' ') continue;
 
-           if (c=='J') support|=1;
-      else if (c=='U') support|=4;
-      else if (c=='E') support|=8;
+           if (c=='J')  support|=1;
+      else if (c=='U')  support|=4;
+      else if (c=='E')  support|=8;
+      else if (c=='j') {support|=1; break; }
+      else if (c=='u') {support|=4; break; }
+      else if (c=='e') {support|=8; break; }
       else
       {
         // New style code:
@@ -119,6 +118,13 @@ int PicoReset(int hard)
     }
   }
 
+  // auto detection order override
+  if (PicoAutoRgnOrder) {
+         if (((PicoAutoRgnOrder>>0)&0xf) & support) support = (PicoAutoRgnOrder>>0)&0xf;
+    else if (((PicoAutoRgnOrder>>4)&0xf) & support) support = (PicoAutoRgnOrder>>4)&0xf;
+    else if (((PicoAutoRgnOrder>>8)&0xf) & support) support = (PicoAutoRgnOrder>>8)&0xf;
+  }
+
   // Try to pick the best hardware value for English/50hz:
        if (support&8) { hw=0xc0; pal=1; } // Europe
   else if (support&4)   hw=0x80;          // USA
@@ -128,586 +134,232 @@ int PicoReset(int hard)
 
   Pico.m.hardware=(unsigned char)(hw|0x20); // No disk attached
   Pico.m.pal=pal;
-  Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal
+}
 
-  sound_reset(); // pal must be known here
+int PicoReset(void)
+{
+  unsigned char sram_reg=Pico.m.sram_reg; // must be preserved
 
-  if (PicoMCD & 1) {
-    PicoResetMCD(hard);
-    SRam.data = 0;
-    return 0;
-  }
+  if (Pico.romsize<=0) return 1;
 
+  /* must call now, so that banking is reset, and correct vectors get fetched */
+  if (PicoResetHook) PicoResetHook();
 
-  // 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;
-    }
+  PicoMemReset();
+  SekReset();
+  memset(&PicoPadInt,0,sizeof(PicoPadInt));
+  // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
+  SekSetRealTAS(PicoAHW & PAHW_MCD);
+  SekCycleCntT=0;
 
-    // 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 (PicoAHW & PAHW_MCD)
+    // needed for MCD to reset properly, probably some bug hides behind this..
+    memset(Pico.ioports,0,sizeof(Pico.ioports));
+  emustatus = 0;
 
-    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);
+  Pico.m.dirtyPal = 1;
+
+  Pico.m.z80_bank68k = 0;
+  memset(Pico.zram, 0, sizeof(Pico.zram)); // ??
+
+  PicoDetectRegion();
+  Pico.video.status = 0x3428 | Pico.m.pal; // 'always set' bits | vblank | collision | pal
+
+  PsndReset(); // pal must be known here
+
+  // create an empty "dma" to cause 68k exec start at random frame location
+  if (Pico.m.dma_xfers == 0 && !(PicoOpt&POPT_DIS_VDP_FIFO))
+    Pico.m.dma_xfers = rand() & 0x1fff;
+
+  SekFinishIdleDet();
+
+  if (PicoAHW & PAHW_MCD) {
+    PicoResetMCD();
+    return 0;
   }
 
-  Pico.m.sram_reg = SRam.reg_back; // restore sram_reg
-  SRam.changed = 0;
+  // reinit, so that checksum checks pass
+  if (!(PicoOpt & POPT_DIS_IDLE_DET))
+    SekInitIdleDet();
+
+  // 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;
+
+  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[] = {
-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  // ...
+
+// 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)
+// 96 is VR hack
+static const int dma_timings[] = {
+  96,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+  102, 205, 204, 102, // vblank: 40cell:
+  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,
-(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
+static const int dma_bsycles[] = {
+  (488<<8)/96,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
+  (488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,
+  (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);
-  if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
-  //dprintf("cyc_do: %i", cyc_do);
-#if   defined(EMU_C68K) && defined(EMU_M68K)
-  // this means we do run-compare Cyclone vs Musashi
-  SekCycleCnt+=CM_compareRun(cyc_do);
+  if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
+#if defined(EMU_CORE_DEBUG)
+  // this means we do run-compare
+  SekCycleCnt+=CM_compareRun(cyc_do, 0);
 #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+=fm68k_emulate(cyc_do+1, 0, 0);
 #endif
 }
 
-static __inline void SekStep(void)
-{
-  // this is required for timing sensitive stuff to work
-  int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1;
-#if   defined(EMU_C68K) && defined(EMU_M68K)
-  // 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;
-#elif defined(EMU_M68K)
-  SekCycleCnt+=m68k_execute(1);
-#endif
-  SekCycleAim=realaim;
-}
-
-static int CheckIdle(void)
-{
-#if 1
-  unsigned char state[0x88];
-
-  memset(state,0,sizeof(state));
-
-  // 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
-
-  return 0;
-}
 
 // to be called on 224 or line_sample scanlines only
 static __inline void getSamples(int y)
 {
+#if SIMPLE_WRITE_SOUND
+  if (y != 224) return;
+  PsndRender(0, PsndLen);
+  if (PicoWriteSound) PicoWriteSound(PsndLen);
+  PsndClear();
+#else
+  static int curr_pos = 0;
+
   if(y == 224) {
-    //dprintf("sta%i: %i [%i]", (emustatus & 2), emustatus, y);
     if(emustatus & 2)
-        sound_render(PsndLen/2, PsndLen-PsndLen/2);
-    else sound_render(0, PsndLen);
+         curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);
+    else curr_pos  = PsndRender(0, PsndLen);
     if (emustatus&1) emustatus|=2; else emustatus&=~2;
-    if (PicoWriteSound) PicoWriteSound();
+    if (PicoWriteSound) PicoWriteSound(curr_pos);
     // clear sound buffer
-    memset(PsndOut, 0, (PicoOpt & 8) ? (PsndLen<<2) : (PsndLen<<1));
+    PsndClear();
   }
   else if(emustatus & 3) {
     emustatus|= 2;
     emustatus&=~1;
-    sound_render(0, PsndLen/2);
-  }
-}
-
-//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;
+    curr_pos = PsndRender(0, PsndLen/2);
   }
-
-  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) SekCycleCnt+=CheckDMA();
-    SekRun(cycles_68k);
-    if((PicoOpt&4) && Pico.m.z80Run) {
-      Pico.m.z80Run|=2;
-      z80CycleAim+=cycles_z80;
-      total_z80+=z80_run(z80CycleAim-total_z80);
-    }
-  }
-
-  // draw a frame just after vblank in alternative render mode
-  if(!PicoSkipFrame && (PicoOpt&0x10))
-    PicoFrameFull();
-
-  return 0;
 }
 
-// helper z80 runner
-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_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; }
+#include "PicoFrameHints.c"
 
-  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&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++) {
-      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)
-        z80_run(228);
-    }
-  } else if(line_to_r-line_from_r > 0) {
-    z80_run(228*(line_to_r-line_from_r));
-    // samples will be taken by caller
-  }
-}
+int z80stopCycle;
+int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */
+int z80_cycle_aim;
+int z80_scanline;
+int z80_scanline_cycles;  /* cycles done until z80_scanline */
 
-// Simple frame without H-Ints
-static int PicoFrameSimple(void)
+/* sync z80 to 68k */
+PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
 {
-  struct PicoVideo *pv=&Pico.video;
-  int y=0,line=0,lines=0,lines_step=0,sects;
-  int cycles_68k_vblock,cycles_68k_block;
-
-  if(Pico.m.pal) {
-    // M68k cycles/frame: 152009.78
-    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?
-      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
-      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
-    lines_step = 14;
-  }
+  int cnt;
+  z80_cycle_aim = cycles_68k_to_z80(m68k_cycles_done);
+  cnt = z80_cycle_aim - z80_cycle_cnt;
 
-  Pico.m.scanline=-1;
+  elprintf(EL_BUSREQ, "z80 sync %i (%i|%i -> %i|%i)", cnt, z80_cycle_cnt, z80_cycle_cnt / 228,
+    z80_cycle_aim, z80_cycle_aim / 228);
 
-  SekCyclesReset();
-
-  if(PicoOpt&4)
-    z80_resetCycles();
+  if (cnt > 0)
+    z80_cycle_cnt += z80_run(cnt);
+}
 
-  // 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
+void PicoFrame(void)
+{
+  Pico.m.frame_count++;
 
-  // Run in sections:
-  for(sects=16; sects; sects--)
+#if 0
+  if ((Pico.m.frame_count & 0x3f) == 0)
   {
-    if (CheckIdle()) break;
-
-    lines += lines_step;
-    SekRun(cycles_68k_block);
-
-    PicoRunZ80Simple(line, lines);
-    line=lines;
-  }
-
-  // run Z80 for remaining sections
-  if(sects) {
-    int c = sects*cycles_68k_block;
-
-    lines += sects*lines_step;
-    PicoRunZ80Simple(line, lines);
-    // this is for approriate line counter, etc
-    SekCycleCnt += c;
-    SekCycleAim += c;
-  }
-
-  // here we render sound if ym2612 is disabled
-  if(!(PicoOpt&1) && PsndOut) {
-    sound_render(0, PsndLen);
-    if(PicoWriteSound) PicoWriteSound();
-    // clear sound buffer
-    memset(PsndOut, 0, (PicoOpt & 8) ? (PsndLen<<2) : (PsndLen<<1));
-  }
-
-  // render screen
-  if(!PicoSkipFrame) {
-    if(!(PicoOpt&0x10))
-      // Draw the screen
-#if CAN_HANDLE_240_LINES
-      if(pv->reg[1]&8) {
-        for (y=0;y<240;y++) PicoLine(y);
-      } else {
-        for (y=0;y<224;y++) PicoLine(y);
+    extern int idlehit_addrs[], idlehit_counts[];
+    int i;
+    printf("--\n");
+    for (i = 0; i < 128 && idlehit_addrs[i] != 0; i++) {
+      if (idlehit_counts[i] != 0) {
+        printf("%06x %i %i\n", idlehit_addrs[i], idlehit_counts[i],  idlehit_counts[i] >> 6);
+        idlehit_counts[i] = 0;
       }
-#else
-      for (y=0;y<224;y++) PicoLine(y);
-#endif
-    else PicoFrameFull();
-  }
-
-  // ---- V-Blanking period ----
-  // fix line counts
-  if(Pico.m.pal) {
-    if(pv->reg[1]&8) { // 240 lines
-      lines = line = 240;
-      sects = 3;
-      lines_step = 24;
-    } else {
-      lines = line = 224;
-      sects = 4;
-      lines_step = 22;
     }
-  } else {
-    lines = line = 224;
-    sects = 2;
-    lines_step = 19;
   }
+#endif
 
-  //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)) // ?
-    z80_int();
-
-  while(sects) {
-    lines += lines_step;
-
-    SekRun(cycles_68k_vblock);
-
-    PicoRunZ80Simple(line, lines);
-    line=lines;
-
-    sects--;
-    if(sects && CheckIdle()) break;
-  }
-
-  // run Z80 for remaining sections
-  if(sects) {
-    lines += sects*lines_step;
-    PicoRunZ80Simple(line, lines);
-  }
-
-  return 0;
-}
-
-int PicoFrame(void)
-{
-  int acc;
-
-  Pico.m.frame_count++;
-
-  if (PicoMCD & 1) {
+  if (PicoAHW & PAHW_MCD) {
     PicoFrameMCD();
-    return 0;
+    return;
   }
 
-  // be accurate if we are asked for this
-  if(PicoOpt&0x40) acc=1;
-  // don't be accurate in alternative render mode, as hint effects will not be rendered anyway
-  else if(PicoOpt&0x10) acc = 0;
-  else acc=Pico.video.reg[0]&0x10; // be accurate if hints are used
-
   //if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode
 
-  if(!(PicoOpt&0x10))
+  if (!(PicoOpt&POPT_ALT_RENDERER))
     PicoFrameStart();
 
-  if(acc)
-       PicoFrameHints();
-  else PicoFrameSimple();
-
-  return 0;
+  PicoFrameHints();
 }
 
-static int DefaultCram(int cram)
+void PicoFrameDrawOnly(void)
 {
-  int high=0x0841;
-  // Convert 0000bbbb ggggrrrr
-  // to      rrrr1ggg g10bbbb1
-  high|=(cram&0x00f)<<12; // Red
-  high|=(cram&0x0f0)<< 3; // Green
-  high|=(cram&0xf00)>> 7; // Blue
-  return high;
+  PicoFrameStart();
+  PicoDrawSync(223, 0);
 }
 
-// Function to convert Megadrive Cram into a native colour:
-int (*PicoCram)(int cram)=DefaultCram;
-
-#if defined(__DEBUG_PRINT) || defined(WIN32)
-// tmp debug: dump some stuff
-#define bit(r, x) ((r>>x)&1)
-void z80_debug(char *dstr);
-char *debugString()
+void PicoGetInternal(pint_t which, pint_ret_t *r)
 {
-#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]);
-#endif
-  z80_debug(dstr);
-
-#else
-  struct PicoVideo *pvid=&Pico.video;
-  int table=0;
-  int i,u,n,link=0;
-  static char dstr[1024*8];
-  dstr[0] = 0;
-
-  table=pvid->reg[5]&0x7f;
-  if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode
-  table<<=8; // Get sprite table address/2
-
-  for (i=u=n=0; u < 80 && n < 20; u++)
+  switch (which)
   {
-    unsigned int *sprite;
-    int code, code2, sx, sy, height;
-
-    sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
-
-    // get sprite info
-    code = sprite[0];
-
-    // check if it is on this line
-    sy = (code&0x1ff);//-0x80;
-    height = ((code>>24)&3)+1;
-
-    // masking sprite?
-    code2 = sprite[1];
-    sx = (code2>>16)&0x1ff;
-
-    dprintf("#%02i x: %03i y: %03i %ix%i", u, sx, sy, ((code>>26)&3)+1, height);
-
-    link=(code>>16)&0x7f;
-    if(!link) break; // End of sprites
+    case PI_ROM:         r->vptr = Pico.rom; break;
+    case PI_ISPAL:       r->vint = Pico.m.pal; break;
+    case PI_IS40_CELL:   r->vint = Pico.video.reg[12]&1; break;
+    case PI_IS240_LINES: r->vint = Pico.m.pal && (Pico.video.reg[1]&8); break;
   }
-#endif
+}
 
-#if 0
-  {
-    FILE *f = fopen("zram", "wb");
-    fwrite(Pico.zram, 1, 0x2000, f);
-    fclose(f);
-  }
-#endif
+// callback to output message from emu
+void (*PicoMessage)(const char *msg)=NULL;
 
-  return dstr;
-}
-#endif