core, more save state fixes

diff --git a/pico/memory.c b/pico/memory.c
index cba8c52..e59c1e4 100644 (file)
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -1383,11 +1383,9 @@ void ym2612_pack_state(void)
   if (Pico.t.ym2612_busy > 0)\r
     busy = cycles_z80_to_68k(Pico.t.ym2612_busy);\r
   if (Pico.t.timer_a_next_oflow != TIMER_NO_OFLOW)\r
-    tat = (int)((double)(Pico.t.timer_a_step - Pico.t.timer_a_next_oflow)\r
-          / (double)Pico.t.timer_a_step * tac * 65536);\r
+    tat = ((Pico.t.timer_a_step - Pico.t.timer_a_next_oflow) * ((1LL<<32)/TIMER_A_TICK_ZCYCLES+1))>>16;\r
   if (Pico.t.timer_b_next_oflow != TIMER_NO_OFLOW)\r
-    tbt = (int)((double)(Pico.t.timer_b_step - Pico.t.timer_b_next_oflow)\r
-          / (double)Pico.t.timer_b_step * tbc * 65536);\r
+    tbt = ((Pico.t.timer_b_step - Pico.t.timer_b_next_oflow) * ((1LL<<32)/TIMER_B_TICK_ZCYCLES+1))>>16;\r
   elprintf(EL_YMTIMER, "save: timer a %i/%i", tat >> 16, tac);\r
   elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc);\r
 \r
@@ -1440,14 +1438,14 @@ void ym2612_unpack_state(void)
   Pico.t.ym2612_busy = cycles_68k_to_z80(busy);\r
   tac = (1024 - ym2612.OPN.ST.TA) << 16;\r
   tbc = (256  - ym2612.OPN.ST.TB) << 16;\r
-  Pico.t.timer_a_step = TIMER_A_TICK_ZCYCLES * tac;\r
-  Pico.t.timer_a_step = TIMER_B_TICK_ZCYCLES * tbc;\r
+  Pico.t.timer_a_step = TIMER_A_TICK_ZCYCLES * (tac>>16);\r
+  Pico.t.timer_b_step = TIMER_B_TICK_ZCYCLES * (tbc>>16);\r
   if (ym2612.OPN.ST.mode & 1)\r
-    Pico.t.timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * Pico.t.timer_a_step);\r
+    Pico.t.timer_a_next_oflow = (1LL * (tac-tat) * TIMER_A_TICK_ZCYCLES)>>16;\r
   else\r
     Pico.t.timer_a_next_oflow = TIMER_NO_OFLOW;\r
   if (ym2612.OPN.ST.mode & 2)\r
-    Pico.t.timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * Pico.t.timer_b_step);\r
+    Pico.t.timer_b_next_oflow = (1LL * (tbc-tbt) * TIMER_B_TICK_ZCYCLES)>>16;\r
   else\r
     Pico.t.timer_b_next_oflow = TIMER_NO_OFLOW;\r
   elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, Pico.t.timer_a_next_oflow >> 8);\r
@@ -1476,7 +1474,7 @@ static void access_68k_bus(int delay) // bus delay as Q8
   Pico.t.z80_busdelay &= 0xff; // leftover cycle fraction\r
   // don't use SekCyclesBurn() here since the Z80 doesn't run in cycle lock to\r
   // the 68K. Count the stolen cycles to be accounted later in the 68k CPU runs\r
-  Pico.t.z80_buscycles += 8; // TODO <=8.4 for Rick 2, but >=8.9 for misc_test\r
+  Pico.t.z80_buscycles += 0x80; // TODO <=8.4 for Rick 2, but >=8.9 for misc_test\r
 }\r
 \r
 static unsigned char z80_md_vdp_read(unsigned short a)\r

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index ed00959..74f75eb 100644 (file)
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -50,7 +50,7 @@ static int SekSyncM68k(int once)
     // the Z80 CPU is stealing some bus cycles from the 68K main CPU when 
     // accessing the main bus. Account for these by shortening the time
     // the 68K CPU runs.
-    int z80_buscyc = Pico.t.z80_buscycles >> (~Pico.m.scanline & 1);
+    int z80_buscyc = (Pico.t.z80_buscycles >> 4+(~Pico.m.scanline & 1));
     // NB the Z80 isn't fast enough to steal more than half the bandwidth.
     // the fastest would be POP cc which takes 10+~3.3*2 z-cyc (~35 cyc) for a
     // 16 bit value, but 68k is only blocked for ~16 cyc for the 2 bus cycles.
