X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=e62274af6b0dfbe9592792fac2b97267bf8f6672;hb=e5f426aa2e86d56357b8af2795e73cc0c9b17e8f;hp=e4f680b1d85ec2c5bd0201de8ecb5bab200d7806;hpb=860c6322c346c8e2ec2a4626e79f26d8b0d23777;p=picodrive.git

diff --git a/Pico/Area.c b/Pico/Area.c
index e4f680b..e62274a 100644
--- 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);
 
 // Pack the cpu into a common format:
-int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
+PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
 {
   unsigned int pc=0;
 
@@ -52,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
@@ -60,21 +62,27 @@ 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;
   return 0;
 }
 
-int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
+PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
 {
 #ifdef EMU_A68K
   memcpy(M68000_regs.d,cpu,0x40);
@@ -82,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
@@ -91,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;
 }