Merge pull request #94 from red031000/master

match OS_interrupt (finally)

6 files changed, 62 insertions, 101 deletions

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 9ae0d28a..5504c2dd 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -161,7 +161,6 @@ SECTIONS {
 		GX_asm.o (.text)
 		OS_irqHandler.o (.text)
 		OS_irqTable.o (.text)
-		OS_interrupt_asm.o (.text)
 		OS_interrupt.o (.text)
 		OS_spinLock.o (.text)
 		OS_printf.o (.text)
diff --git a/arm9/asm/OS_interrupt_asm.s b/arm9/asm/OS_interrupt_asm.s
deleted file mode 100644
index 7fdc1ccc..00000000
--- a/arm9/asm/OS_interrupt_asm.s
+++ /dev/null
@@ -1,95 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	arm_func_start OS_SetIrqStackChecker
-OS_SetIrqStackChecker: ; 0x020C9DAC
-	ldr ip, _020C9DD0 ; =0x027E0000
-	ldr r3, _020C9DD4 ; =0xFDDB597D
-	add r0, r12, #0x3000
-	ldr r2, _020C9DD8 ; =0x7BF9DD5B
-	ldr r1, _020C9DDC ; =0x00000400
-	str r3, [r0, #0xf7c]
-	add r0, r12, #0x3f80
-	str r2, [r0, -r1]
-	bx lr
-	.balign 4
-_020C9DD0: .word 0x027E0000
-_020C9DD4: .word 0xFDDB597D
-_020C9DD8: .word 0x7BF9DD5B
-_020C9DDC: .word 0x00000400
-
-	arm_func_start OS_ResetRequestIrqMask
-OS_ResetRequestIrqMask: ; 0x020C9DE0
-	ldr ip, _020C9E0C ; =0x04000208
-	mov r1, #0x0
-	ldrh r3, [r12, #0x0]
-	ldr r2, _020C9E10 ; =0x04000214
-	strh r1, [r12, #0x0]
-	ldr r1, [r2, #0x0]
-	str r0, [r2, #0x0]
-	ldrh r0, [r12, #0x0]
-	mov r0, r1
-	strh r3, [r12, #0x0]
-	bx lr
-	.balign 4
-_020C9E0C: .word 0x04000208
-_020C9E10: .word 0x04000214
-
-	arm_func_start OS_DisableIrqMask
-OS_DisableIrqMask: ; 0x020C9E14
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	ldr lr, _020C9E54 ; =0x04000208
-	mov r3, #0x0
-	ldrh r12, [lr, #0x0]
-	ldr r2, _020C9E58 ; =0x04000210
-	mvn r1, r0
-	strh r3, [lr, #0x0]
-	ldr r0, [r2, #0x0]
-	and r1, r0, r1
-	str r1, [r2, #0x0]
-	ldrh r1, [lr, #0x0]
-	strh r12, [lr, #0x0]
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-	.balign 4
-_020C9E54: .word 0x04000208
-_020C9E58: .word 0x04000210
-
-	arm_func_start OS_EnableIrqMask
-OS_EnableIrqMask: ; 0x020C9E5C
-	ldr ip, _020C9E8C ; =0x04000208
-	mov r1, #0x0
-	ldrh r3, [r12, #0x0]
-	ldr r2, _020C9E90 ; =0x04000210
-	strh r1, [r12, #0x0]
-	ldr r1, [r2, #0x0]
-	orr r0, r1, r0
-	str r0, [r2, #0x0]
-	ldrh r0, [r12, #0x0]
-	mov r0, r1
-	strh r3, [r12, #0x0]
-	bx lr
-	.balign 4
-_020C9E8C: .word 0x04000208
-_020C9E90: .word 0x04000210
-
-	arm_func_start OS_SetIrqMask
-OS_SetIrqMask: ; 0x020C9E94
-	ldr ip, _020C9EC0 ; =0x04000208
-	mov r1, #0x0
-	ldrh r3, [r12, #0x0]
-	ldr r2, _020C9EC4 ; =0x04000210
-	strh r1, [r12, #0x0]
-	ldr r1, [r2, #0x0]
-	str r0, [r2, #0x0]
-	ldrh r0, [r12, #0x0]
-	mov r0, r1
-	strh r3, [r12, #0x0]
-	bx lr
-	.balign 4
-_020C9EC0: .word 0x04000208
-_020C9EC4: .word 0x04000210
diff --git a/arm9/lib/include/OS_interrupt.h b/arm9/lib/include/OS_interrupt.h
index 21ce2ea0..21ae8079 100644
--- a/arm9/lib/include/OS_interrupt.h
+++ b/arm9/lib/include/OS_interrupt.h
@@ -26,5 +26,10 @@ void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function);
 OSIrqFunction OS_GetIrqFunction(OSIrqMask intrBit);
 void OSi_EnterDmaCallback(u32 dmaNo, void (*callback) (void *), void *arg);
 void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), void *arg);
+OSIrqMask OS_SetIrqMask(OSIrqMask mask);
+OSIrqMask OS_EnableIrqMask(OSIrqMask mask);
+OSIrqMask OS_DisableIrqMask(OSIrqMask mask);
+OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask);
+void OS_SetIrqStackChecker(void);
 
 #endif //POKEDIAMOND_OS_INTERRUPT_H
diff --git a/arm9/lib/src/OS_init.c b/arm9/lib/src/OS_init.c
index 7467c672..a1db8788 100644
--- a/arm9/lib/src/OS_init.c
+++ b/arm9/lib/src/OS_init.c
@@ -7,7 +7,6 @@
 
 extern void PXI_Init();
 extern void OS_InitLock();
-extern void OS_SetIrqStackChecker();
 extern void OS_InitException();
 extern void MI_Init();
 extern void OS_InitVAlarm();
diff --git a/arm9/lib/src/OS_interrupt.c b/arm9/lib/src/OS_interrupt.c
index 1fb43821..76deb069 100644
--- a/arm9/lib/src/OS_interrupt.c
+++ b/arm9/lib/src/OS_interrupt.c
@@ -10,7 +10,6 @@
 #pragma optimize_for_size on
 
 extern OSThreadQueue OSi_IrqThreadQueue;
-extern OSIrqMask OS_EnableIrqMask(OSIrqMask intr);
 
 ARM_FUNC void OS_InitIrqTable() {
     OS_InitThreadQueue(&OSi_IrqThreadQueue);
@@ -87,3 +86,58 @@ ARM_FUNC void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), voi
     (void)OS_EnableIrqMask(mask);
     OSi_IrqCallbackInfo[timerNo + 4].enable = TRUE;
 }
+
+ARM_FUNC OSIrqMask OS_SetIrqMask(OSIrqMask mask)
+{
+    u16 regIme = reg_OS_IME;
+    reg_OS_IME = 0;
+    OSIrqMask regIe = reg_OS_IE;
+    reg_OS_IE = mask;
+    u16 unused = reg_OS_IME; //needed because otherwise it doesn't match
+    reg_OS_IME = regIme;
+    return regIe;
+}
+
+ARM_FUNC OSIrqMask OS_EnableIrqMask(OSIrqMask mask)
+{
+    u16 regIme = reg_OS_IME;
+    reg_OS_IME = 0;
+    OSIrqMask regIe = reg_OS_IE;
+    reg_OS_IE = regIe | mask;
+    u16 unused = reg_OS_IME;
+    reg_OS_IME = regIme;
+    return regIe;
+}
+
+ARM_FUNC OSIrqMask OS_DisableIrqMask(OSIrqMask mask)
+{
+    u16 regIme = reg_OS_IME;
+    reg_OS_IME = 0;
+    OSIrqMask regIe = reg_OS_IE;
+    reg_OS_IE = regIe & ~mask;
+    u16 unused = reg_OS_IME;
+    reg_OS_IME = regIme;
+    return regIe;
+}
+
+ARM_FUNC OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask)
+{
+    u16 regIme = reg_OS_IME;
+    reg_OS_IME = 0;
+    OSIrqMask regIf = reg_OS_IF;
+    reg_OS_IF = mask;
+    u16 unused = reg_OS_IME;
+    reg_OS_IME = regIme;
+    return regIf;
+}
+
+extern void SDK_IRQ_STACKSIZE(void);
+
+#define OSi_IRQ_STACK_TOP               (HW_DTCM_SVC_STACK - ((s32)SDK_IRQ_STACKSIZE))
+#define OSi_IRQ_STACK_BOTTOM            HW_DTCM_SVC_STACK
+
+ARM_FUNC void OS_SetIrqStackChecker(void)
+{
+    *(u32 *)(OSi_IRQ_STACK_BOTTOM - sizeof(u32)) = 0xfddb597dUL;
+    *(u32 *)(OSi_IRQ_STACK_TOP) = 0x7bf9dd5bUL;
+}
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index c21d20ab..d4254ce3 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -6,6 +6,7 @@
 #include "OS_reset.h"
 #include "MB_mb.h"
 #include "OS_terminate_proc.h"
+#include "OS_interrupt.h"
 
 extern u16 OSi_IsInitReset;
 extern vu16 OSi_IsResetOccurred;
@@ -15,8 +16,6 @@ extern void PXI_SetFifoRecvCallback(u32 param1, void* callback);
 extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2);
 extern void CARD_LockRom(u16 lockId);
 extern void MI_StopDma(u32 dma);
-extern void OS_SetIrqMask(u32 mask);
-extern void OS_ResetRequestIrqMask(u32 mask);
 extern void OSi_DoResetSystem(); //in itcm, should technically be in this file
 
 ARM_FUNC void OS_InitReset() {
@@ -54,7 +53,7 @@ ARM_FUNC void OS_ResetSystem(u32 parameter) {
     MI_StopDma(1);
     MI_StopDma(2);
     MI_StopDma(3);
-    OS_SetIrqMask(0x40000);
+    (void)OS_SetIrqMask(0x40000);
     OS_ResetRequestIrqMask((u32)~0);
     *(u32 *)HW_RESET_PARAMETER_BUF = parameter;
     OSi_SendToPxi(OS_PXI_COMMAND_RESET);