X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=3749ac3232c43b200ad07729665726ad793091e1;hb=a4f0cc8647c019f149541df380a2d30e14aeb75c;hp=23d9af135eae239d5a62c3edf0c5b0a816b0f280;hpb=75736070161d40608ba3052b4c95b42943f9de3d;p=picodrive.git

diff --git a/Pico/Area.c b/Pico/Area.c
index 23d9af1..3749ac3 100644
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -22,10 +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;
-areaseek *areaSeek  = (areaseek *) 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
@@ -51,6 +52,8 @@ int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   *(unsigned char *)(cpu+0x44)=(unsigned char)M68000_regs.ccr;
   *(unsigned char *)(cpu+0x45)=(unsigned char)M68000_regs.srh;
   *(unsigned int  *)(cpu+0x48)=M68000_regs.isp;
+  cpu[0x4c] = M68000_regs.irq;
+  // stop flag?
 #endif
 
 #ifdef EMU_C68K
@@ -59,14 +62,20 @@ int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   pc=context->pc-context->membase;
   *(unsigned int *)(cpu+0x44)=CycloneGetSr(context);
   *(unsigned int *)(cpu+0x48)=context->osp;
+  cpu[0x4c] = context->irq;
+  cpu[0x4d] = context->state_flags & 1;
 #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];
+  cpu[0x4c] = CPU_INT_LEVEL>>8;
+  cpu[0x4d] = CPU_STOPPED;
+  m68k_set_context(oldcontext);
 #endif
 
   *(unsigned int *)(cpu+0x40)=pc;
@@ -81,6 +90,8 @@ int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   M68000_regs.ccr=*(unsigned char *)(cpu+0x44);
   M68000_regs.srh=*(unsigned char *)(cpu+0x45);
   M68000_regs.isp=*(unsigned int  *)(cpu+0x48);
+  M68000_regs.irq = cpu[0x4c];
+  // stop flag?
 #endif
 
 #ifdef EMU_C68K
@@ -90,14 +101,22 @@ int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   memcpy(context->d,cpu,0x40);
   context->membase=0;
   context->pc = context->checkpc(*(unsigned int *)(cpu+0x40)); // Base pc
+  context->irq = cpu[0x4c];
+  context->state_flags = 0;
+  if (cpu[0x4d])
+    context->state_flags |= 1;
 #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);
+  CPU_INT_LEVEL = cpu[0x4c] << 8;
+  CPU_STOPPED = cpu[0x4d];
+  m68k_set_context(oldcontext);
 #endif
   return 0;
 }