Fix master interrupt register masking

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

diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index f7a35bb823419758635cc1130ac7370b18e15ad7..af9cdf153a2cb0ad732ce815812940bb78deed64 100644 (file)
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -68,7 +68,7 @@ typedef struct SLAVIO_INTCTLState {
 #define INTCTLM_MAXADDR 0x13
 #define INTCTLM_SIZE (INTCTLM_MAXADDR + 1)
 #define INTCTLM_MASK 0x1f
-#define MASTER_IRQ_MASK ~0x4fb2007f
+#define MASTER_IRQ_MASK ~0x0fa2007f
 #define MASTER_DISABLE 0x80000000
 #define CPU_IRQ_MASK 0xfffe0000
 #define CPU_IRQ_INT15_IN 0x0004000
@@ -151,7 +151,7 @@ static uint32_t slavio_intctlm_mem_readl(void *opaque, target_phys_addr_t addr)
         ret = s->intregm_pending & ~MASTER_DISABLE;
         break;
     case 1:
-        ret = s->intregm_disabled;
+        ret = s->intregm_disabled & MASTER_IRQ_MASK;
         break;
     case 4:
         ret = s->target_cpu;