Fix memory protection interrupt masking

Minor optimizations and clean up

Author: Extrems

include/ogc/irq.h

@@ -2,7 +2,7 @@
 
 irq.h -- Interrupt subsystem
 
-Copyright (C) 2004 - 2025
+Copyright (C) 2004 - 2026
 Michael Wiedenbauer (shagkur)
 Dave Murphy (WinterMute)
 Extrems' Corner.org
@@ -72,7 +72,7 @@ distribution.
 #endif
 #define IRQ_MAX				 32
 
-#define IRQMASK(irq)		 (0x80000000u>>irq)
+#define IRQMASK(irq)		 (0x80000000u>>(irq))
 
 #define IM_MEM0				 IRQMASK(IRQ_MEM0)
 #define IM_MEM1				 IRQMASK(IRQ_MEM1)

libogc/exi.c

@@ -2,7 +2,7 @@
 
 exi.c -- EXI subsystem
 
-Copyright (C) 2004 - 2025
+Copyright (C) 2004 - 2026
 Michael Wiedenbauer (shagkur)
 Dave Murphy (WinterMute)
 Extrems' Corner.org
@@ -130,9 +130,9 @@ static __inline__ void __exi_setinterrupts(s32 nChn,exibus_priv *exi)
 	printf("__exi_setinterrupts(%d,%p)\n",nChn,exi);
 #endif
 	if(nChn==EXI_CHANNEL_0) {
-		__MaskIrq((IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI2_EXI)));
+		__MaskIrq(IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI2_EXI));
 		if(!(exi->flags&EXI_FLAG_LOCKED) && (exi->CallbackEXI || pexi->CallbackEXI))
-			__UnmaskIrq((IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI2_EXI)));
+			__UnmaskIrq(IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI2_EXI));
 	} else if(nChn==EXI_CHANNEL_1) {
 		__MaskIrq(IRQMASK(IRQ_EXI1_EXI));
 		if(!(exi->flags&EXI_FLAG_LOCKED) && exi->CallbackEXI) __UnmaskIrq(IRQMASK(IRQ_EXI1_EXI));
@@ -227,7 +227,7 @@ static s32 __exi_attach(s32 nChn,EXICallback ext_cb)
 		if(__exi_probe(nChn)==1) {
 			__exi_clearirqs(nChn,1,0,0);
 			exi->CallbackEXT = ext_cb;
-			__UnmaskIrq(((IRQMASK(IRQ_EXI0_EXT))>>(nChn*3)));
+			__UnmaskIrq(IRQMASK(IRQ_EXI0_EXT)>>(nChn*3));
 			exi->flags |= EXI_FLAG_ATTACH;
 			ret = 1;
 		}
@@ -575,7 +575,7 @@ s32 EXI_Imm(s32 nChn,void *pData,u32 nLen,u32 nMode,EXICallback tc_cb)
 	exi->CallbackTC = tc_cb;
 	if(tc_cb) {
 		__exi_clearirqs(nChn,0,1,0);
-		__UnmaskIrq(IRQMASK((IRQ_EXI0_TC+(nChn*3))));
+		__UnmaskIrq(IRQMASK(IRQ_EXI0_TC)>>(nChn*3));
 	}
 	exi->flags |= EXI_FLAG_IMM;
 
@@ -632,7 +632,7 @@ s32 EXI_Dma(s32 nChn,void *pData,u32 nLen,u32 nMode,EXICallback tc_cb)
 	exi->CallbackTC = tc_cb;
 	if(tc_cb) {
 		__exi_clearirqs(nChn,0,1,0);
-		__UnmaskIrq((IRQMASK((IRQ_EXI0_TC+(nChn*3)))));
+		__UnmaskIrq(IRQMASK(IRQ_EXI0_TC)>>(nChn*3));
 	}
 	exi->flags |= EXI_FLAG_DMA;
 
@@ -923,7 +923,7 @@ s32 EXI_Detach(s32 nChn)
 		if(exi->flags&EXI_FLAG_LOCKED && exi->lockeddev==EXI_DEVICE_0) ret = 0;
 		else {
 			exi->flags &= ~EXI_FLAG_ATTACH;
-			__MaskIrq(((IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI0_EXT))>>(nChn*3)));
+			__MaskIrq((IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI0_EXT))>>(nChn*3));
 		}
 	}
 	_CPU_ISR_Restore(level);
@@ -1081,7 +1081,7 @@ void __ext_irq_handler(u32 nIrq,frame_context *pCtx)
 
 	exi = &eximap[chan];
 	exi->flags &= ~EXI_FLAG_ATTACH;
-	__MaskIrq(((IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI0_EXT))>>(chan*3)));
+	__MaskIrq((IRQMASK(IRQ_EXI0_EXI)|IRQMASK(IRQ_EXI0_EXT))>>(chan*3));
 
 	cb = exi->CallbackEXT;
 #ifdef _EXI_DEBUG

libogc/system.c

@@ -135,7 +135,6 @@ void __SYS_ReadROM(void *buf,u32 len,u32 offset);
 
 static s32 __sram_sync(void);
 static s32 __sram_writecallback(s32 chn,s32 dev);
-static s32 __mem_onreset(s32 final);
 
 extern void __lwp_thread_coreinit(void);
 extern void __lwp_sysinit(void);
@@ -223,6 +222,8 @@ static const u32 _dsp_initcode[] =
 	0x02FF02FF,0x00000000,0x00000000,0x00000000
 };
 
+static s32 __mem_onreset(s32 final);
+
 static sys_resetinfo mem_resetinfo = {
 	{},
 	__mem_onreset,
@@ -283,7 +284,7 @@ static s32 __mem_onreset(s32 final)
 {
 	if(final==TRUE) {
 		_memReg[8] = 255;
-		__UnmaskIrq(IM_MEM0|IM_MEM1|IM_MEM2|IM_MEM3);
+		__MaskIrq(IM_MEM0|IM_MEM1|IM_MEM2|IM_MEM3);
 	}
 	return 1;
 }
@@ -452,7 +453,7 @@ static void __memprotect_init(void)
 
 	_CPU_ISR_Disable(level);
 
-	__MaskIrq((IM_MEM0|IM_MEM1|IM_MEM2|IM_MEM3));
+	__MaskIrq(IM_MEM0|IM_MEM1|IM_MEM2|IM_MEM3);
 
 	_memReg[16] = 0;
 	_memReg[8] = 255;
@@ -1427,16 +1428,16 @@ void SYS_ProtectRange(u32 chan,void *addr,u32 bytes,u32 cntrl)
 
 		_CPU_ISR_Disable(level);
 
-		__UnmaskIrq(IRQMASK(chan));
+		__MaskIrq(IRQMASK(IRQ_MEM0+chan));
 		_memReg[chan<<2] = _SHIFTR(pstart,10,16);
 		_memReg[(chan<<2)+1] = _SHIFTR(pend,10,16);
 
 		rcntrl = _memReg[8];
 		rcntrl = (rcntrl&~(_SHIFTL(3,(chan<<1),2)))|(_SHIFTL(cntrl,(chan<<1),2));
 		_memReg[8] = rcntrl;
 
-		if(cntrl==SYS_PROTECTRDWR)
-			__MaskIrq(IRQMASK(chan));
+		if(cntrl!=SYS_PROTECTRDWR)
+			__UnmaskIrq(IRQMASK(IRQ_MEM0+chan));
 
 		_CPU_ISR_Restore(level);
 	}