X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=7fa152ab9e00770d71e3c9bb466ad1bc17e2cf3d;hb=583ab72c0b42549235191fd4fad239074dd896af;hp=c6bf03e5e4c27cc61f95bad78d84aa30781a0aba;hpb=9a8ffeeeea54301c5289fd510aece552175ce13d;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index c6bf03e..7fa152a 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -12,17 +12,19 @@
 
 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 PicoAHW = 0;       // active addon hardware: scd_active, 32x_active, svp_active
 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; // 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 = {0,};
 int z80startCycle, z80stopCycle; // in 68k cycles
-int PicoPad[2];  // Joypads, format is SACB RLDU
-int PicoMCD = 0; // mega CD status: scd_started
+struct PicoSRAM SRam = {0,};
+
+void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
+void (*PicoResetHook)(void) = NULL;
+void (*PicoLineHook)(int count) = NULL;
 
 // to be called once on emu init
 int PicoInit(void)
@@ -36,6 +38,7 @@ int PicoInit(void)
   z80_init(); // init even if we aren't going to use it
 
   PicoInitMCD();
+  PicoSVPInit();
 
   SRam.data=0;
 
@@ -45,14 +48,39 @@ int PicoInit(void)
 // to be called once on emu exit
 void PicoExit(void)
 {
-  if (PicoMCD&1)
+  if (PicoAHW & PAHW_MCD)
     PicoExitMCD();
   z80_exit();
 
-  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 char sram_reg=Pico.m.sram_reg; // must be preserved
+
+  // clear all memory of the emulated machine
+  memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
+
+  memset(&Pico.video,0,sizeof(Pico.video));
+  memset(&Pico.m,0,sizeof(Pico.m));
+
+  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;
+
+  if (PicoAHW & PAHW_MCD)
+    PicoPowerMCD();
+
+  Pico.m.sram_reg=sram_reg;
+  PicoReset();
+}
+
+int PicoReset(void)
 {
   unsigned int region=0;
   int support=0,hw=0,i=0;
@@ -61,30 +89,20 @@ int PicoReset(int hard)
 
   if (Pico.romsize<=0) return 1;
 
+  /* must call now, so that banking is reset, and correct vectors get fetched */
+  if (PicoResetHook) PicoResetHook();
+
   PicoMemReset();
   SekReset();
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
-  SekSetRealTAS(PicoMCD & 1);
+  SekSetRealTAS(PicoAHW & PAHW_MCD);
   SekCycleCntT=0;
-  z80_reset();
 
-  // reset VDP state, VRAM and PicoMisc
-  //memset(&Pico.video,0,sizeof(Pico.video));
-  //memset(&Pico.vram,0,sizeof(Pico.vram));
-  memset(Pico.ioports,0,sizeof(Pico.ioports)); // needed for MCD to reset properly
-  memset(&Pico.m,0,sizeof(Pico.m));
-  Pico.video.pending_ints=0;
+  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(hard) {
-    // clear all memory of the emulated machine
-    memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
-  }
-
-  // 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)
@@ -135,12 +153,16 @@ 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
+  Pico.video.status = 0x3408 | pal; // 'always set' bits | vblank | pal
+
+  PsndReset(); // pal must be known here
 
-  sound_reset(); // 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;
 
-  if (PicoMCD & 1) {
-    PicoResetMCD(hard);
+  if (PicoAHW & PAHW_MCD) {
+    PicoResetMCD();
     return 0;
   }
 
@@ -157,15 +179,16 @@ int PicoReset(int hard)
 
 // 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[] = {
-83,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+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 const int dma_bsycles[] = {
-(488<<8)/82,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
+(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
@@ -202,22 +225,18 @@ static __inline void SekRunM68k(int cyc)
 {
   int cyc_do;
   SekCycleAim+=cyc;
-  //printf("aim: %i, cnt: %i\n", SekCycleAim, SekCycleCnt);
   if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
-  //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);
+#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);
 #endif
 }
 
@@ -225,203 +244,63 @@ 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);
+#if defined(EMU_CORE_DEBUG)
+  SekCycleCnt+=CM_compareRun(1, 0);
 #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+=fm68k_emulate(1, 0);
 #endif
   SekCycleAim=realaim;
 }
 
 static int CheckIdle(void)
 {
-#if 1
-  unsigned char state[0x88];
-
-  memset(state,0,sizeof(state));
+  int i, state[0x24];
 
   // 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); SekStep(); SekStep(); SekState(state+0x12);
+  for (i = 0x11; i >= 0; i--)
+    if (state[i] != state[i+0x12]) return 0;
 
-  SekState(state);
-  if(memcmp(state,oldstate,0x40)==0) return 1;
-  memcpy(oldstate, state, 0x40);
-#endif
-
-  return 0;
+  return 1;
 }
 
-void lprintf_al(const char *fmt, ...);
 
 // 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) {
     if(emustatus & 2)
-         curr_pos += sound_render(curr_pos, PsndLen-PsndLen/2);
-    else curr_pos  = 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(curr_pos);
     // clear sound buffer
-    sound_clear();
+    PsndClear();
   }
   else if(emustatus & 3) {
     emustatus|= 2;
     emustatus&=~1;
-    curr_pos = sound_render(0, PsndLen/2);
-  }
-}
-
-
-#if 1*0
-int vint_delay = 205/*68*/, as_delay = 18/*148*/;
-
-// 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);
-
-  //SekRun(as_delay);
-  SekRun(148);
-
-  for (y=0;y<lines;y++)
-  {
-    Pico.m.scanline=(short)y;
-
-    // VDP FIFO
-    pv->lwrite_cnt -= 12;
-    if (pv->lwrite_cnt <  0) pv->lwrite_cnt=0;
-    if (pv->lwrite_cnt == 0)
-      Pico.video.status|=0x200;
-
-    // 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) {
-        elprintf(EL_INTS, "hint: @ %06x [%i]", SekPc, SekCycleCnt);
-        SekInterrupt(4);
-      }
-      //dprintf("hint_routine: %x", (*(unsigned short*)(Pico.ram+0x0B84)<<16)|*(unsigned short*)(Pico.ram+0x0B86));
-    }
-
-    // V-Interrupt:
-    if (y == lines_vis)
-    {
-      pv->status|=0x08; // go into vblank
-      //pv->status|=0x80; // V-Int happened
-      //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(68); SekCycleAim-=68; // 128; ?
-        SekCycleAim-=148;
-//       SekRun(vint_delay); SekCycleAim-=vint_delay; // 128; ?
-//	SekCycleAim-=as_delay;
-      //}
-      pv->pending_ints|=0x20;
-      if(pv->reg[1]&0x20) {
-        elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
-        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_xfers) 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;
-}
-#else
 #include "PicoFrameHints.c"
