svp compiler: block ref counter version

[picodrive.git] / Pico / Area.c

diff --git a/Pico/Area.c b/Pico/Area.c
index 41ee68b..68d7c7c 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -71,7 +71,7 @@ PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   *(unsigned int  *)(cpu+0x44)=context->sr;\r
   *(unsigned int  *)(cpu+0x48)=context->asp;\r
   cpu[0x4c] = context->interrupts[0];\r
-  cpu[0x4d] = (context->execinfo & M68K_HALTED) ? 1 : 0;\r
+  cpu[0x4d] = (context->execinfo & FM68K_HALTED) ? 1 : 0;\r
 #endif\r
 \r
   *(unsigned int *)(cpu+0x40)=pc;\r
@@ -108,8 +108,8 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   context->sr =*(unsigned int *)(cpu+0x44);\r
   context->asp=*(unsigned int *)(cpu+0x48);\r
   context->interrupts[0] = cpu[0x4c];\r
-  context->execinfo &= ~M68K_HALTED;\r
-  if (cpu[0x4d]&1) context->execinfo |= M68K_HALTED;\r
+  context->execinfo &= ~FM68K_HALTED;\r
+  if (cpu[0x4d]&1) context->execinfo |= FM68K_HALTED;\r
 #endif\r
   return 0;\r
 }\r
@@ -174,7 +174,7 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;\r
   unsigned char head[32];\r
 \r
-  if (PicoMCD & 1)\r
+  if ((PicoMCD & 1) || carthw_chunks != NULL)\r
   {\r
     if (PmovAction&1) return PicoCdSaveState(PmovFile);\r
     if (PmovAction&2) return PicoCdLoadState(PmovFile);\r