FAME integration finished, some adjustments of CPU core stuff

[picodrive.git] / Pico / Area.c

diff --git a/Pico/Area.c b/Pico/Area.c
index e62274a..41ee68b 100644 (file)
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -46,29 +46,17 @@ PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
 {\r
   unsigned int pc=0;\r
 \r
-#ifdef EMU_A68K\r
-  memcpy(cpu,M68000_regs.d,0x40);\r
-  pc=M68000_regs.pc;\r
-  *(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
-  struct Cyclone *context = is_sub ? &PicoCpuS68k : &PicoCpu;\r
+#if defined(EMU_C68K)\r
+  struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
   memcpy(cpu,context->d,0x40);\r
   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
+#elif defined(EMU_M68K)\r
   void *oldcontext = m68ki_cpu_p;\r
-  m68k_set_context(is_sub ? &PicoS68kCPU : &PicoM68kCPU);\r
+  m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\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
@@ -76,6 +64,14 @@ PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   cpu[0x4c] = CPU_INT_LEVEL>>8;\r
   cpu[0x4d] = CPU_STOPPED;\r
   m68k_set_context(oldcontext);\r
+#elif defined(EMU_F68K)\r
+  M68K_CONTEXT *context = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
+  memcpy(cpu,context->dreg,0x40);\r
+  pc=context->pc;\r
+  *(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
 #endif\r
 \r
   *(unsigned int *)(cpu+0x40)=pc;\r
@@ -84,20 +80,10 @@ PICO_INTERNAL int PicoAreaPackCpu(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
-  M68000_regs.pc=pc;\r
-  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
-  struct Cyclone *context = is_sub ? &PicoCpuS68k : &PicoCpu;\r
-  CycloneSetSr(context, *(unsigned int  *)(cpu+0x44));\r
-  context->osp=*(unsigned int  *)(cpu+0x48);\r
+#if defined(EMU_C68K)\r
+  struct Cyclone *context = is_sub ? &PicoCpuCS68k : &PicoCpuCM68k;\r
+  CycloneSetSr(context, *(unsigned int *)(cpu+0x44));\r
+  context->osp=*(unsigned int *)(cpu+0x48);\r
   memcpy(context->d,cpu,0x40);\r
   context->membase=0;\r
   context->pc = context->checkpc(*(unsigned int *)(cpu+0x40)); // Base pc\r
@@ -105,11 +91,9 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   context->state_flags = 0;\r
   if (cpu[0x4d])\r
     context->state_flags |= 1;\r
-#endif\r
-\r
-#ifdef EMU_M68K\r
+#elif defined(EMU_M68K)\r
   void *oldcontext = m68ki_cpu_p;\r
-  m68k_set_context(is_sub ? &PicoS68kCPU : &PicoM68kCPU);\r
+  m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);\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
@@ -117,6 +101,15 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   CPU_INT_LEVEL = cpu[0x4c] << 8;\r
   CPU_STOPPED = cpu[0x4d];\r
   m68k_set_context(oldcontext);\r
+#elif defined(EMU_F68K)\r
+  M68K_CONTEXT *context = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
+  memcpy(context->dreg,cpu,0x40);\r
+  context->pc =*(unsigned int *)(cpu+0x40);\r
+  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
 #endif\r
   return 0;\r
 }\r