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

diff --git a/Pico/Area.c b/Pico/Area.c
index e4f680b..158c111 100644
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -63,11 +63,13 @@ int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
 #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];
+  m68k_set_context(oldcontext);
 #endif
 
   *(unsigned int *)(cpu+0x40)=pc;
@@ -94,11 +96,13 @@ int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
 #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);
+  m68k_set_context(oldcontext);
 #endif
   return 0;
 }