X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fstate.c;h=de2d8ab69fc5c47c2ba6c26fbddf99b1b92808d1;hb=f8675e282e7aa72bc6ab0edbb1dada4395d1c44c;hp=27c58a755fe287bd9790c4a4d6c785748300c6b3;hpb=03065bb617aa86e7a4dfb943781fecb8db8836fb;p=picodrive.git

diff --git a/pico/state.c b/pico/state.c
index 27c58a7..de2d8ab 100644
--- a/pico/state.c
+++ b/pico/state.c
@@ -1,24 +1,21 @@
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2010 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * PicoDrive
+ * (C) notaz, 2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include "pico_int.h"
 #include <zlib/zlib.h>
 
 #include "../cpu/sh2/sh2.h"
 #include "sound/ym2612.h"
+#include "state.h"
 
 // sn76496
 extern int *sn76496_regs;
 
-typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);
-typedef size_t (areaeof)(void *file);
-typedef int    (areaseek)(void *file, long offset, int whence);
-typedef int    (areaclose)(void *file);
-
 static arearw    *areaRead;
 static arearw    *areaWrite;
 static areaeof   *areaEof;
@@ -173,6 +170,9 @@ typedef enum {
   CHUNK_SDRAM,
   CHUNK_DRAM,
   CHUNK_32XPAL,
+  CHUNK_32X_EVT,
+  CHUNK_32X_FIRST = CHUNK_MSH2,
+  CHUNK_32X_LAST = CHUNK_32X_EVT,
   //
   CHUNK_DEFAULT_COUNT,
   CHUNK_CARTHW_ = CHUNK_CARTHW,  // defined in PicoInt
@@ -221,6 +221,7 @@ static const char * const chunk_names[] = {
   "SDRAM",
   "DRAM",
   "PAL",
+  "events",
 };
 
 static int write_chunk(chunk_name_e name, int len, void *data, void *file)
@@ -308,6 +309,7 @@ static int state_save(void *file)
       wram_2M_to_1M(Pico_mcd->word_ram2M);
   }
 
+#ifndef NO_32X
   if (PicoAHW & PAHW_32X)
   {
     unsigned char cpubuff[SH2_STATE_SIZE];
@@ -316,13 +318,13 @@ static int state_save(void *file)
 
     sh2_pack(&sh2s[0], cpubuff);
     CHECKED_WRITE_BUFF(CHUNK_MSH2,      cpubuff);
-    CHECKED_WRITE_BUFF(CHUNK_MSH2_DATA, Pico32xMem->data_array[0]);
-    CHECKED_WRITE_BUFF(CHUNK_MSH2_PERI, Pico32xMem->sh2_peri_regs[0]);
+    CHECKED_WRITE_BUFF(CHUNK_MSH2_DATA, sh2s[0].data_array);
+    CHECKED_WRITE_BUFF(CHUNK_MSH2_PERI, sh2s[0].peri_regs);
 
     sh2_pack(&sh2s[1], cpubuff);
     CHECKED_WRITE_BUFF(CHUNK_SSH2,      cpubuff);
-    CHECKED_WRITE_BUFF(CHUNK_SSH2_DATA, Pico32xMem->data_array[1]);
-    CHECKED_WRITE_BUFF(CHUNK_SSH2_PERI, Pico32xMem->sh2_peri_regs[1]);
+    CHECKED_WRITE_BUFF(CHUNK_SSH2_DATA, sh2s[1].data_array);
+    CHECKED_WRITE_BUFF(CHUNK_SSH2_PERI, sh2s[1].peri_regs);
 
     CHECKED_WRITE_BUFF(CHUNK_32XSYS,    Pico32x);
     CHECKED_WRITE_BUFF(CHUNK_M68K_BIOS, Pico32xMem->m68k_rom);
@@ -331,7 +333,12 @@ static int state_save(void *file)
     CHECKED_WRITE_BUFF(CHUNK_SDRAM,     Pico32xMem->sdram);
     CHECKED_WRITE_BUFF(CHUNK_DRAM,      Pico32xMem->dram);
     CHECKED_WRITE_BUFF(CHUNK_32XPAL,    Pico32xMem->pal);
+
+    memset(buff, 0, 0x40);
+    memcpy(buff, event_times, sizeof(event_times));
+    CHECKED_WRITE(CHUNK_32X_EVT, 0x40, buff);
   }
