X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=bf9df2686e91ce0ef91e2a0ce9d8c61d3587bcdc;hb=a4fa71d4da571b206789805e3a3a5a37bc6ae1f1;hp=6a065e67191ed5010427a6db984b5b237703dc2c;hpb=2446536be520914616403876d7e49621ac6f4b95;p=picodrive.git

diff --git a/pico/pico.c b/pico/pico.c
index 6a065e6..bf9df26 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -11,20 +11,17 @@
 #include "sound/ym2612.h"
 
 struct Pico Pico;
+struct PicoMem PicoMem;
 int PicoOpt;     
 int PicoSkipFrame;     // skip rendering frame?
 int PicoPad[2];        // Joypads, format is MXYZ SACB RLDU
 int PicoPadInt[2];     // internal copy
 int PicoAHW;           // active addon hardware: PAHW_*
+int PicoQuirks;        // game-specific quirks
 int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
 int PicoAutoRgnOrder;
 
-struct PicoSRAM SRam;
 int emustatus;         // rapid_ym2612, multi_ym_updates
-int scanlines_total;
-
-int p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
-int p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
 
 void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
 void (*PicoResetHook)(void) = NULL;
@@ -35,9 +32,15 @@ void PicoInit(void)
 {
   // Blank space for state:
   memset(&Pico,0,sizeof(Pico));
+  memset(&PicoMem,0,sizeof(PicoMem));
   memset(&PicoPad,0,sizeof(PicoPad));
   memset(&PicoPadInt,0,sizeof(PicoPadInt));
 
+  Pico.est.Pico = &Pico;
+  Pico.est.PicoMem_vram = PicoMem.vram;
+  Pico.est.PicoMem_cram = PicoMem.cram;
+  Pico.est.PicoOpt = &PicoOpt;
+
   // Init CPUs:
   SekInit();
   z80_init(); // init even if we aren't going to use it
@@ -45,6 +48,9 @@ void PicoInit(void)
   PicoInitMCD();
   PicoSVPInit();
   Pico32xInit();
+
+  PicoDrawInit();
+  PicoDraw2Init();
 }
 
 // to be called once on emu exit
@@ -55,16 +61,19 @@ void PicoExit(void)
   PicoCartUnload();
   z80_exit();
 
-  if (SRam.data)
-    free(SRam.data);
+  free(Pico.sv.data);
+  Pico.sv.data = NULL;
+  Pico.sv.start = Pico.sv.end = 0;
+  pevt_dump();
 }
 
 void PicoPower(void)
 {
   Pico.m.frame_count = 0;
+  Pico.t.m68c_cnt = Pico.t.m68c_aim = 0;
 
   // clear all memory of the emulated machine
-  memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);
+  memset(&PicoMem,0,sizeof(PicoMem));
 
   memset(&Pico.video,0,sizeof(Pico.video));
   memset(&Pico.m,0,sizeof(Pico.m));
@@ -72,6 +81,9 @@ void PicoPower(void)
   Pico.video.pending_ints=0;
   z80_reset();
 
+  // my MD1 VA6 console has this in IO
+  PicoMem.ioports[1] = PicoMem.ioports[2] = PicoMem.ioports[3] = 0xff;
+
   // default VDP register values (based on Fusion)
   Pico.video.reg[0] = Pico.video.reg[1] = 0x04;
   Pico.video.reg[0xc] = 0x81;
@@ -148,6 +160,10 @@ int PicoReset(void)
   if (Pico.romsize <= 0)
     return 1;
 
+#if defined(CPU_CMP_R) || defined(CPU_CMP_W) || defined(DRC_CMP)
+  PicoOpt |= POPT_DIS_VDP_FIFO|POPT_DIS_IDLE_DET;
+#endif
+
   /* must call now, so that banking is reset, and correct vectors get fetched */
   if (PicoResetHook)
     PicoResetHook();
@@ -161,19 +177,15 @@ int PicoReset(void)
   }
 
   SekReset();
+  // ..but do not reset SekCycle* to not desync with addons
+
   // 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;
-
-  if (PicoAHW & PAHW_MCD)
-    // needed for MCD to reset properly, probably some bug hides behind this..
-    memset(Pico.ioports,0,sizeof(Pico.ioports));
 
   Pico.m.dirtyPal = 1;
 
   Pico.m.z80_bank68k = 0;
   Pico.m.z80_reset = 1;
-  memset(Pico.zram, 0, sizeof(Pico.zram)); // ??
 
   PicoDetectRegion();
   Pico.video.status = 0x3428 | Pico.m.pal; // 'always set' bits | vblank | collision | pal
