From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Mon, 21 May 2007 18:08:36 +0000 (+0000)
Subject: Fix interrupt controller address masking
X-Git-Tag: release_0_9_1~1053
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6fdf5fca0149fbc2d05d8d5ad43e3686c37514e;p=thirdparty%2Fqemu.git

Fix interrupt controller address masking


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2844 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 94a6c965c40..2d1f6552e00 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -58,7 +58,8 @@ typedef struct SLAVIO_INTCTLState {
 } SLAVIO_INTCTLState;
 
 #define INTCTL_MAXADDR 0xf
-#define INTCTLM_MAXADDR 0xf
+#define INTCTLM_MAXADDR 0x13
+#define INTCTLM_MASK 0x1f
 static void slavio_check_interrupts(void *opaque);
 
 // per-cpu interrupt controller
@@ -143,7 +144,7 @@ static void slavio_intctlm_mem_writel(void *opaque, target_phys_addr_t addr, uin
     SLAVIO_INTCTLState *s = opaque;
     uint32_t saddr;
 
-    saddr = (addr & INTCTLM_MAXADDR) >> 2;
+    saddr = (addr & INTCTLM_MASK) >> 2;
     switch (saddr) {
     case 2: // clear (enable)
 	// Force clear unused bits