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

diff --git a/Pico/Pico.c b/Pico/Pico.c
index ce3e340..7978fed 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -17,7 +17,9 @@ 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; // 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
+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;
 
 struct PicoSRAM SRam = {0,};
 int z80startCycle, z80stopCycle; // in 68k cycles
@@ -36,6 +38,7 @@ int PicoInit(void)
   z80_init(); // init even if we aren't going to use it
 
   PicoInitMCD();
+  PicoSVPInit();
 
   SRam.data=0;
 
@@ -49,10 +52,32 @@ void PicoExit(void)
     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)
+{
+  // 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 (PicoMCD & 1)
+    PicoPowerMCD();
+
+  PicoReset();
+}
+
+int PicoReset(void)
 {
   unsigned int region=0;
   int support=0,hw=0,i=0;
@@ -61,30 +86,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);
   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 (PicoMCD & 1)
+    // 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 +150,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&0x10000))
+    Pico.m.dma_xfers = rand() & 0x1fff;
 
   if (PicoMCD & 1) {
-    PicoResetMCD(hard);
+    PicoResetMCD();
     return 0;
   }
 
@@ -157,15 +176,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,12 +222,10 @@ 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)
   PicoCpuCM68k.cycles=cyc_do;
   CycloneRun(&PicoCpuCM68k);
@@ -215,7 +233,7 @@ static __inline void SekRunM68k(int cyc)
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=m68k_emulate(cyc_do);
+  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0);
 #endif
 }
 
@@ -223,9 +241,8 @@ 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)
   PicoCpuCM68k.cycles=1;
   CycloneRun(&PicoCpuCM68k);
@@ -233,19 +250,19 @@ static __inline void SekStep(void)
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(1);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=m68k_emulate(1);
+  SekCycleCnt+=fm68k_emulate(1, 0);
 #endif
   SekCycleAim=realaim;
 }
 
 static int CheckIdle(void)
 {
-  int i, state[0x22];
+  int i, state[0x24];
 
   // See if the state is the same after 2 steps:
-  SekState(state); SekStep(); SekStep(); SekState(state+0x11);
-  for (i = 0x10; i >= 0; i--)
-    if (state[i] != state[i+0x11]) return 0;
+  SekState(state); SekStep(); SekStep(); SekState(state+0x12);
+  for (i = 0x11; i >= 0; i--)
+    if (state[i] != state[i+0x12]) return 0;
 
   return 1;
 }
@@ -254,22 +271,29 @@ static int CheckIdle(void)
 // 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);
+    curr_pos = PsndRender(0, PsndLen/2);
   }
+#endif
 }
 
 
@@ -296,14 +320,14 @@ static void PicoRunZ80Simple(int line_from, int line_to)
   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_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
   }
 }
@@ -316,7 +340,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
@@ -333,6 +357,10 @@ static int PicoFrameSimple(void)
     lines_step = 14;
   }
 
+  // a hack for VR, to get it running in fast mode
+  if (PicoRead16Hook == PicoSVPRead16)
+    Pico.ram[0xd864^1] = 0x1a;
+
   // we don't emulate DMA timing in this mode
   if (Pico.m.dma_xfers) {
     Pico.m.dma_xfers=0;
@@ -363,6 +391,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_block);
 
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(lines_step);
     line=lines;
   }
 
@@ -376,20 +405,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 (PicoRead16Hook == PicoSVPRead16) {
+    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))
+    {
       // Draw the screen
 #if CAN_HANDLE_240_LINES
       if (pv->reg[1]&8) {
@@ -400,7 +431,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&1) && PsndOut) {
+    int len = PsndRender(0, PsndLen);
+    if (PicoWriteSound) PicoWriteSound(len);
+    // clear sound buffer
+    PsndClear();
   }
 
   // a gap between flags set and vint
@@ -436,6 +479,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_vblock);
 
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(lines_step);
     line=lines;
 
     sects--;
@@ -446,6 +490,7 @@ static int PicoFrameSimple(void)
   if (sects) {
     lines += sects*lines_step;
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(sects*lines_step);
   }
 
   return 0;
@@ -487,6 +532,17 @@ 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;
 
@@ -573,14 +629,6 @@ char *debugString(void)
   }
 #endif
 
-#if 0
-  {
-    FILE *f = fopen("zram", "wb");
-    fwrite(Pico.zram, 1, 0x2000, f);
-    fclose(f);
-  }
-#endif
-
   return dstr;
 }
 #endif