added timer saving to savestates

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index fb6b99c..fe87ab9 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -720,14 +720,14 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)
 \r
   /* update timer a */\r
   if (mode_old & 1)\r
-    while (xcycles >= timer_a_next_oflow)\r
+    while (xcycles > timer_a_next_oflow)\r
       timer_a_next_oflow += timer_a_step;\r
 \r
   if ((mode_old ^ mode_new) & 1) // turning on/off\r
   {\r
     if (mode_old & 1) {\r
       timer_a_offset = timer_a_next_oflow - xcycles;\r
-      timer_a_next_oflow = 0x70000000;\r
+      timer_a_next_oflow = TIMER_NO_OFLOW;\r
     }\r
     else\r
       timer_a_next_oflow = xcycles + timer_a_offset;\r
@@ -737,14 +737,14 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)
 \r
   /* update timer b */\r
   if (mode_old & 2)\r
-    while (xcycles >= timer_b_next_oflow)\r
+    while (xcycles > timer_b_next_oflow)\r
       timer_b_next_oflow += timer_b_step;\r
 \r
   if ((mode_old ^ mode_new) & 2)\r
   {\r
     if (mode_old & 2) {\r
       timer_b_offset = timer_b_next_oflow - xcycles;\r
-      timer_b_next_oflow = 0x70000000;\r
+      timer_b_next_oflow = TIMER_NO_OFLOW;\r
     }\r
     else\r
       timer_b_next_oflow = xcycles + timer_b_offset;\r
@@ -798,8 +798,7 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             ym2612.OPN.ST.TA = TAnew;\r
             //ym2612.OPN.ST.TAC = (1024-TAnew)*18;\r
             //ym2612.OPN.ST.TAT = 0;\r
-            //\r
-            timer_a_step = timer_a_offset = 16495 * (1024 - TAnew);\r
+            timer_a_step = timer_a_offset = 16466 * (1024 - TAnew);\r
             if (ym2612.OPN.ST.mode & 1) {\r
               int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
               timer_a_next_oflow = (cycles << 8) + timer_a_step;\r
@@ -812,10 +811,9 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
           if (ym2612.OPN.ST.TB != d) {\r
             //elprintf(EL_STATUS, "timer b set %i", d);\r
             ym2612.OPN.ST.TB = d;\r
-            //ym2612.OPN.ST.TBC  = (256-d)<<4;\r
-            //ym2612.OPN.ST.TBC *= 18;\r
+            //ym2612.OPN.ST.TBC = (256-d) * 288;\r
             //ym2612.OPN.ST.TBT  = 0;\r
-            timer_b_step = timer_b_offset = 263912 * (256 - d);\r
+            timer_b_step = timer_b_offset = 262800 * (256 - d); // 262881\r
             if (ym2612.OPN.ST.mode & 2) {\r
               int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
               timer_b_next_oflow = (cycles << 8) + timer_b_step;\r
@@ -883,14 +881,13 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   return YM2612Write_(a, d);\r
 }\r
 \r
-// TODO: savestates\r
+\r
 #define ym2612_read_local() \\r
   if (xcycles >= timer_a_next_oflow) \\r
     ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \\r
   if (xcycles >= timer_b_next_oflow) \\r
     ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2\r
 \r
-\r
 u32 ym2612_read_local_z80(void)\r
 {\r
   int xcycles = z80_cyclesDone() << 8;\r
@@ -913,6 +910,64 @@ u32 ym2612_read_local_68k(void)
   return ym2612.OPN.ST.status;\r
 }\r
 \r
+void ym2612_pack_state(void)\r
+{\r
+  // timers are saved as tick counts, in 16.16 int format\r
+  int tac, tat = 0, tbc, tbt = 0;\r
+  tac = 1024 - ym2612.OPN.ST.TA;\r
+  tbc = 256  - ym2612.OPN.ST.TB;\r
+  if (timer_a_next_oflow != TIMER_NO_OFLOW)\r
+    tat = (int)((double)(timer_a_step - timer_a_next_oflow) / (double)timer_a_step * tac * 65536);\r
+  if (timer_b_next_oflow != TIMER_NO_OFLOW)\r
+    tbt = (int)((double)(timer_b_step - timer_b_next_oflow) / (double)timer_b_step * tbc * 65536);\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
+#ifdef __GP2X__\r
+  if (PicoOpt & POPT_EXT_FM)\r
+    /*YM2612PicoStateSave2_940(tat, tbt)*/;\r
+  else\r
+#endif\r
+    YM2612PicoStateSave2(tat, tbt);\r
+}\r
+\r
+void ym2612_unpack_state(void)\r
+{\r
+  int i, ret, tac, tat, tbc, tbt;\r
+  YM2612PicoStateLoad();\r
+\r
+  // feed all the registers and update internal state\r
+  for (i = 0x20; i < 0xB8; i++) {\r
+    ym2612_write_local(0, i, 0);\r
+    ym2612_write_local(1, ym2612.REGS[i], 0);\r
+  }\r
+  for (i = 0x30; i < 0xB8; i++) {\r
+    ym2612_write_local(2, i, 0);\r
+    ym2612_write_local(3, ym2612.REGS[i|0x100], 0);\r
+  }\r
+\r
+#ifdef __GP2X__\r
+  if (PicoOpt & POPT_EXT_FM)\r
+    /*ret = YM2612PicoStateLoad2_940(&tat, &tbt)*/;\r
+  else\r
+#endif\r
+    ret = YM2612PicoStateLoad2(&tat, &tbt);\r
+  if (ret != 0) return; // no saved timers\r
+\r
+  tac = (1024 - ym2612.OPN.ST.TA) << 16;\r
+  tbc = (256  - ym2612.OPN.ST.TB) << 16;\r
+  if (ym2612.OPN.ST.mode & 1)\r
+    timer_a_next_oflow = (double)(tac - tat) / (double)tac * timer_a_step;\r
+  else\r
+    timer_a_next_oflow = TIMER_NO_OFLOW;\r
+  if (ym2612.OPN.ST.mode & 2)\r
+    timer_b_next_oflow = (double)(tbc - tbt) / (double)tbc * timer_b_step;\r
+  else\r
+    timer_b_next_oflow = TIMER_NO_OFLOW;\r
+  elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, timer_a_next_oflow >> 8);\r
+  elprintf(EL_YMTIMER, "load: %i/%i, timer_b_next_oflow %i", tbt>>16, tbc>>16, timer_b_next_oflow >> 8);\r
+}\r
+\r
 // -----------------------------------------------------------------\r
 //                        z80 memhandlers\r
 \r