+#endif
 
   if (carthw_chunks != NULL)
   {
@@ -379,6 +386,7 @@ static int state_load(void *file)
   unsigned char buff_m68k[0x60], buff_s68k[0x60];
   unsigned char buff_z80[Z80_STATE_SIZE];
   unsigned char buff_sh2[SH2_STATE_SIZE];
+  unsigned char buff[0x40];
   unsigned char chunk;
   void *ym2612_regs;
   char header[8];
@@ -401,8 +409,8 @@ static int state_load(void *file)
     if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
     if (CHUNK_S68K <= chunk && chunk <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))
       R_ERROR_RETURN("cd chunk in non CD state?");
-    if (CHUNK_MSH2 <= chunk && chunk <= CHUNK_32XPAL && !(PicoAHW & PAHW_32X))
-      R_ERROR_RETURN("32x chunk in non 32x state?");
+    if (CHUNK_32X_FIRST <= chunk && chunk <= CHUNK_32X_LAST && !(PicoAHW & PAHW_32X))
+      Pico32xStartup();
 
     switch (chunk)
     {
@@ -451,6 +459,7 @@ static int state_load(void *file)
       case CHUNK_MISC_CD:  CHECKED_READ_BUFF(Pico_mcd->m); break;
 
       // 32x stuff
+#ifndef NO_32X
       case CHUNK_MSH2:
         CHECKED_READ_BUFF(buff_sh2);
         sh2_unpack(&sh2s[0], buff_sh2);
@@ -461,10 +470,10 @@ static int state_load(void *file)
         sh2_unpack(&sh2s[1], buff_sh2);
         break;
 
-      case CHUNK_MSH2_DATA:   CHECKED_READ_BUFF(Pico32xMem->data_array[0]); break;
-      case CHUNK_MSH2_PERI:   CHECKED_READ_BUFF(Pico32xMem->sh2_peri_regs[0]); break;
-      case CHUNK_SSH2_DATA:   CHECKED_READ_BUFF(Pico32xMem->data_array[1]); break;
-      case CHUNK_SSH2_PERI:   CHECKED_READ_BUFF(Pico32xMem->sh2_peri_regs[1]); break;
+      case CHUNK_MSH2_DATA:   CHECKED_READ_BUFF(sh2s[0].data_array); break;
+      case CHUNK_MSH2_PERI:   CHECKED_READ_BUFF(sh2s[0].peri_regs); break;
+      case CHUNK_SSH2_DATA:   CHECKED_READ_BUFF(sh2s[1].data_array); break;
+      case CHUNK_SSH2_PERI:   CHECKED_READ_BUFF(sh2s[1].peri_regs); break;
       case CHUNK_32XSYS:      CHECKED_READ_BUFF(Pico32x); break;
       case CHUNK_M68K_BIOS:   CHECKED_READ_BUFF(Pico32xMem->m68k_rom); break;
       case CHUNK_MSH2_BIOS:   CHECKED_READ_BUFF(Pico32xMem->sh2_rom_m); break;
@@ -473,6 +482,11 @@ static int state_load(void *file)
       case CHUNK_DRAM:        CHECKED_READ_BUFF(Pico32xMem->dram); break;
       case CHUNK_32XPAL:      CHECKED_READ_BUFF(Pico32xMem->pal); break;
 
+      case CHUNK_32X_EVT:
+        CHECKED_READ_BUFF(buff);
+        memcpy(event_times, buff, sizeof(event_times));
+        break;
+#endif
       default:
         if (carthw_chunks != NULL)
         {
@@ -501,18 +515,22 @@ readend:
 
     if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
       cdda_start_play();
-
-    SekUnpackCpu(buff_s68k, 1);
   }
 
+  if (PicoAHW & PAHW_32X)
+    Pico32xStateLoaded(1);
+
   // must unpack 68k and z80 after banks are set up
   if (!(PicoAHW & PAHW_SMS))
     SekUnpackCpu(buff_m68k, 0);
+  if (PicoAHW & PAHW_MCD)
+    SekUnpackCpu(buff_s68k, 1);
 
   z80_unpack(buff_z80);
 
+  // due to dep from 68k cycles..
   if (PicoAHW & PAHW_32X)
-    Pico32xStateLoaded();
+    Pico32xStateLoaded(0);
 
   return 0;
 }