@@ -58,7 +58,7 @@ static int SekSyncM68k(int once)
       z80_buscyc = cyc_do/2;
     SekExecM68k(cyc_do - z80_buscyc);
     Pico.t.m68c_cnt += z80_buscyc;
-    Pico.t.z80_buscycles -= z80_buscyc;
+    Pico.t.z80_buscycles -= z80_buscyc<<4;
     if (once) break;
   }
 
@@ -129,7 +129,7 @@ static void do_timing_hacks_start(struct PicoVideo *pv)
 
   SekCyclesBurn(cycles); // prolong cpu HOLD if necessary
   // XXX how to handle Z80 bus cycle stealing during DMA correctly?
-  if ((Pico.t.z80_buscycles -= cycles) < 0)
+  if ((Pico.t.z80_buscycles -= cycles<<4) < 0)
     Pico.t.z80_buscycles = 0;
   Pico.t.m68c_aim += Pico.m.scanline&1; // add 1 every 2 lines for 488.5 cycles
 }

diff --git a/pico/state.c b/pico/state.c
index 61e5597..8dc4881 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -628,6 +628,8 @@ out:
 static int state_load_gfx(void *file)\r
 {\r
   int ver, len, found = 0, to_find = 4;\r
+  u8 buff_vdp[0x200];\r
+  int len_vdp = 0;\r
   char buff[8];\r
 \r
   if (PicoIn.AHW & PAHW_32X)\r
@@ -653,6 +655,7 @@ static int state_load_gfx(void *file)
       case CHUNK_CRAM:  CHECKED_READ_BUFF(PicoMem.cram);  found++; break;\r
       case CHUNK_VSRAM: CHECKED_READ_BUFF(PicoMem.vsram); found++; break;\r
       case CHUNK_VIDEO: CHECKED_READ_BUFF(Pico.video); found++; break;\r
+      case CHUNK_VDP:   CHECKED_READ2((len_vdp = len), buff_vdp); break;\r
 \r
 #ifndef NO_32X\r
       case CHUNK_DRAM:\r
@@ -678,6 +681,7 @@ static int state_load_gfx(void *file)
         break;\r
     }\r
   }\r
+  PicoVideoLoad(buff_vdp, len_vdp);\r
 \r
 out:\r
 readend:\r
@@ -741,10 +745,10 @@ int PicoStateLoadGfx(const char *fname)
     areaRead(PicoMem.vsram, 1, sizeof(PicoMem.vsram), afile);\r
     areaSeek(afile, 0x221a0, SEEK_SET);\r
     areaRead(&Pico.video, 1, sizeof(Pico.video), afile);\r
+    PicoVideoCacheSAT(1);\r
   }\r
   areaClose(afile);\r
 \r
-  PicoVideoCacheSAT(1);\r
   Pico.est.rendstatus = -1;\r
   return 0;\r
 }\r
@@ -759,6 +763,8 @@ struct PicoTmp
 \r
   //struct PicoMisc m;\r
   struct PicoVideo video;\r
+  u8 vdp[0x200];\r
+  int vdp_len;\r
 \r
   struct {\r
     struct Pico32x p32x;\r
@@ -780,6 +786,7 @@ void *PicoTmpStateSave(void)
   memcpy(t->vsram, PicoMem.vsram, sizeof(PicoMem.vsram));\r
   memcpy(t->satcache, VdpSATCache, sizeof(VdpSATCache));\r
   memcpy(&t->video, &Pico.video, sizeof(Pico.video));\r
+  t->vdp_len = PicoVideoSave(t->vdp);\r
 \r
 #ifndef NO_32X\r
   if (PicoIn.AHW & PAHW_32X) {\r
@@ -804,7 +811,7 @@ void PicoTmpStateRestore(void *data)
   memcpy(VdpSATCache, t->satcache, sizeof(VdpSATCache));\r
   memcpy(&Pico.video, &t->video, sizeof(Pico.video));\r
   Pico.m.dirtyPal = 1;\r
-  PicoVideoCacheSAT(0);\r
+  PicoVideoLoad(t->vdp, t->vdp_len);\r
 \r
 #ifndef NO_32X\r
   if (PicoIn.AHW & PAHW_32X) {\r