32x and sms savestates. Core-independent z80 state. SS bugfixing/refactoring.

[picodrive.git] / cpu / sh2 / sh2.c

diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c
index a873d18..0e6be67 100644 (file)
--- a/cpu/sh2/sh2.c
+++ b/cpu/sh2/sh2.c
@@ -1,4 +1,6 @@
 #include <string.h>
+#include <stddef.h>
+
 #include "sh2.h"
 #include "../debug.h"
 #include "compiler.h"
@@ -54,15 +56,23 @@ void sh2_do_irq(SH2 *sh2, int level, int vector)
 //     sh2->icount -= 13;
 }
 
-void sh2_irl_irq(SH2 *sh2, int level)
+void sh2_irl_irq(SH2 *sh2, int level, int nested_call)
 {
        sh2->pending_irl = level;
-       if (level > sh2->pending_int_irq)
-               sh2->pending_level = level;
-       else
-               sh2->pending_level = sh2->pending_int_irq;
+       if (level < sh2->pending_int_irq)
+               level = sh2->pending_int_irq;
+       sh2->pending_level = level;
 
-       sh2->test_irq = 1;
+       if (!nested_call) {
+               // not in memhandler, so handle this now (recompiler friendly)
+               // do this to avoid missing irqs that other SH2 might clear
+               if (level > ((sh2->sr >> 4) & 0x0f)) {
+                       int vector = sh2->irq_callback(sh2, level);
+                       sh2_do_irq(sh2, level, vector);
+               }
+       }
+       else
+               sh2->test_irq = 1;
 }
 
 void sh2_internal_irq(SH2 *sh2, int level, int vector)
@@ -77,3 +87,31 @@ void sh2_internal_irq(SH2 *sh2, int level, int vector)
        sh2->test_irq = 1;
 }
 
+#define SH2_REG_SIZE (offsetof(SH2, macl) + sizeof(sh2->macl))
+
+void sh2_pack(const SH2 *sh2, unsigned char *buff)
+{
+       unsigned int *p;
+
+       memcpy(buff, sh2, SH2_REG_SIZE);
+       p = (void *)(buff + SH2_REG_SIZE);
+
+       p[0] = sh2->pending_int_irq;
+       p[1] = sh2->pending_int_vector;
+       p[2] = sh2->cycles_aim;
+       p[3] = sh2->cycles_done;
+}
+
+void sh2_unpack(SH2 *sh2, const unsigned char *buff)
+{
+       unsigned int *p;
+
+       memcpy(sh2, buff, SH2_REG_SIZE);
+       p = (void *)(buff + SH2_REG_SIZE);
+
+       sh2->pending_int_irq = p[0];
+       sh2->pending_int_vector = p[1];
+       sh2->cycles_aim = p[2];
+       sh2->cycles_done = p[3];
+}
+