@@ -200,12 +212,12 @@ int PicoReset(void)
 
   // reset sram state; enable sram access by default if it doesn't overlap with ROM
   Pico.m.sram_reg = 0;
-  if ((SRam.flags & SRF_EEPROM) || Pico.romsize <= SRam.start)
+  if ((Pico.sv.flags & SRF_EEPROM) || Pico.romsize <= Pico.sv.start)
     Pico.m.sram_reg |= SRR_MAPPED;
 
-  if (SRam.flags & SRF_ENABLED)
-    elprintf(EL_STATUS, "sram: %06x - %06x; eeprom: %i", SRam.start, SRam.end,
-      !!(SRam.flags & SRF_EEPROM));
+  if (Pico.sv.flags & SRF_ENABLED)
+    elprintf(EL_STATUS, "sram: %06x - %06x; eeprom: %i", Pico.sv.start, Pico.sv.end,
+      !!(Pico.sv.flags & SRF_EEPROM));
 
   return 0;
 }
@@ -217,34 +229,27 @@ void PicoLoopPrepare(void)
     // force setting possibly changed..
     Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
 
-  // FIXME: PAL has 313 scanlines..
-  scanlines_total = Pico.m.pal ? 312 : 262;
-
   Pico.m.dirtyPal = 1;
   rendstatus_old = -1;
-
-  if (PicoAHW & PAHW_32X)
-    p32x_timers_recalc();
 }
 
-
-// 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
+// this table is wrong and should be removed
+// keeping it for now to compensate wrong timing elswhere, mainly for Outrunners
 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  // ...
+   83, 166,  83,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+  102, 204, 102, 102, // vblank: 40cell:
+    8,  16,   8,   8, // active: 32cell:
+   17,  18,   9,   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
+  (488<<8)/83,  (488<<8)/166, (488<<8)/83,  (488<<8)/83,
+  (488<<8)/102, (488<<8)/204, (488<<8)/102, (488<<8)/102,
+  (488<<8)/8,   (488<<8)/16,  (488<<8)/8,   (488<<8)/8,
+  (488<<8)/9,   (488<<8)/18,  (488<<8)/9,   (488<<8)/9
 };
 
+// grossly inaccurate.. FIXME FIXXXMEE
 PICO_INTERNAL int CheckDMA(void)
 {
   int burn = 0, xfers_can, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes
@@ -268,56 +273,32 @@ PICO_INTERNAL int CheckDMA(void)
     Pico.m.dma_xfers -= xfers_can;
   }
 
-  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);
+  elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%u]",
+    Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());
+  //dprintf("~aim: %i, cnt: %i", Pico.t.m68c_aim, Pico.t.m68c_cnt);
   return burn;
 }
 
-static __inline void SekRunM68k(int cyc)
-{
-  int cyc_do;
-  pprof_start(m68k);
-
-  SekCycleAim+=cyc;
-  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)
-  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
-
-  pprof_end(m68k);
-}
-
 #include "pico_cmn.c"
 
-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 */
-
 /* sync z80 to 68k */
-PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
+PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)
 {
+  int m68k_cnt;
   int cnt;
-  z80_cycle_aim = cycles_68k_to_z80(m68k_cycles_done);
-  cnt = z80_cycle_aim - z80_cycle_cnt;
+
+  m68k_cnt = m68k_cycles_done - Pico.t.m68c_frame_start;
+  Pico.t.z80c_aim = cycles_68k_to_z80(m68k_cnt);
+  cnt = Pico.t.z80c_aim - Pico.t.z80c_cnt;
 
   pprof_start(z80);
 
-  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);
+  elprintf(EL_BUSREQ, "z80 sync %i (%u|%u -> %u|%u)", cnt,
+    Pico.t.z80c_cnt, Pico.t.z80c_cnt * 15 / 7 / 488,
+    Pico.t.z80c_aim, Pico.t.z80c_aim * 15 / 7 / 488);
 
   if (cnt > 0)
-    z80_cycle_cnt += z80_run(cnt);
+    Pico.t.z80c_cnt += z80_run(cnt);
 
   pprof_end(z80);
 }
@@ -334,14 +315,13 @@ void PicoFrame(void)
     goto end;
   }
 
-  // TODO: MCD+32X
-  if (PicoAHW & PAHW_MCD) {
-    PicoFrameMCD();
+  if (PicoAHW & PAHW_32X) {
+    PicoFrame32x(); // also does MCD+32X
     goto end;
   }
 
-  if (PicoAHW & PAHW_32X) {
-    PicoFrame32x();
+  if (PicoAHW & PAHW_MCD) {
+    PicoFrameMCD();
     goto end;
   }