-#endif
 
 // helper z80 runner. Runs only if z80 is enabled at this point
 // (z80WriteBusReq will handle the rest)
@@ -430,7 +309,7 @@ static void PicoRunZ80Simple(int line_from, int line_to)
   int line_from_r=line_from, line_to_r=line_to, line=0;
   int line_sample = Pico.m.pal ? 68 : 93;
 
-  if (!(PicoOpt&4) || Pico.m.z80Run == 0) line_to_r = 0;
+  if (!(PicoOpt&POPT_EN_Z80) || Pico.m.z80Run == 0) line_to_r = 0;
   else {
     extern const unsigned short vcounts[];
     if (z80startCycle) {
@@ -441,17 +320,17 @@ static void PicoRunZ80Simple(int line_from, int line_to)
     z80startCycle = SekCyclesDone();
   }
 
-  if (PicoOpt&1) {
+  if (PicoOpt&POPT_EN_FM) {
     // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers
     for (line = line_from; line < line_to; line++) {
-      sound_timers_and_dac(line);
+      Psnd_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);
+        z80_run_nr(228);
     }
   } else if (line_to_r-line_from_r > 0) {
-    z80_run(228*(line_to_r-line_from_r));
+    z80_run_nr(228*(line_to_r-line_from_r));
     // samples will be taken by caller
   }
 }
@@ -464,7 +343,7 @@ static int PicoFrameSimple(void)
   int cycles_68k_vblock,cycles_68k_block;
 
   // 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 (Pico.m.pal && (pv->reg[1]&8)) {
     if(pv->reg[1]&8) { // 240 lines
       cycles_68k_block  = 7329;  // (488*240+148)/16.0, -4
       cycles_68k_vblock = 11640; // (72*488-148-68)/3.0, 0
@@ -481,6 +360,10 @@ static int PicoFrameSimple(void)
     lines_step = 14;
   }
 
+  // a hack for VR, to get it running in fast mode
+  if (PicoAHW & PAHW_SVP)
+    Pico.ram[0xd864^1] = 0x1a;
+
   // we don't emulate DMA timing in this mode
   if (Pico.m.dma_xfers) {
     Pico.m.dma_xfers=0;
@@ -511,6 +394,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_block);
 
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(lines_step);
     line=lines;
   }
 
