final fixes for UIQ3

[picodrive.git] / Pico / Area.c

diff --git a/Pico/Area.c b/Pico/Area.c
index 293c261..35f28c2 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -44,7 +44,7 @@ static int ScanVar(void *data,int len,char *name,void *PmovFile,int PmovAction)
 #define SCANP(x)      ScanVar(&Pico.x,sizeof(Pico.x),#x,PmovFile,PmovAction);\r
 \r
 // Pack the cpu into a common format:\r
-PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)\r
+PICO_INTERNAL void PicoAreaPackCpu(unsigned char *cpu, int is_sub)\r
 {\r
   unsigned int pc=0;\r
 \r
@@ -62,7 +62,7 @@ PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   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)=m68ki_cpu_p->sp[0];\r
+  *(unsigned int  *)(cpu+0x48)=m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET];\r
   cpu[0x4c] = CPU_INT_LEVEL>>8;\r
   cpu[0x4d] = CPU_STOPPED;\r
   m68k_set_context(oldcontext);\r
@@ -77,10 +77,9 @@ PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
 #endif\r
 \r
   *(unsigned int *)(cpu+0x40)=pc;\r
-  return 0;\r
 }\r
 \r
-PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)\r
+PICO_INTERNAL void PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)\r
 {\r
 #if defined(EMU_C68K)\r
   struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
@@ -96,10 +95,10 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
 #elif defined(EMU_M68K)\r
   void *oldcontext = m68ki_cpu_p;\r
   m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\r
+  m68k_set_reg(M68K_REG_SR, *(unsigned int *)(cpu+0x44));\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
-  m68ki_cpu_p->sp[0]=*(unsigned int *)(cpu+0x48);\r
+  m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET]=*(unsigned int *)(cpu+0x48);\r
   CPU_INT_LEVEL = cpu[0x4c] << 8;\r
   CPU_STOPPED = cpu[0x4d];\r
   m68k_set_context(oldcontext);\r
@@ -113,7 +112,6 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   context->execinfo &= ~FM68K_HALTED;\r
   if (cpu[0x4d]&1) context->execinfo |= FM68K_HALTED;\r
 #endif\r
-  return 0;\r
 }\r
 \r
 // Scan the contents of the virtual machine's memory for saving or loading\r
@@ -145,8 +143,7 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
     SCAN_VAR(Pico.m    ,"misc")\r
     SCAN_VAR(Pico.video,"video")\r
 \r
-    // notaz: save/load z80, YM2612, sn76496 states instead of Pico.s (which is unused anyway)\r
-    if(PicoOpt&7) {\r
+    if (PicoOpt&7) {\r
       if((PmovAction&3)==1) z80_pack(cpu_z80);\r
       ret = SCAN_VAR(cpu_z80,"cpu_z80")\r
       // do not unpack if we fail to load z80 state\r
@@ -155,11 +152,12 @@ static int PicoAreaScan(int PmovAction,unsigned int ver, void *PmovFile)
         else    z80_unpack(cpu_z80);\r
       }\r
     }\r
-    if(PicoOpt&3)\r
+    if (PicoOpt&3)\r
       ScanVar(sn76496_regs,28*4,"SN76496state", PmovFile, PmovAction); // regs and other stuff\r
-    if(PicoOpt&1) {\r
+    if (PicoOpt&1) {\r
+      if((PmovAction&3)==1) ym2612_pack_state();\r
       ScanVar(ym2612_regs, 0x200+4, "YM2612state", PmovFile, PmovAction); // regs + addr line\r
-      if((PmovAction&3)==2) YM2612PicoStateLoad(); // reload YM2612 state from it's regs\r
+      if((PmovAction&3)==2) ym2612_unpack_state(); // reload YM2612 state from it's regs\r
     }\r
   }\r
 \r
@@ -175,7 +173,7 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;\r
   unsigned char head[32];\r
 \r
-  if ((PicoMCD & 1) || carthw_chunks != NULL)\r
+  if ((PicoAHW & PAHW_MCD) || carthw_chunks != NULL)\r
   {\r
     if (PmovAction&1) return PicoCdSaveState(PmovFile);\r
     if (PmovAction&2) {\r