From: notaz <notasas@gmail.com>
Date: Wed, 14 Oct 2009 14:46:38 +0000 (+0000)
Subject: 32x: change irq hadling, make it more drc friendly
X-Git-Tag: v1.85~234
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=commitdiff_plain;h=6add7875b54904ff2a6c4b49a1b6e82a3c888a6d

32x: change irq hadling, make it more drc friendly

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@816 be3aeb3a-fb24-0410-a615-afba39da0efa
---

diff --git a/cpu/sh2/compiler.c b/cpu/sh2/compiler.c
index 90f4ac7..332ba40 100644
--- a/cpu/sh2/compiler.c
+++ b/cpu/sh2/compiler.c
@@ -318,15 +318,16 @@ static void *sh2_translate(SH2 *sh2, block_desc *other_block)
     }
 
 end_op:
-    if (delayed_op == 1) {
+    if (delayed_op == 1)
       emit_move_r_r(SHR_PC, SHR_PPC);
-      break;
-    }
+
     if (test_irq && delayed_op != 2) {
       emith_pass_arg(1, sh2);
       emith_call(sh2_test_irq);
       break;
     }
+    if (delayed_op == 1)
+      break;
 
 #if (DRC_DEBUG & 2)
     host_dasm(tcache_dsm_ptr, (char *)tcache_ptr - (char *)tcache_dsm_ptr);
@@ -372,8 +373,13 @@ void __attribute__((noinline)) sh2_drc_dispatcher(SH2 *sh2)
 {
   while (((signed int)sh2->sr >> 12) > 0)
   {
-    block_desc *bd = HASH_FUNC(sh2->pc_hashtab, sh2->pc);
     void *block = NULL;
+    block_desc *bd;
+
+    // FIXME: must avoid doing it so often..
+    sh2_test_irq(sh2);
+
+    bd = HASH_FUNC(sh2->pc_hashtab, sh2->pc);
 
     if (bd != NULL) {
       if (bd->addr == sh2->pc)
@@ -407,10 +413,16 @@ void sh2_execute(SH2 *sh2, int cycles)
 
 static void __attribute__((regparm(1))) sh2_test_irq(SH2 *sh2)
 {
-  if (sh2->pending_irl > sh2->pending_int_irq)
-    sh2_irl_irq(sh2, sh2->pending_irl);
-  else
-    sh2_internal_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
+  if (sh2->pending_level > ((sh2->sr >> 4) & 0x0f))
+  {
+    if (sh2->pending_irl > sh2->pending_int_irq)
+      sh2_do_irq(sh2, sh2->pending_irl, 64 + sh2->pending_irl/2);
+    else {
+      sh2_do_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
+      sh2->pending_int_irq = 0; // auto-clear
+      sh2->pending_level = sh2->pending_irl;
+    }
+  }
 }
 
 int sh2_drc_init(SH2 *sh2)
diff --git a/cpu/sh2/mame/sh2pico.c b/cpu/sh2/mame/sh2pico.c
index 79264ac..0ed1397 100644
--- a/cpu/sh2/mame/sh2pico.c
+++ b/cpu/sh2/mame/sh2pico.c
@@ -48,6 +48,18 @@ void sh2_execute(SH2 *sh2_, int cycles)
 	{
 		UINT32 opcode;
 
+		if (sh2->test_irq && !sh2->delay && sh2->pending_level > ((sh2->sr >> 4) & 0x0f))
+		{
+			if (sh2->pending_irl > sh2->pending_int_irq)
+				sh2_do_irq(sh2, sh2->pending_irl, 64 + sh2->pending_irl/2);
+			else {
+				sh2_do_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
+				sh2->pending_int_irq = 0; // auto-clear
+				sh2->pending_level = sh2->pending_irl;
+			}
+			sh2->test_irq = 0;
+		}
+
 		if (sh2->delay)
 		{
 			sh2->ppc = sh2->delay;
@@ -83,14 +95,6 @@ void sh2_execute(SH2 *sh2_, int cycles)
 		default: op1111(opcode); break;
 		}
 
-		if (sh2->test_irq && !sh2->delay)
-		{
-			if (sh2->pending_irl > sh2->pending_int_irq)
-				sh2_irl_irq(sh2, sh2->pending_irl);
-			else
-				sh2_internal_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
-			sh2->test_irq = 0;
-		}
 		sh2->icount--;
 	}
 	while (sh2->icount > 0 || sh2->delay);	/* can't interrupt before delay */
diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c
index 8ba5673..87343b0 100644
--- a/cpu/sh2/sh2.c
+++ b/cpu/sh2/sh2.c
@@ -32,7 +32,7 @@ void sh2_reset(SH2 *sh2)
 	sh2->pending_int_irq = 0;
 }
 
-static void sh2_do_irq(SH2 *sh2, int level, int vector)
+void sh2_do_irq(SH2 *sh2, int level, int vector)
 {
 	sh2->irq_callback(sh2->is_slave, level);
 
@@ -55,20 +55,23 @@ static void sh2_do_irq(SH2 *sh2, int level, int vector)
 void sh2_irl_irq(SH2 *sh2, int level)
 {
 	sh2->pending_irl = level;
-	if (level <= ((sh2->sr >> 4) & 0x0f))
-		return;
+	if (level > sh2->pending_int_irq)
+		sh2->pending_level = level;
+	else
+		sh2->pending_level = sh2->pending_int_irq;
 
-	sh2_do_irq(sh2, level, 64 + level/2);
+	sh2->test_irq = 1;
 }
 
 void sh2_internal_irq(SH2 *sh2, int level, int vector)
 {
+	// FIXME: multiple internal irqs not handled..
+	// assuming internal irqs never clear until accepted
 	sh2->pending_int_irq = level;
 	sh2->pending_int_vector = vector;
-	if (level <= ((sh2->sr >> 4) & 0x0f))
-		return;
+	if (level > sh2->pending_level)
+		sh2->pending_level = level;
 
-	sh2_do_irq(sh2, level, vector);
-	sh2->pending_int_irq = 0; // auto-clear
+	sh2->test_irq = 1;
 }
 
diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index 975b077..33293b6 100644
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -31,6 +31,7 @@ typedef struct
 	void	**pc_hashtab;		// 70
 
 	// common
+	int	pending_level;		// MAX(pending_irl, pending_int_irq)
 	int	pending_irl;
 	int	pending_int_irq;	// internal irq
 	int	pending_int_vector;
@@ -48,6 +49,7 @@ void sh2_finish(SH2 *sh2);
 void sh2_reset(SH2 *sh2);
 void sh2_irl_irq(SH2 *sh2, int level);
 void sh2_internal_irq(SH2 *sh2, int level, int vector);
+void sh2_do_irq(SH2 *sh2, int level, int vector);
 
 void sh2_execute(SH2 *sh2, int cycles);
 
diff --git a/pico/pico_int.h b/pico/pico_int.h
index 90731bd..4804ad1 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -259,7 +259,7 @@ extern SH2 sh2s[2];
 #define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]
 #define sh2_gbr(c)    (c) ? ssh2.gbr : msh2.gbr
 #define sh2_vbr(c)    (c) ? ssh2.vbr : msh2.vbr
-#define sh2_sr(c)     (c) ? ssh2.sr : msh2.sr
+#define sh2_sr(c)   (((c) ? ssh2.sr : msh2.sr) & 0xfff)
 
 #define sh2_set_gbr(c, v) \
   { if (c) ssh2.gbr = v; else msh2.gbr = v; }