@@ -546,6 +564,7 @@ static int state_load_gfx(void *file)
       case CHUNK_VSRAM: CHECKED_READ_BUFF(Pico.vsram); found++; break;
       case CHUNK_VIDEO: CHECKED_READ_BUFF(Pico.video); found++; break;
 
+#ifndef NO_32X
       case CHUNK_DRAM:
         if (Pico32xMem != NULL)
           CHECKED_READ_BUFF(Pico32xMem->dram);
@@ -560,7 +579,7 @@ static int state_load_gfx(void *file)
       case CHUNK_32XSYS:
         CHECKED_READ_BUFF(Pico32x);
         break;
-
+#endif
       default:
         areaSeek(file, len, SEEK_CUR);
         break;
@@ -571,15 +590,10 @@ readend:
   return 0;
 }
 
-int PicoState(const char *fname, int is_save)
+static int pico_state_internal(void *afile, int is_save)
 {
-  void *afile = NULL;
   int ret;
 
-  afile = open_save_file(fname, is_save);
-  if (afile == NULL)
-    return -1;
-
   if (is_save)
     ret = state_save(afile);
   else {
@@ -594,10 +608,35 @@ int PicoState(const char *fname, int is_save)
     Pico.m.dirtyPal = 1;
   }
 
+  return ret;
+}
+
+int PicoState(const char *fname, int is_save)
+{
+  void *afile = NULL;
+  int ret;
+
+  afile = open_save_file(fname, is_save);
+  if (afile == NULL)
+    return -1;
+
+  ret = pico_state_internal(afile, is_save);
   areaClose(afile);
   return ret;
 }
 
+int PicoStateFP(void *afile, int is_save,
+  arearw *read, arearw *write, areaeof *eof, areaseek *seek)
+{
+  areaRead  = read;
+  areaWrite = write;
+  areaEof   = eof;
+  areaSeek  = seek;
+  areaClose = NULL;
+
+  return pico_state_internal(afile, is_save);
+}
+
 int PicoStateLoadGfx(const char *fname)
 {
   void *afile;
@@ -652,11 +691,13 @@ void *PicoTmpStateSave(void)
   memcpy(t->vsram, Pico.vsram, sizeof(Pico.vsram));
   memcpy(&t->video, &Pico.video, sizeof(Pico.video));
 
+#ifndef NO_32X
   if (PicoAHW & PAHW_32X) {
     memcpy(&t->t32x.p32x, &Pico32x, sizeof(Pico32x));
     memcpy(t->t32x.dram, Pico32xMem->dram, sizeof(Pico32xMem->dram));
     memcpy(t->t32x.pal, Pico32xMem->pal, sizeof(Pico32xMem->pal));
   }
+#endif
 
   return t;
 }
@@ -673,12 +714,14 @@ void PicoTmpStateRestore(void *data)
   memcpy(&Pico.video, &t->video, sizeof(Pico.video));
   Pico.m.dirtyPal = 1;
 
+#ifndef NO_32X
   if (PicoAHW & PAHW_32X) {
     memcpy(&Pico32x, &t->t32x.p32x, sizeof(Pico32x));
     memcpy(Pico32xMem->dram, t->t32x.dram, sizeof(Pico32xMem->dram));
     memcpy(Pico32xMem->pal, t->t32x.pal, sizeof(Pico32xMem->pal));
     Pico32x.dirty_pal = 1;
   }
+#endif
 }
 
-// vim:shiftwidth=2:expandtab
+// vim:shiftwidth=2:ts=2:expandtab