X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=35f28c284860fd9d725f0881f06ae45479793c5c;hb=6a13ef3f56a80ac698d463f5d00235ea2a090f52;hp=49c2afcdf073cf5c2a868545ca05ed23b3edc70e;hpb=2aa27095f2dbf5b38950fcb1f856d5ffc6a70361;p=picodrive.git

diff --git a/Pico/Area.c b/Pico/Area.c
index 49c2afc..35f28c2 100644
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -62,7 +62,7 @@ PICO_INTERNAL void PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   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)=m68ki_cpu_p->sp[0];
+  *(unsigned int  *)(cpu+0x48)=m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET];
   cpu[0x4c] = CPU_INT_LEVEL>>8;
   cpu[0x4d] = CPU_STOPPED;
   m68k_set_context(oldcontext);
@@ -95,10 +95,10 @@ PICO_INTERNAL void PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
 #elif defined(EMU_M68K)
   void *oldcontext = m68ki_cpu_p;
   m68k_set_context(is_sub ? &PicoCpuMS68k : &PicoCpuMM68k);
+  m68k_set_reg(M68K_REG_SR, *(unsigned int *)(cpu+0x44));
   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));
-  m68ki_cpu_p->sp[0]=*(unsigned int *)(cpu+0x48);
+  m68ki_cpu_p->sp[m68ki_cpu_p->s_flag^SFLAG_SET]=*(unsigned int *)(cpu+0x48);
   CPU_INT_LEVEL = cpu[0x4c] << 8;
   CPU_STOPPED = cpu[0x4d];
   m68k_set_context(oldcontext);