runs code in 1M wram, cell arrange, decode (untested)

[picodrive.git] / Pico / cd / Area.c

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index a4c2b36..073033f 100644 (file)
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -14,6 +14,8 @@
 // sn76496
 extern int *sn76496_regs;
 
+void (*PicoStateProgressCB)(const char *str) = 0;
+
 
 typedef enum {
        CHUNK_M68K = 1,
@@ -43,6 +45,34 @@ typedef enum {
 } chunk_name_e;
 
 
+static char *chunk_names[] = {
+       "Saving.. M68K state",
+       "Saving.. RAM",
+       "Saving.. VRAM",
+       "Saving.. ZRAM",
+       "Saving.. CRAM",        // 5
+       "Saving.. VSRAM",
+       "Saving.. emu state",
+       "Saving.. VIDEO",
+       "Saving.. Z80 state",
+       "Saving.. PSG",         // 10
+       "Saving.. FM",
+       // CD stuff
+       "Saving.. S68K state",
+       "Saving.. PRG_RAM",
+       "Saving.. WORD_RAM",
+       "Saving.. PCM_RAM",     // 15
+       "Saving.. BRAM",
+       "Saving.. GATE ARRAY regs",
+       "Saving.. PCM state",
+       "Saving.. CDC",
+       "Saving.. CDD",         // 20
+       "Saving.. SCD",
+       "Saving.. GFX chip",
+       "Saving.. MCD state",
+};
+
+
 static int write_chunk(chunk_name_e name, int len, void *data, void *file)
 {
        size_t bwritten = 0;
@@ -55,9 +85,11 @@ static int write_chunk(chunk_name_e name, int len, void *data, void *file)
 
 
 #define CHECKED_WRITE(name,len,data) \
+       if (PicoStateProgressCB) PicoStateProgressCB(chunk_names[name]); \
        if (!write_chunk(name, len, data, file)) return 1;
 
 #define CHECKED_WRITE_BUFF(name,buff) \
+       if (PicoStateProgressCB) PicoStateProgressCB(chunk_names[name]); \
        if (!write_chunk(name, sizeof(buff), &buff, file)) return 1;
 
 int PicoCdSaveState(void *file)
@@ -88,16 +120,18 @@ int PicoCdSaveState(void *file)
        if(PicoOpt&1)
                CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);
 
-       // TODO: cd stuff
        if (PicoMCD & 1)
        {
                Pico_mcd->m.audio_offset = mp3_get_offset();
                memset(buff, 0, sizeof(buff));
                PicoAreaPackCpu(buff, 1);
+               if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
+                       wram_1M_to_2M(Pico_mcd->word_ram2M);
+               Pico_mcd->m.hint_vector = *(unsigned short *)(Pico_mcd->bios + 0x72);
 
                CHECKED_WRITE_BUFF(CHUNK_S68K,     buff);
                CHECKED_WRITE_BUFF(CHUNK_PRG_RAM,  Pico_mcd->prg_ram);
-               CHECKED_WRITE_BUFF(CHUNK_WORD_RAM, Pico_mcd->word_ram); // in 2M format
+               CHECKED_WRITE_BUFF(CHUNK_WORD_RAM, Pico_mcd->word_ram2M); // in 2M format
                CHECKED_WRITE_BUFF(CHUNK_PCM_RAM,  Pico_mcd->pcm_ram);
                CHECKED_WRITE_BUFF(CHUNK_BRAM,     Pico_mcd->bram);
                CHECKED_WRITE_BUFF(CHUNK_GA_REGS,  Pico_mcd->s68k_regs); // GA regs, not CPU regs
@@ -107,6 +141,9 @@ int PicoCdSaveState(void *file)
                CHECKED_WRITE_BUFF(CHUNK_SCD,      Pico_mcd->scd);
                CHECKED_WRITE_BUFF(CHUNK_RC,       Pico_mcd->rot_comp);
                CHECKED_WRITE_BUFF(CHUNK_MISC_CD,  Pico_mcd->m);
+
+               if (Pico_mcd->s68k_regs[3]&4) // convert back
+                       wram_2M_to_1M(Pico_mcd->word_ram2M);
        }
 
        return 0;
@@ -185,7 +222,7 @@ int PicoCdLoadState(void *file)
                                break;
 
                        case CHUNK_PRG_RAM:     CHECKED_READ_BUFF(Pico_mcd->prg_ram); break;
-                       case CHUNK_WORD_RAM:    CHECKED_READ_BUFF(Pico_mcd->word_ram); break;
+                       case CHUNK_WORD_RAM:    CHECKED_READ_BUFF(Pico_mcd->word_ram2M); break;
                        case CHUNK_PCM_RAM:     CHECKED_READ_BUFF(Pico_mcd->pcm_ram); break;
                        case CHUNK_BRAM:        CHECKED_READ_BUFF(Pico_mcd->bram); break;
                        case CHUNK_GA_REGS:     CHECKED_READ_BUFF(Pico_mcd->s68k_regs); break;
@@ -194,19 +231,22 @@ int PicoCdLoadState(void *file)
                        case CHUNK_CDC:         CHECKED_READ_BUFF(Pico_mcd->cdc); break;
                        case CHUNK_SCD:         CHECKED_READ_BUFF(Pico_mcd->scd); break;
                        case CHUNK_RC:          CHECKED_READ_BUFF(Pico_mcd->rot_comp); break;
-
-                       case CHUNK_MISC_CD:
-                               CHECKED_READ_BUFF(Pico_mcd->m);
-                               mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
-                               break;
+                       case CHUNK_MISC_CD:     CHECKED_READ_BUFF(Pico_mcd->m); break;
 
                        default:
-                               printf("skipping unknown chunk %i of size %i\n", buff[0], len);
+                               printf("PicoCdLoadState: skipping unknown chunk %i of size %i\n", buff[0], len);
                                areaSeek(file, len, SEEK_CUR);
                                break;
                }
        }
 
+       /* after load events */
+       if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
+               wram_2M_to_1M(Pico_mcd->word_ram2M);
+       mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+       // restore hint vector
+        *(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
+
        return 0;
 }