Split and match OSContext/Error/Interrupt

config/G2ME01/splits.txt

@@ -175,6 +175,15 @@ Dolphin/os/OSCache.c:
 
 Dolphin/os/OSContext.c:
 	.text       start:0x8036F514 end:0x8036FCF8
+	.data       start:0x803BE9E0 end:0x803BEBB8
 
 Dolphin/os/OSError.c:
 	.text       start:0x8036FCF8 end:0x803703A4
+	.data       start:0x803BEBB8 end:0x803BEED8
+	.bss        start:0x803E18F0 end:0x803E1938
+	.sdata      start:0x80418E08 end:0x80418E10
+
+Dolphin/os/OSInterrupt.c:
+	.text       start:0x80372520 end:0x80372D8C
+	.data       start:0x803BF9F8 end:0x803BFA28
+	.sbss       start:0x80419FC0 end:0x80419FD8

config/G2ME01/symbols.txt

@@ -16259,15 +16259,17 @@ fn_80372004 = .text:0x80372004; // type:function size:0x140
 fn_80372144 = .text:0x80372144; // type:function size:0x13C align:4
 fn_80372280 = .text:0x80372280; // type:function size:0x2A0
 OSDisableInterrupts = .text:0x80372520; // type:function size:0x14 scope:global
+__RAS_OSDisableInterrupts_begin = .text:0x80372520; // type:label scope:global
+__RAS_OSDisableInterrupts_end = .text:0x8037252C; // type:label scope:global
 OSEnableInterrupts = .text:0x80372534; // type:function size:0x14 scope:global
 OSRestoreInterrupts = .text:0x80372548; // type:function size:0x24 scope:global
 __OSSetInterruptHandler = .text:0x8037256C; // type:function size:0x1C scope:global
-fn_80372588 = .text:0x80372588; // type:function size:0x14
+__OSGetInterruptHandler = .text:0x80372588; // type:function size:0x14
 __OSInterruptInit = .text:0x8037259C; // type:function size:0x74 scope:global
-fn_80372610 = .text:0x80372610; // type:function size:0x2D8
+SetInterruptMask = .text:0x80372610; // type:function size:0x2D8
 __OSMaskInterrupts = .text:0x803728E8; // type:function size:0x88 scope:global
 __OSUnmaskInterrupts = .text:0x80372970; // type:function size:0x88 scope:global
-fn_803729F8 = .text:0x803729F8; // type:function size:0x344
+__OSDispatchInterrupt = .text:0x803729F8; // type:function size:0x344
 ExternalInterruptHandler = .text:0x80372D3C; // type:function size:0x50 scope:local
 fn_80372D8C = .text:0x80372D8C; // type:function size:0x4
 fn_80372D90 = .text:0x80372D90; // type:function size:0x4
@@ -18735,14 +18737,14 @@ jumptable_803BE494 = .data:0x803BE494; // type:object size:0x90 scope:local
 ResetFunctionInfo = .data:0x803BE720; // type:object size:0x10 scope:local
 DSPInitCode = .data:0x803BE730; // type:object size:0x80 scope:local
 @69 = .data:0x803BE7B0; // type:object size:0x29 scope:local data:string_table
-lbl_803BE9E0 = .data:0x803BE9E0; // type:object size:0x1B4
-@74 = .data:0x803BEB94; // type:object size:0x23 scope:local data:string
-@13 = .data:0x803BEBB8; // type:object size:0x16 scope:local data:string
+...data.0 = .data:0x803BE9E0; // type:object size:0x1B4 scope:local data:string_table
+@76 = .data:0x803BEB94; // type:object size:0x23 scope:local data:string
+...data.0 = .data:0x803BEBB8; // type:object size:0x16 scope:local data:string
 @87 = .data:0x803BEE94; // type:object size:0x40 scope:local
 lbl_803BEED8 = .data:0x803BEED8; // type:object size:0x10
 lbl_803BEEE8 = .data:0x803BEEE8; // type:object size:0x180
 lbl_803BF068 = .data:0x803BF068; // type:object size:0x990
-lbl_803BF9F8 = .data:0x803BF9F8; // type:object size:0x30 data:4byte
+InterruptPrioTable = .data:0x803BF9F8; // type:object size:0x2C scope:local data:4byte
 lbl_803BFA28 = .data:0x803BFA28; // type:object size:0x28
 lbl_803BFA50 = .data:0x803BFA50; // type:object size:0x28
 ResetFunctionInfo = .data:0x803BFA78; // type:object size:0x10 scope:local
@@ -20120,7 +20122,7 @@ __OSVersion = .sdata:0x80418DF0; // type:object size:0x4 scope:global data:4byte
 @116 = .sdata:0x80418DF4; // type:object size:0x6 scope:local data:string
 lbl_80418DFC = .sdata:0x80418DFC; // type:object size:0x4 data:string
 __OSArenaLo = .sdata:0x80418E00; // type:object size:0x4 scope:local data:4byte
-lbl_80418E08 = .sdata:0x80418E08; // type:object size:0x4 data:4byte
+__OSFpscrEnableBits = .sdata:0x80418E08; // type:object size:0x4 data:4byte
 @76 = .sdata:0x80418E0C; // type:object size:0x2 scope:local data:string
 lbl_80418E10 = .sdata:0x80418E10; // type:object size:0x8
 lbl_80418E18 = .sdata:0x80418E18; // type:object size:0x8

configure.py

@@ -309,8 +309,9 @@ def Rel(lib_name, objects):
         "os",
         [
             Object(Matching, "Dolphin/os/OSCache.c"),
-            Object(NonMatching, "Dolphin/os/OSContext.c"),
-            Object(NonMatching, "Dolphin/os/OSError.c"),
+            Object(Matching, "Dolphin/os/OSContext.c"),
+            Object(Matching, "Dolphin/os/OSError.c"),
+            Object(Matching, "Dolphin/os/OSInterrupt.c"),
         ],
     ),
     # Begin RELs