X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=158c1115e6df8e7431fff746232db91a2ecdc144;hb=83bd0b76aba19ff62368cfee76089e15579e3b7c;hp=5ae50e86a6350f30ae736fbbe09dc0e53f8bb799;hpb=51a902ae2512cffdb3ac7751988c1bde4a641be4;p=picodrive.git

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