amalgamation

[picodrive.git] / Pico / Area.c

diff --git a/Pico/Area.c b/Pico/Area.c
index e4f680b..e62274a 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -42,7 +42,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
-int PicoAreaPackCpu(unsigned char *cpu, int is_sub)\r
+PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)\r
 {\r
   unsigned int pc=0;\r
 \r
@@ -52,6 +52,8 @@ int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   *(unsigned char *)(cpu+0x44)=(unsigned char)M68000_regs.ccr;\r
   *(unsigned char *)(cpu+0x45)=(unsigned char)M68000_regs.srh;\r
   *(unsigned int  *)(cpu+0x48)=M68000_regs.isp;\r
+  cpu[0x4c] = M68000_regs.irq;\r
+  // stop flag?\r
 #endif\r
 \r
 #ifdef EMU_C68K\r
@@ -60,21 +62,27 @@ int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   pc=context->pc-context->membase;\r
   *(unsigned int *)(cpu+0x44)=CycloneGetSr(context);\r
   *(unsigned int *)(cpu+0x48)=context->osp;\r
+  cpu[0x4c] = context->irq;\r
+  cpu[0x4d] = context->state_flags & 1;\r
 #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
+  cpu[0x4c] = CPU_INT_LEVEL>>8;\r
+  cpu[0x4d] = CPU_STOPPED;\r
+  m68k_set_context(oldcontext);\r
 #endif\r
 \r
   *(unsigned int *)(cpu+0x40)=pc;\r
   return 0;\r
 }\r
 \r
-int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)\r
+PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)\r
 {\r
 #ifdef EMU_A68K\r
   memcpy(M68000_regs.d,cpu,0x40);\r
@@ -82,6 +90,8 @@ int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   M68000_regs.ccr=*(unsigned char *)(cpu+0x44);\r
   M68000_regs.srh=*(unsigned char *)(cpu+0x45);\r
   M68000_regs.isp=*(unsigned int  *)(cpu+0x48);\r
+  M68000_regs.irq = cpu[0x4c];\r
+  // stop flag?\r
 #endif\r
 \r
 #ifdef EMU_C68K\r
@@ -91,14 +101,22 @@ int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   memcpy(context->d,cpu,0x40);\r
   context->membase=0;\r
   context->pc = context->checkpc(*(unsigned int *)(cpu+0x40)); // Base pc\r
+  context->irq = cpu[0x4c];\r
+  context->state_flags = 0;\r
+  if (cpu[0x4d])\r
+    context->state_flags |= 1;\r
 #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
+  CPU_INT_LEVEL = cpu[0x4c] << 8;\r
+  CPU_STOPPED = cpu[0x4d];\r
+  m68k_set_context(oldcontext);\r
 #endif\r
   return 0;\r
 }\r