support for zipped ISOs

[picodrive.git] / Pico / Area.c

diff --git a/Pico/Area.c b/Pico/Area.c
index 5ae50e8..158c111 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -22,9 +22,11 @@ struct PicoArea { void *data; int len; char *name; };
 // taking an address of fread or fwrite causes "application could't be started" error\r
 // on startup randomly depending on binary layout of executable file.\r
 \r
-arearw  *areaRead  = (arearw *) 0; // fread;  // read and write function pointers for\r
-arearw  *areaWrite = (arearw *) 0; // fwrite; // gzip save state ability\r
-areaeof *areaEof = (areaeof *) 0;\r
+arearw    *areaRead  = (arearw *) 0; // fread;  // read and write function pointers for\r
+arearw    *areaWrite = (arearw *) 0; // fwrite; // gzip save state ability\r
+areaeof   *areaEof   = (areaeof *) 0;\r
+areaseek  *areaSeek  = (areaseek *) 0;\r
+areaclose *areaClose = (areaclose *) 0;\r
 \r
 \r
 // Scan one variable and callback\r
@@ -61,11 +63,13 @@ int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
 #endif\r
 \r
 #ifdef EMU_M68K\r
-  m68ki_cpu_core *context = is_sub ? &PicoS68kCPU : &PicoM68kCPU;\r
-  memcpy(cpu,context->dar,0x40);\r
-  pc=context->pc;\r
+  void *oldcontext = m68ki_cpu_p;\r
+  m68k_set_context(is_sub ? &PicoS68kCPU : &PicoM68kCPU);\r
+  memcpy(cpu,m68ki_cpu_p->dar,0x40);\r
+  pc=m68ki_cpu_p->pc;\r
   *(unsigned int  *)(cpu+0x44)=m68k_get_reg(NULL, M68K_REG_SR);\r
-  *(unsigned int  *)(cpu+0x48)=context->sp[0];\r
+  *(unsigned int  *)(cpu+0x48)=m68ki_cpu_p->sp[0];\r
+  m68k_set_context(oldcontext);\r
 #endif\r
 \r
   *(unsigned int *)(cpu+0x40)=pc;\r
@@ -92,11 +96,13 @@ int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
 #endif\r
 \r
 #ifdef EMU_M68K\r
-  m68ki_cpu_core *context = is_sub ? &PicoS68kCPU : &PicoM68kCPU;\r
-  memcpy(context->dar,cpu,0x40);\r
-  context->pc=*(unsigned int *)(cpu+0x40);\r
+  void *oldcontext = m68ki_cpu_p;\r
+  m68k_set_context(is_sub ? &PicoS68kCPU : &PicoM68kCPU);\r
+  memcpy(m68ki_cpu_p->dar,cpu,0x40);\r
+  m68ki_cpu_p->pc=*(unsigned int *)(cpu+0x40);\r
   m68k_set_reg(M68K_REG_SR, *(unsigned int *)(cpu+0x44));\r
-  context->sp[0]=*(unsigned int *)(cpu+0x48);\r
+  m68ki_cpu_p->sp[0]=*(unsigned int *)(cpu+0x48);\r
+  m68k_set_context(oldcontext);\r
 #endif\r
   return 0;\r
 }\r
@@ -161,7 +167,7 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;\r
   unsigned char head[32];\r
 \r
-  // testing\r
+  if (PicoMCD & 1)\r
   {\r
     if (PmovAction&1) return PicoCdSaveState(PmovFile);\r
     if (PmovAction&2) return PicoCdLoadState(PmovFile);\r