*/\r
\r
#include "pico_int.h"\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
\r
#include "../cpu/sh2/sh2.h"\r
#include "sound/ym2612.h"\r
+#include "state.h"\r
\r
// sn76496\r
extern int *sn76496_regs;\r
\r
-typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);\r
-typedef size_t (areaeof)(void *file);\r
-typedef int (areaseek)(void *file, long offset, int whence);\r
-typedef int (areaclose)(void *file);\r
-\r
static arearw *areaRead;\r
static arearw *areaWrite;\r
static areaeof *areaEof;\r
return afile;\r
}\r
\r
-// legacy savestate loading\r
-#define SCANP(f, x) areaRead(&Pico.x, sizeof(Pico.x), 1, f)\r
-\r
-static int state_load_legacy(void *file)\r
-{\r
- unsigned char head[32];\r
- unsigned char cpu[0x60];\r
- unsigned char cpu_z80[Z80_STATE_SIZE];\r
- void *ym2612_regs;\r
- int ok;\r
-\r
- memset(&cpu,0,sizeof(cpu));\r
- memset(&cpu_z80,0,sizeof(cpu_z80));\r
-\r
- memset(head, 0, sizeof(head));\r
- areaRead(head, sizeof(head), 1, file);\r
- if (strcmp((char *)head, "Pico") != 0)\r
- return -1;\r
-\r
- elprintf(EL_STATUS, "legacy savestate");\r
-\r
- // Scan all the memory areas:\r
- SCANP(file, ram);\r
- SCANP(file, vram);\r
- SCANP(file, zram);\r
- SCANP(file, cram);\r
- SCANP(file, vsram);\r
-\r
- // Pack, scan and unpack the cpu data:\r
- areaRead(cpu, sizeof(cpu), 1, file);\r
- SekUnpackCpu(cpu, 0);\r
-\r
- SCANP(file, m);\r
- SCANP(file, video);\r
-\r
- ok = areaRead(cpu_z80, sizeof(cpu_z80), 1, file) == sizeof(cpu_z80);\r
- // do not unpack if we fail to load z80 state\r
- if (!ok) z80_reset();\r
- else z80_unpack(cpu_z80);\r
-\r
- ym2612_regs = YM2612GetRegs();\r
- areaRead(sn76496_regs, 28*4, 1, file);\r
- areaRead(ym2612_regs, 0x200+4, 1, file);\r
- ym2612_unpack_state();\r
-\r
- return 0;\r
-}\r
-\r
// ---------------------------------------------------------------------------\r
\r
typedef enum {\r
CHUNK_BRAM,\r
CHUNK_GA_REGS,\r
CHUNK_PCM,\r
- CHUNK_CDC,\r
- CHUNK_CDD, // 20\r
- CHUNK_SCD,\r
- CHUNK_RC,\r
+ CHUNK_CDC, // old\r
+ CHUNK_CDD, // 20 old\r
+ CHUNK_SCD, // old\r
+ CHUNK_RC, // old\r
CHUNK_MISC_CD,\r
//\r
CHUNK_IOPORTS, // versions < 1.70 did not save that..\r
CHUNK_DRAM,\r
CHUNK_32XPAL,\r
CHUNK_32X_EVT,\r
+ CHUNK_32X_FIRST = CHUNK_MSH2,\r
+ CHUNK_32X_LAST = CHUNK_32X_EVT,\r
+ // add new stuff here\r
+ CHUNK_CD_EVT = 50,\r
+ CHUNK_CD_GFX,\r
+ CHUNK_CD_CDC,\r
+ CHUNK_CD_CDD,\r
//\r
CHUNK_DEFAULT_COUNT,\r
- CHUNK_CARTHW_ = CHUNK_CARTHW, // defined in PicoInt\r
+ CHUNK_CARTHW_ = CHUNK_CARTHW, // 64 (defined in PicoInt)\r
} chunk_name_e;\r
\r
-static const char * const chunk_names[] = {\r
+static const char * const chunk_names[CHUNK_DEFAULT_COUNT] = {\r
"INVALID!",\r
"M68K state",\r
"RAM",\r
return (bwritten == len + 4 + 1);\r
}\r
\r
+#define CHUNK_LIMIT_W 18772 // sizeof(cdc)\r
+\r
#define CHECKED_WRITE(name,len,data) { \\r
- if (PicoStateProgressCB && name < CHUNK_DEFAULT_COUNT) { \\r
+ if (PicoStateProgressCB && name < CHUNK_DEFAULT_COUNT && chunk_names[name]) { \\r
strncpy(sbuff + 9, chunk_names[name], sizeof(sbuff) - 9); \\r
PicoStateProgressCB(sbuff); \\r
} \\r
- if (!write_chunk(name, len, data, file)) return 1; \\r
+ if (data == buf2 && len > CHUNK_LIMIT_W) \\r
+ goto out; \\r
+ if (!write_chunk(name, len, data, file)) \\r
+ goto out; \\r
}\r
\r
#define CHECKED_WRITE_BUFF(name,buff) { \\r
- if (PicoStateProgressCB && name < CHUNK_DEFAULT_COUNT) { \\r
+ if (PicoStateProgressCB && name < CHUNK_DEFAULT_COUNT && chunk_names[name]) { \\r
strncpy(sbuff + 9, chunk_names[name], sizeof(sbuff) - 9); \\r
PicoStateProgressCB(sbuff); \\r
} \\r
- if (!write_chunk(name, sizeof(buff), &buff, file)) return 1; \\r
+ if (!write_chunk(name, sizeof(buff), &buff, file)) \\r
+ goto out; \\r
}\r
\r
static int state_save(void *file)\r
char sbuff[32] = "Saving.. ";\r
unsigned char buff[0x60], buff_z80[Z80_STATE_SIZE];\r
void *ym2612_regs = YM2612GetRegs();\r
- int ver = 0x0170; // not really used..\r
+ void *buf2 = NULL;\r
+ int ver = 0x0191; // not really used..\r
+ int retval = -1;\r
+ int len;\r
\r
areaWrite("PicoSEXT", 1, 8, file);\r
areaWrite(&ver, 1, 4, file);\r
memset(buff, 0, sizeof(buff));\r
SekPackCpu(buff, 0);\r
CHECKED_WRITE_BUFF(CHUNK_M68K, buff);\r
- CHECKED_WRITE_BUFF(CHUNK_RAM, Pico.ram);\r
- CHECKED_WRITE_BUFF(CHUNK_VSRAM, Pico.vsram);\r
- CHECKED_WRITE_BUFF(CHUNK_IOPORTS, Pico.ioports);\r
+ CHECKED_WRITE_BUFF(CHUNK_RAM, PicoMem.ram);\r
+ CHECKED_WRITE_BUFF(CHUNK_VSRAM, PicoMem.vsram);\r
+ CHECKED_WRITE_BUFF(CHUNK_IOPORTS, PicoMem.ioports);\r
ym2612_pack_state();\r
CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);\r
}\r
CHECKED_WRITE_BUFF(CHUNK_SMS, Pico.ms);\r
}\r
\r
- CHECKED_WRITE_BUFF(CHUNK_VRAM, Pico.vram);\r
- CHECKED_WRITE_BUFF(CHUNK_ZRAM, Pico.zram);\r
- CHECKED_WRITE_BUFF(CHUNK_CRAM, Pico.cram);\r
+ CHECKED_WRITE_BUFF(CHUNK_VRAM, PicoMem.vram);\r
+ CHECKED_WRITE_BUFF(CHUNK_ZRAM, PicoMem.zram);\r
+ CHECKED_WRITE_BUFF(CHUNK_CRAM, PicoMem.cram);\r
CHECKED_WRITE_BUFF(CHUNK_MISC, Pico.m);\r
CHECKED_WRITE_BUFF(CHUNK_VIDEO, Pico.video);\r
\r
\r
if (PicoAHW & PAHW_MCD)\r
{\r
+ buf2 = malloc(CHUNK_LIMIT_W);\r
+ if (buf2 == NULL)\r
+ return -1;\r
+\r
memset(buff, 0, sizeof(buff));\r
SekPackCpu(buff, 1);\r
if (Pico_mcd->s68k_regs[3] & 4) // 1M mode?\r
wram_1M_to_2M(Pico_mcd->word_ram2M);\r
- Pico_mcd->m.hint_vector = *(unsigned short *)(Pico_mcd->bios + 0x72);\r
+ memcpy(&Pico_mcd->m.hint_vector, Pico_mcd->bios + 0x72,\r
+ sizeof(Pico_mcd->m.hint_vector));\r
\r
CHECKED_WRITE_BUFF(CHUNK_S68K, buff);\r
CHECKED_WRITE_BUFF(CHUNK_PRG_RAM, Pico_mcd->prg_ram);\r
CHECKED_WRITE_BUFF(CHUNK_BRAM, Pico_mcd->bram);\r
CHECKED_WRITE_BUFF(CHUNK_GA_REGS, Pico_mcd->s68k_regs); // GA regs, not CPU regs\r
CHECKED_WRITE_BUFF(CHUNK_PCM, Pico_mcd->pcm);\r
- CHECKED_WRITE_BUFF(CHUNK_CDD, Pico_mcd->cdd);\r
- CHECKED_WRITE_BUFF(CHUNK_CDC, Pico_mcd->cdc);\r
- CHECKED_WRITE_BUFF(CHUNK_SCD, Pico_mcd->scd);\r
- CHECKED_WRITE_BUFF(CHUNK_RC, Pico_mcd->rot_comp);\r
CHECKED_WRITE_BUFF(CHUNK_MISC_CD, Pico_mcd->m);\r
+ memset(buff, 0, 0x40);\r
+ memcpy(buff, pcd_event_times, sizeof(pcd_event_times));\r
+ CHECKED_WRITE(CHUNK_CD_EVT, 0x40, buff);\r
+\r
+ len = gfx_context_save(buf2);\r
+ CHECKED_WRITE(CHUNK_CD_GFX, len, buf2);\r
+ len = cdc_context_save(buf2);\r
+ CHECKED_WRITE(CHUNK_CD_CDC, len, buf2);\r
+ len = cdd_context_save(buf2);\r
+ CHECKED_WRITE(CHUNK_CD_CDD, len, buf2);\r
\r
if (Pico_mcd->s68k_regs[3] & 4) // convert back\r
wram_2M_to_1M(Pico_mcd->word_ram2M);\r
\r
sh2_pack(&sh2s[0], cpubuff);\r
CHECKED_WRITE_BUFF(CHUNK_MSH2, cpubuff);\r
- CHECKED_WRITE_BUFF(CHUNK_MSH2_DATA, Pico32xMem->data_array[0]);\r
- CHECKED_WRITE_BUFF(CHUNK_MSH2_PERI, Pico32xMem->sh2_peri_regs[0]);\r
+ CHECKED_WRITE_BUFF(CHUNK_MSH2_DATA, sh2s[0].data_array);\r
+ CHECKED_WRITE_BUFF(CHUNK_MSH2_PERI, sh2s[0].peri_regs);\r
\r
sh2_pack(&sh2s[1], cpubuff);\r
CHECKED_WRITE_BUFF(CHUNK_SSH2, cpubuff);\r
- CHECKED_WRITE_BUFF(CHUNK_SSH2_DATA, Pico32xMem->data_array[1]);\r
- CHECKED_WRITE_BUFF(CHUNK_SSH2_PERI, Pico32xMem->sh2_peri_regs[1]);\r
+ CHECKED_WRITE_BUFF(CHUNK_SSH2_DATA, sh2s[1].data_array);\r
+ CHECKED_WRITE_BUFF(CHUNK_SSH2_PERI, sh2s[1].peri_regs);\r
\r
CHECKED_WRITE_BUFF(CHUNK_32XSYS, Pico32x);\r
CHECKED_WRITE_BUFF(CHUNK_M68K_BIOS, Pico32xMem->m68k_rom);\r
CHECKED_WRITE_BUFF(CHUNK_32XPAL, Pico32xMem->pal);\r
\r
memset(buff, 0, 0x40);\r
- memcpy(buff, event_times, sizeof(event_times));\r
+ memcpy(buff, p32x_event_times, sizeof(p32x_event_times));\r
CHECKED_WRITE(CHUNK_32X_EVT, 0x40, buff);\r
}\r
#endif\r
CHECKED_WRITE(chwc->chunk, chwc->size, chwc->ptr);\r
}\r
\r
- return 0;\r
+ retval = 0;\r
+\r
+out:\r
+ if (buf2 != NULL)\r
+ free(buf2);\r
+ return retval;\r
}\r
\r
static int g_read_offs = 0;\r
#define R_ERROR_RETURN(error) \\r
{ \\r
elprintf(EL_STATUS, "load_state @ %x: " error, g_read_offs); \\r
- return 1; \\r
+ goto out; \\r
}\r
\r
// when is eof really set?\r
if (areaRead(data, 1, len, file) != len) { \\r
if (len == 1 && areaEof(file)) goto readend; \\r
R_ERROR_RETURN("areaRead: premature EOF\n"); \\r
- return 1; \\r
} \\r
g_read_offs += len; \\r
}\r
\r
#define CHECKED_READ_BUFF(buff) CHECKED_READ2(sizeof(buff), &buff);\r
\r
+#define CHUNK_LIMIT_R 0x10960 // sizeof(old_cdc)\r
+\r
+#define CHECKED_READ_LIM(data) { \\r
+ if (len > CHUNK_LIMIT_R) \\r
+ R_ERROR_RETURN("chunk size over limit."); \\r
+ CHECKED_READ(len, data); \\r
+}\r
+\r
static int state_load(void *file)\r
{\r
unsigned char buff_m68k[0x60], buff_s68k[0x60];\r
unsigned char buff_z80[Z80_STATE_SIZE];\r
unsigned char buff_sh2[SH2_STATE_SIZE];\r
- unsigned char buff[0x40];\r
+ unsigned char *buf = NULL;\r
unsigned char chunk;\r
void *ym2612_regs;\r
+ int len_check;\r
+ int retval = -1;\r
char header[8];\r
int ver, len;\r
\r
memset(buff_s68k, 0, sizeof(buff_s68k));\r
memset(buff_z80, 0, sizeof(buff_z80));\r
\r
+ buf = malloc(CHUNK_LIMIT_R);\r
+ if (buf == NULL)\r
+ return -1;\r
+\r
g_read_offs = 0;\r
CHECKED_READ(8, header);\r
if (strncmp(header, "PicoSMCD", 8) && strncmp(header, "PicoSEXT", 8))\r
R_ERROR_RETURN("bad header");\r
CHECKED_READ(4, &ver);\r
\r
+ memset(pcd_event_times, 0, sizeof(pcd_event_times));\r
+ memset(p32x_event_times, 0, sizeof(p32x_event_times));\r
+\r
while (!areaEof(file))\r
{\r
+ len_check = 0;\r
CHECKED_READ(1, &chunk);\r
CHECKED_READ(4, &len);\r
if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");\r
if (CHUNK_S68K <= chunk && chunk <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))\r
R_ERROR_RETURN("cd chunk in non CD state?");\r
- if (CHUNK_MSH2 <= chunk && chunk <= CHUNK_32XPAL && !(PicoAHW & PAHW_32X))\r
- R_ERROR_RETURN("32x chunk in non 32x state?");\r
+ if (CHUNK_32X_FIRST <= chunk && chunk <= CHUNK_32X_LAST && !(PicoAHW & PAHW_32X))\r
+ Pico32xStartup();\r
\r
switch (chunk)\r
{\r
CHECKED_READ_BUFF(buff_z80);\r
break;\r
\r
- case CHUNK_RAM: CHECKED_READ_BUFF(Pico.ram); break;\r
- case CHUNK_VRAM: CHECKED_READ_BUFF(Pico.vram); break;\r
- case CHUNK_ZRAM: CHECKED_READ_BUFF(Pico.zram); break;\r
- case CHUNK_CRAM: CHECKED_READ_BUFF(Pico.cram); break;\r
- case CHUNK_VSRAM: CHECKED_READ_BUFF(Pico.vsram); break;\r
+ case CHUNK_RAM: CHECKED_READ_BUFF(PicoMem.ram); break;\r
+ case CHUNK_VRAM: CHECKED_READ_BUFF(PicoMem.vram); break;\r
+ case CHUNK_ZRAM: CHECKED_READ_BUFF(PicoMem.zram); break;\r
+ case CHUNK_CRAM: CHECKED_READ_BUFF(PicoMem.cram); break;\r
+ case CHUNK_VSRAM: CHECKED_READ_BUFF(PicoMem.vsram); break;\r
case CHUNK_MISC: CHECKED_READ_BUFF(Pico.m); break;\r
case CHUNK_VIDEO: CHECKED_READ_BUFF(Pico.video); break;\r
- case CHUNK_IOPORTS: CHECKED_READ_BUFF(Pico.ioports); break;\r
+ case CHUNK_IOPORTS: CHECKED_READ_BUFF(PicoMem.ioports); break;\r
case CHUNK_PSG: CHECKED_READ2(28*4, sn76496_regs); break;\r
case CHUNK_FM:\r
ym2612_regs = YM2612GetRegs();\r
case CHUNK_BRAM: CHECKED_READ_BUFF(Pico_mcd->bram); break;\r
case CHUNK_GA_REGS: CHECKED_READ_BUFF(Pico_mcd->s68k_regs); break;\r
case CHUNK_PCM: CHECKED_READ_BUFF(Pico_mcd->pcm); break;\r
- case CHUNK_CDD: CHECKED_READ_BUFF(Pico_mcd->cdd); break;\r
- case CHUNK_CDC: CHECKED_READ_BUFF(Pico_mcd->cdc); break;\r
- case CHUNK_SCD: CHECKED_READ_BUFF(Pico_mcd->scd); break;\r
- case CHUNK_RC: CHECKED_READ_BUFF(Pico_mcd->rot_comp); break;\r
case CHUNK_MISC_CD: CHECKED_READ_BUFF(Pico_mcd->m); break;\r
\r
+ case CHUNK_CD_EVT:\r
+ CHECKED_READ2(0x40, buf);\r
+ memcpy(pcd_event_times, buf, sizeof(pcd_event_times));\r
+ break;\r
+\r
+ case CHUNK_CD_GFX:\r
+ CHECKED_READ_LIM(buf);\r
+ len_check = gfx_context_load(buf);\r
+ break;\r
+\r
+ case CHUNK_CD_CDC:\r
+ CHECKED_READ_LIM(buf);\r
+ len_check = cdc_context_load(buf);\r
+ break;\r
+\r
+ case CHUNK_CD_CDD:\r
+ CHECKED_READ_LIM(buf);\r
+ len_check = cdd_context_load(buf);\r
+ break;\r
+\r
+ // old, to be removed:\r
+ case CHUNK_CDC:\r
+ CHECKED_READ_LIM(buf);\r
+ cdc_context_load_old(buf);\r
+ break;\r
+\r
+ case CHUNK_SCD:\r
+ CHECKED_READ_LIM(buf);\r
+ cdd_context_load_old(buf);\r
+ break;\r
+\r
// 32x stuff\r
#ifndef NO_32X\r
case CHUNK_MSH2:\r
sh2_unpack(&sh2s[1], buff_sh2);\r
break;\r
\r
- case CHUNK_MSH2_DATA: CHECKED_READ_BUFF(Pico32xMem->data_array[0]); break;\r
- case CHUNK_MSH2_PERI: CHECKED_READ_BUFF(Pico32xMem->sh2_peri_regs[0]); break;\r
- case CHUNK_SSH2_DATA: CHECKED_READ_BUFF(Pico32xMem->data_array[1]); break;\r
- case CHUNK_SSH2_PERI: CHECKED_READ_BUFF(Pico32xMem->sh2_peri_regs[1]); break;\r
+ case CHUNK_MSH2_DATA: CHECKED_READ_BUFF(sh2s[0].data_array); break;\r
+ case CHUNK_MSH2_PERI: CHECKED_READ_BUFF(sh2s[0].peri_regs); break;\r
+ case CHUNK_SSH2_DATA: CHECKED_READ_BUFF(sh2s[1].data_array); break;\r
+ case CHUNK_SSH2_PERI: CHECKED_READ_BUFF(sh2s[1].peri_regs); break;\r
case CHUNK_32XSYS: CHECKED_READ_BUFF(Pico32x); break;\r
case CHUNK_M68K_BIOS: CHECKED_READ_BUFF(Pico32xMem->m68k_rom); break;\r
case CHUNK_MSH2_BIOS: CHECKED_READ_BUFF(Pico32xMem->sh2_rom_m); break;\r
case CHUNK_32XPAL: CHECKED_READ_BUFF(Pico32xMem->pal); break;\r
\r
case CHUNK_32X_EVT:\r
- CHECKED_READ_BUFF(buff);\r
- memcpy(event_times, buff, sizeof(event_times));\r
+ CHECKED_READ2(0x40, buf);\r
+ memcpy(p32x_event_times, buf, sizeof(p32x_event_times));\r
break;\r
#endif\r
default:\r
areaSeek(file, len, SEEK_CUR);\r
break;\r
}\r
-breakswitch:;\r
+breakswitch:\r
+ if (len_check != 0 && len_check != len)\r
+ elprintf(EL_STATUS, "load_state: chunk %d has bad len %d/%d",\r
+ len, len_check);\r
}\r
\r
readend:\r
if (PicoAHW & PAHW_SMS)\r
PicoStateLoadedMS();\r
\r
- if (PicoAHW & PAHW_MCD)\r
- {\r
- PicoMemStateLoaded();\r
-\r
- if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
- cdda_start_play();\r
+ if (PicoAHW & PAHW_32X)\r
+ Pico32xStateLoaded(1);\r
\r
- SekUnpackCpu(buff_s68k, 1);\r
- }\r
+ if (PicoLoadStateHook != NULL)\r
+ PicoLoadStateHook();\r
\r
// must unpack 68k and z80 after banks are set up\r
if (!(PicoAHW & PAHW_SMS))\r
SekUnpackCpu(buff_m68k, 0);\r
+ if (PicoAHW & PAHW_MCD)\r
+ SekUnpackCpu(buff_s68k, 1);\r
\r
z80_unpack(buff_z80);\r
\r
+ // due to dep from 68k cycles..\r
+ Pico.t.m68c_aim = Pico.t.m68c_cnt;\r
if (PicoAHW & PAHW_32X)\r
- Pico32xStateLoaded();\r
+ Pico32xStateLoaded(0);\r
+ if (PicoAHW & PAHW_MCD)\r
+ {\r
+ SekCycleAimS68k = SekCycleCntS68k;\r
+ pcd_state_loaded();\r
+ }\r
\r
- return 0;\r
+ Pico.m.dirtyPal = 1;\r
+ Pico.video.status &= ~(SR_VB | SR_F);\r
+ Pico.video.status |= ((Pico.video.reg[1] >> 3) ^ SR_VB) & SR_VB;\r
+ Pico.video.status |= (Pico.video.pending_ints << 2) & SR_F;\r
+\r
+ retval = 0;\r
+\r
+out:\r
+ free(buf);\r
+ return retval;\r
}\r
\r
static int state_load_gfx(void *file)\r
\r
switch (buff[0])\r
{\r
- case CHUNK_VRAM: CHECKED_READ_BUFF(Pico.vram); found++; break;\r
- case CHUNK_CRAM: CHECKED_READ_BUFF(Pico.cram); found++; break;\r
- case CHUNK_VSRAM: CHECKED_READ_BUFF(Pico.vsram); found++; break;\r
+ case CHUNK_VRAM: CHECKED_READ_BUFF(PicoMem.vram); found++; break;\r
+ 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
\r
#ifndef NO_32X\r
}\r
}\r
\r
+out:\r
readend:\r
return 0;\r
}\r
\r
+static int pico_state_internal(void *afile, int is_save)\r
+{\r
+ int ret;\r
+\r
+ if (is_save)\r
+ ret = state_save(afile);\r
+ else\r
+ ret = state_load(afile);\r
+\r
+ return ret;\r
+}\r
+\r
int PicoState(const char *fname, int is_save)\r
{\r
void *afile = NULL;\r
if (afile == NULL)\r
return -1;\r
\r
- if (is_save)\r
- ret = state_save(afile);\r
- else {\r
- ret = state_load(afile);\r
- if (ret != 0) {\r
- areaSeek(afile, 0, SEEK_SET);\r
- ret = state_load_legacy(afile);\r
- }\r
-\r
- if (PicoLoadStateHook != NULL)\r
- PicoLoadStateHook();\r
- Pico.m.dirtyPal = 1;\r
- }\r
-\r
+ ret = pico_state_internal(afile, is_save);\r
areaClose(afile);\r
return ret;\r
}\r
\r
+int PicoStateFP(void *afile, int is_save,\r
+ arearw *read, arearw *write, areaeof *eof, areaseek *seek)\r
+{\r
+ areaRead = read;\r
+ areaWrite = write;\r
+ areaEof = eof;\r
+ areaSeek = seek;\r
+ areaClose = NULL;\r
+\r
+ return pico_state_internal(afile, is_save);\r
+}\r
+\r
int PicoStateLoadGfx(const char *fname)\r
{\r
void *afile;\r
if (ret != 0) {\r
// assume legacy\r
areaSeek(afile, 0x10020, SEEK_SET); // skip header and RAM\r
- areaRead(Pico.vram, 1, sizeof(Pico.vram), afile);\r
+ areaRead(PicoMem.vram, 1, sizeof(PicoMem.vram), afile);\r
areaSeek(afile, 0x2000, SEEK_CUR);\r
- areaRead(Pico.cram, 1, sizeof(Pico.cram), afile);\r
- areaRead(Pico.vsram, 1, sizeof(Pico.vsram), afile);\r
+ areaRead(PicoMem.cram, 1, sizeof(PicoMem.cram), afile);\r
+ areaRead(PicoMem.vsram, 1, sizeof(PicoMem.vsram), afile);\r
areaSeek(afile, 0x221a0, SEEK_SET);\r
areaRead(&Pico.video, 1, sizeof(Pico.video), afile);\r
}\r
if (t == NULL)\r
return NULL;\r
\r
- memcpy(t->vram, Pico.vram, sizeof(Pico.vram));\r
- memcpy(t->cram, Pico.cram, sizeof(Pico.cram));\r
- memcpy(t->vsram, Pico.vsram, sizeof(Pico.vsram));\r
+ memcpy(t->vram, PicoMem.vram, sizeof(PicoMem.vram));\r
+ memcpy(t->cram, PicoMem.cram, sizeof(PicoMem.cram));\r
+ memcpy(t->vsram, PicoMem.vsram, sizeof(PicoMem.vsram));\r
memcpy(&t->video, &Pico.video, sizeof(Pico.video));\r
\r
#ifndef NO_32X\r
if (t == NULL)\r
return;\r
\r
- memcpy(Pico.vram, t->vram, sizeof(Pico.vram));\r
- memcpy(Pico.cram, t->cram, sizeof(Pico.cram));\r
- memcpy(Pico.vsram, t->vsram, sizeof(Pico.vsram));\r
+ memcpy(PicoMem.vram, t->vram, sizeof(PicoMem.vram));\r
+ memcpy(PicoMem.cram, t->cram, sizeof(PicoMem.cram));\r
+ memcpy(PicoMem.vsram, t->vsram, sizeof(PicoMem.vsram));\r
memcpy(&Pico.video, &t->video, sizeof(Pico.video));\r
Pico.m.dirtyPal = 1;\r
\r
notaz.gp2x.de / picodrive.git / blobdiff