@@ -524,20 +408,22 @@ static int PicoFrameSimple(void)
 
     lines += sects*lines_step;
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(sects*lines_step);
   }
 
-  // here we render sound if ym2612 is disabled
-  if (!(PicoOpt&1) && PsndOut) {
-    int len = sound_render(0, PsndLen);
-    if (PicoWriteSound) PicoWriteSound(len);
-    // clear sound buffer
-    sound_clear();
+  // another hack for VR (it needs hints to work)
+  if (PicoAHW & PAHW_SVP) {
+    Pico.ram[0xd864^1] = 1;
+    pv->pending_ints|=0x10;
+    if (pv->reg[0]&0x10) SekInterrupt(4);
+    SekRunM68k(160);
   }
 
   // render screen
   if (!PicoSkipFrame)
   {
-    if (!(PicoOpt&0x10))
+    if (!(PicoOpt&POPT_ALT_RENDERER))
+    {
       // Draw the screen
 #if CAN_HANDLE_240_LINES
       if (pv->reg[1]&8) {
@@ -548,7 +434,19 @@ static int PicoFrameSimple(void)
 #else
       for (y=0;y<224;y++) PicoLine(y);
 #endif
+    }
     else PicoFrameFull();
+#ifdef DRAW_FINISH_FUNC
+    DRAW_FINISH_FUNC();
+#endif
+  }
+
+  // here we render sound if ym2612 is disabled
+  if (!(PicoOpt&POPT_EN_FM) && PsndOut) {
+    int len = PsndRender(0, PsndLen);
+    if (PicoWriteSound) PicoWriteSound(len);
+    // clear sound buffer
+    PsndClear();
   }
 
   // a gap between flags set and vint
@@ -575,15 +473,17 @@ static int PicoFrameSimple(void)
   }
 
   if (pv->reg[1]&0x20) SekInterrupt(6); // Set IRQ
-  if (Pico.m.z80Run && (PicoOpt&4))
+  if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))
     z80_int();
 
-  while (sects) {
+  while (sects)
+  {
     lines += lines_step;
 
     SekRunM68k(cycles_68k_vblock);
 
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(lines_step);
     line=lines;
 
     sects--;
@@ -594,6 +494,7 @@ static int PicoFrameSimple(void)
   if (sects) {
     lines += sects*lines_step;
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(sects*lines_step);
   }
 
   return 0;
@@ -605,23 +506,23 @@ int PicoFrame(void)
 
   Pico.m.frame_count++;
 
-  if (PicoMCD & 1) {
+  if (PicoAHW & PAHW_MCD) {
     PicoFrameMCD();
     return 0;
   }
 
   // be accurate if we are asked for this
-  if(PicoOpt&0x40) acc=1;
+  if (PicoOpt&POPT_ACC_TIMING) 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 if (PicoOpt&POPT_ALT_RENDERER) 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)
+  if (acc)
        PicoFrameHints();
   else PicoFrameSimple();
 
@@ -635,10 +536,21 @@ void PicoFrameDrawOnly(void)
   for (y=0;y<224;y++) PicoLine(y);
 }
 
+int PicoGetStat(pstat_t which)
+{
+  switch (which)
+  {
+    case PS_PAL:       return Pico.m.pal;
+    case PS_40_CELL:   return Pico.video.reg[12]&1;
+    case PS_240_LINES: return Pico.m.pal && (Pico.video.reg[1]&8);
+  }
+  return 0;
+}
+
 // callback to output message from emu
 void (*PicoMessage)(const char *msg)=NULL;
 
-#if defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__)
+#if 1 // defined(__DEBUG_PRINT)
 // tmp debug: dump some stuff
 #define bit(r, x) ((r>>x)&1)
 void z80_debug(char *dstr);
@@ -667,14 +579,18 @@ char *debugString(void)
   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);
-#ifdef EMU_C68K
-  sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpu.state_flags, SekCyclesDoneT());
+#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", PicoCpu.d[0], PicoCpu.a[0], PicoCpu.osp, PicoCpu.irq); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "d1=%08x, a1=%08x,  sr=%04x\n", PicoCpu.d[1], PicoCpu.a[1], CycloneGetSr(&PicoCpu)); 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, PicoCpu.d[r], r, PicoCpu.a[r]); dstrp+=strlen(dstrp);
+    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
   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);
@@ -717,14 +633,6 @@ char *debugString(void)
   }
 #endif
 
-#if 0
-  {
-    FILE *f = fopen("zram", "wb");
-    fwrite(Pico.zram, 1, 0x2000, f);
-    fclose(f);
-  }
-#endif
-
   return dstr;
 }
 #endif