From 504c4d129443673ccabdc12892f0d96b9f6aa338 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 4 Oct 2020 17:42:40 +1000 Subject: [PATCH] Identify some libultra variables --- src/game/data/data_000000.c | 22 +++++------ src/gvars/gvars.c | 32 +++++++-------- src/include/game/data/data_000000.h | 14 +++---- src/include/gvars/gvars.h | 30 +++++++------- src/lib/lib_159b0.c | 8 ++-- src/lib/lib_4e270.c | 4 +- src/lib/ultra/io/conteeplongwrite.c | 12 +++--- src/lib/ultra/io/conteepread.c | 24 ++++++------ src/lib/ultra/io/conteepwrite.c | 40 +++++++++---------- src/lib/ultra/io/contramread.c | 4 +- src/lib/ultra/io/contramwrite.c | 4 +- src/lib/ultra/io/controller.c | 16 ++++---- src/lib/ultra/io/epirawdma.c | 4 +- src/lib/ultra/io/epirawread.c | 4 +- src/lib/ultra/io/epirawwrite.c | 4 +- src/lib/ultra/io/pfsgetstatus.c | 16 ++++---- src/lib/ultra/io/pfsisplug.c | 12 +++--- src/lib/ultra/io/piacs.c | 24 ++++++------ src/lib/ultra/io/pidma.c | 4 +- src/lib/ultra/io/pigetcmdq.c | 8 ++-- src/lib/ultra/io/pimgr.c | 40 +++++++++---------- src/lib/ultra/io/vimgr.c | 48 +++++++++++------------ src/lib/ultra/os/createmesgqueue.c | 8 ++-- src/lib/ultra/os/createthread.c | 4 +- src/lib/ultra/os/destroythread.c | 12 +++--- src/lib/ultra/os/exceptasm.c | 56 +++++++++++++-------------- src/lib/ultra/os/initialize.c | 16 ++++---- src/lib/ultra/os/interrupt.c | 4 +- src/lib/ultra/os/resetglobalintmask.c | 8 ++-- src/lib/ultra/os/seteventmesg.c | 4 +- src/lib/ultra/os/setglobalintmask.c | 8 ++-- src/lib/ultra/os/setintmask.c | 4 +- src/lib/ultra/os/setthreadpri.c | 8 ++-- src/lib/ultra/os/settimer.c | 4 +- src/lib/ultra/os/startthread.c | 24 ++++++------ src/lib/ultra/os/stoptimer.c | 8 ++-- src/lib/ultra/os/timerintr.c | 44 ++++++++++----------- src/lib/ultra/os/yieldthread.c | 4 +- 38 files changed, 295 insertions(+), 295 deletions(-) diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index a7ad13884..7c61497b8 100644 --- a/src/game/data/data_000000.c +++ b/src/game/data/data_000000.c @@ -3024,7 +3024,7 @@ u32 var8005ced0 = 0x00000000; u32 var8005ced4 = 0x00000000; u32 var8005ced8 = 0x00000000; u32 var8005cedc = 0x00000000; -u32 var8005cee0 = 0x00000000; +u32 __osViDevMgr = 0x00000000; u32 var8005cee4 = 0x00000000; u32 var8005cee8 = 0x00000000; u32 var8005ceec = 0x00000000; @@ -3032,7 +3032,7 @@ u32 var8005cef0 = 0x00000000; u32 var8005cef4 = 0x00000000; u32 var8005cef8 = 0x00000000; u32 var8005cefc = 0x00000000; -u32 var8005cf00 = 0x00000000; +u32 __osPiDevMgr = 0x00000000; u32 var8005cf04 = 0x00000000; u32 var8005cf08 = 0x00000000; u32 var8005cf0c = 0x00000000; @@ -3040,7 +3040,7 @@ u32 var8005cf10 = 0x00000000; u32 var8005cf14 = 0x00000000; u32 var8005cf18 = 0x00000000; u32 var8005cf1c = 0x00000000; -u32 var8005cf20 = (u32) &var800902a0; +u32 __osCurrentHandle = (u32) &var800902a0; u32 var8005cf24 = (u32) &var80090318; u32 var8005cf28 = 0x00000000; u32 var8005cf2c = 0x00000000; @@ -3058,9 +3058,9 @@ u32 var8005cf58 = 0x00000000; u32 var8005cf5c = 0x00000000; u32 var8005cf60 = 0x00000000; u32 var8005cf64 = 0x03b9aca0; -u32 var8005cf68 = 0x02e6d354; +u32 osViClock = 0x02e6d354; u32 var8005cf6c = 0x00000000; -u32 var8005cf70 = 0x003fff01; +u32 __osGlobalIntMask = 0x003fff01; u32 var8005cf74 = 0x00000000; u32 var8005cf78 = 0x00000000; u32 var8005cf7c = 0x00000000; @@ -6203,7 +6203,7 @@ u32 var80060890 = 0x00000000; u32 var80060894 = 0x00000000; u32 var80060898 = 0x00000000; u32 var8006089c = 0x00000000; -u32 var800608a0 = (u32) &var8009c760; +u32 __osTimerList = (u32) &var8009c760; u32 var800608a4 = 0x00000000; u32 var800608a8 = 0x00000000; u32 var800608ac = 0x00000000; @@ -6235,14 +6235,14 @@ u32 var80060910 = (u32) &var800608b0; u32 var80060914 = (u32) &var800608e0; u32 var80060918 = 0x00000000; u32 var8006091c = 0x00000000; -u32 var80060920 = 0x00000000; +u32 __osPiAccessQueueEnabled = 0x00000000; u32 var80060924 = 0x00000000; u32 var80060928 = 0x00000000; u32 var8006092c = 0x00000000; -u32 var80060930 = 0x00000000; +u32 __osThreadTail = 0x00000000; u32 var80060934 = 0xffffffff; -u32 var80060938 = (u32) &var80060930; -u32 var8006093c = (u32) &var80060930; +u32 __osRunQueue = (u32) &__osThreadTail; +u32 __osActiveQueue = (u32) &__osThreadTail; OSThread *__osRunningThread = NULL; u32 var80060944 = 0x00000000; u32 var80060948 = 0x00000000; @@ -6251,7 +6251,7 @@ u32 var80060950 = 0x00000000; u32 var80060954 = 0x00000000; u32 var80060958 = 0x00000000; u32 var8006095c = 0x00000000; -u32 var80060960 = 0x00000000; +u32 __osContInitialized = 0x00000000; u32 var80060964 = 0x00000000; u32 var80060968 = 0x00000000; u32 var8006096c = 0x00000000; diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index decdabb64..cee8f84f4 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -2882,7 +2882,7 @@ u32 var8008fdf0 = 0; u32 var8008fdf4 = 0; u32 var8008fdf8 = 0; u32 var8008fdfc = 0; -OSThread var8008fe00 = {0}; +OSThread viThread = {0}; u32 var8008ffb0 = 0; u32 var8008ffb4 = 0; u32 var8008ffb8 = 0; @@ -3043,25 +3043,25 @@ u32 var80090220 = 0; u32 var80090224 = 0; u32 var80090228 = 0; u32 var8009022c = 0; -u32 var80090230 = 0; +u32 __viEventQueue = 0; u32 var80090234 = 0; u32 var80090238 = 0; u32 var8009023c = 0; u32 var80090240 = 0; u32 var80090244 = 0; -u32 var80090248 = 0; +u32 viEventBuf = 0; u32 var8009024c = 0; u32 var80090250 = 0; u32 var80090254 = 0; u32 var80090258 = 0; u32 var8009025c = 0; -u32 var80090260 = 0; +u32 viRetraceMsg = 0; u32 var80090264 = 0; u32 var80090268 = 0; u32 var8009026c = 0; u32 var80090270 = 0; u32 var80090274 = 0; -u32 var80090278 = 0; +u32 viCounterMsg = 0; u32 var8009027c = 0; u32 var80090280 = 0; u32 var80090284 = 0; @@ -3131,7 +3131,7 @@ u32 var80090380 = 0; u32 var80090384 = 0; u32 var80090388 = 0; u32 var8009038c = 0; -OSThread var80090390 = {0}; +OSThread piThread = {0}; u32 var80090540 = 0; u32 var80090544 = 0; u32 var80090548 = 0; @@ -3292,13 +3292,13 @@ u32 var800907b0 = 0; u32 var800907b4 = 0; u32 var800907b8 = 0; u32 var800907bc = 0; -u32 var800907c0 = 0; +u32 piEventQueue = 0; u32 var800907c4 = 0; u32 var800907c8 = 0; u32 var800907cc = 0; u32 var800907d0 = 0; u32 var800907d4 = 0; -u32 var800907d8 = 0; +u32 piEventBuf = 0; u32 var800907dc = 0; u32 var800907e0 = 0; u32 var800907e4 = 0; @@ -3444,7 +3444,7 @@ u32 var80090a10 = 0; u32 var80090a14 = 0; u32 var80090a18 = 0; u32 var80090a1c = 0; -u32 var80090a20 = 0; +u32 __osPfsPifRam = 0; u32 var80090a24 = 0; u32 var80090a28 = 0; u32 var80090a2c = 0; @@ -3460,7 +3460,7 @@ u32 var80090a50 = 0; u32 var80090a54 = 0; u32 var80090a58 = 0; u32 var80090a5c = 0; -u32 var80090a60 = 0; +u32 __osFinalRom = 0; u32 var80090a64 = 0; u32 var80090a68 = 0; u32 var80090a6c = 0; @@ -14560,7 +14560,7 @@ u32 var8009c6d0 = 0; u32 var8009c6d4 = 0; u32 var8009c6d8 = 0; u32 var8009c6dc = 0; -u32 var8009c6e0 = 0; +u32 __osEventStateTab = 0; u32 var8009c6e4 = 0; u32 var8009c6e8 = 0; u32 var8009c6ec = 0; @@ -14610,7 +14610,7 @@ u32 var8009c798 = 0; u32 var8009c79c = 0; u32 var8009c7a0 = 0; u32 var8009c7a4 = 0; -u32 var8009c7a8 = 0; +u32 __osPiAccessQueue = 0; u32 var8009c7ac = 0; u32 var8009c7b0 = 0; u32 var8009c7b4 = 0; @@ -14642,7 +14642,7 @@ u32 var8009c818 = 0; u32 var8009c81c = 0; u8 __osContLastCmd = 0; u32 var8009c824 = 0; -u32 var8009c828 = 0; +u32 __osEepromTimer = 0; u32 var8009c82c = 0; u32 var8009c830 = 0; u32 var8009c834 = 0; @@ -14650,13 +14650,13 @@ u32 var8009c838 = 0; u32 var8009c83c = 0; u32 var8009c840 = 0; u32 var8009c844 = 0; -u32 var8009c848 = 0; +u32 __osEepromTimerQ = 0; u32 var8009c84c = 0; u32 var8009c850 = 0; u32 var8009c854 = 0; u32 var8009c858 = 0; u32 var8009c85c = 0; -u32 var8009c860 = 0; +u32 __osEepromTimerMsg = 0; u32 var8009c864 = 0; u32 var8009c868 = 0; u32 var8009c86c = 0; @@ -14792,7 +14792,7 @@ u32 var8009ca70 = 0; u32 var8009ca74 = 0; u32 var8009ca78 = 0; u32 var8009ca7c = 0; -u32 var8009ca80 = 0; +u32 __osEepPifRam = 0; u32 var8009ca84 = 0; u32 var8009ca88 = 0; u32 var8009ca8c = 0; diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index 4ca554dd7..25d6a72b6 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -49,13 +49,13 @@ extern u32 var8005ce90; extern u32 var8005ce94; extern u32 var8005ce9c; extern u32 var8005cea8; -extern u32 var8005cee0; -extern u32 var8005cf00; +extern u32 __osViDevMgr; +extern u32 __osPiDevMgr; extern u32 var8005cf30; extern u32 var8005cf60; -extern u32 var8005cf68; +extern u32 osViClock; extern u32 var8005cf6c; -extern u32 var8005cf70; +extern u32 __osGlobalIntMask; extern u32 var8005cf84; extern u32 var8005cf90; extern u32 var8005cf94; @@ -171,9 +171,9 @@ extern u32 var80060368; extern u32 var800608b0; extern u32 var80060910; extern u32 var80060914; -extern u32 var80060930; -extern u32 var80060938; -extern u32 var8006093c; +extern u32 __osThreadTail; +extern u32 __osRunQueue; +extern u32 __osActiveQueue; extern OSThread *__osRunningThread; extern u32 var80060970; extern u32 var800609a0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index c99dc2f90..93b676c81 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -377,18 +377,18 @@ extern OSMesg g_ResetMesg; extern OSMesgQueue g_ResetMesgQueue; extern OSThread g_ResetThread; extern u32 var8008fdf0; -extern OSThread var8008fe00; -extern u32 var80090230; -extern u32 var80090248; -extern u32 var80090260; -extern u32 var80090278; +extern OSThread viThread; +extern u32 __viEventQueue; +extern u32 viEventBuf; +extern u32 viRetraceMsg; +extern u32 viCounterMsg; extern u32 var800902a0; extern u32 var80090318; -extern OSThread var80090390; -extern u32 var800907c0; -extern u32 var800907d8; +extern OSThread piThread; +extern u32 piEventQueue; +extern u32 piEventBuf; extern u32 var800907f0; -extern u32 var80090a20; +extern u32 __osPfsPifRam; extern u32 var80090a70; extern u32 var80090ab0; extern u32 var80090ad0; @@ -499,24 +499,24 @@ extern u32 var8009c2d0; extern u32 var8009c390; extern u32 var8009c400; extern u32 var8009c650; -extern u32 var8009c6e0; +extern u32 __osEventStateTab; extern u32 var8009c760; extern u32 var8009c780; extern u32 var8009c788; extern u32 var8009c78c; extern u32 var8009c7a0; -extern u32 var8009c7a8; +extern u32 __osPiAccessQueue; extern u32 var8009c7c0; extern u32 var8009c7c8; extern u32 __osContPifRam; extern u32 var8009c81c; extern u8 __osContLastCmd; -extern u32 var8009c828; -extern u32 var8009c848; -extern u32 var8009c860; +extern u32 __osEepromTimer; +extern u32 __osEepromTimerQ; +extern u32 __osEepromTimerMsg; extern u32 var8009c870; extern u32 var8009c970; -extern u32 var8009ca80; +extern u32 __osEepPifRam; extern u32 var8009ca84; extern u32 var8009cad0; extern u32 var8009cadc; diff --git a/src/lib/lib_159b0.c b/src/lib/lib_159b0.c index 2289b0b22..7ee2a2f63 100644 --- a/src/lib/lib_159b0.c +++ b/src/lib/lib_159b0.c @@ -497,8 +497,8 @@ GLOBAL_ASM( glabel func00015fd0 /* 15fd0: 27bdffe0 */ addiu $sp,$sp,-32 /* 15fd4: afbf0014 */ sw $ra,0x14($sp) -/* 15fd8: 3c04800a */ lui $a0,%hi(var8009c7a8) -/* 15fdc: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) +/* 15fd8: 3c04800a */ lui $a0,%hi(__osPiAccessQueue) +/* 15fdc: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue) /* 15fe0: 24050000 */ addiu $a1,$zero,0x0 /* 15fe4: 0c0121bc */ jal osRecvMesg /* 15fe8: 3c060001 */ lui $a2,0x1 @@ -520,8 +520,8 @@ glabel func00015fd0 /* 16024: 00852026 */ xor $a0,$a0,$a1 /* 16028: 8c820000 */ lw $v0,0x0($a0) /* 1602c: afa20018 */ sw $v0,0x18($sp) -/* 16030: 3c04800a */ lui $a0,%hi(var8009c7a8) -/* 16034: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) +/* 16030: 3c04800a */ lui $a0,%hi(__osPiAccessQueue) +/* 16034: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue) /* 16038: 24050000 */ addiu $a1,$zero,0x0 /* 1603c: 0c012238 */ jal osSendMesg /* 16040: 3c060000 */ lui $a2,0x0 diff --git a/src/lib/lib_4e270.c b/src/lib/lib_4e270.c index 6b9286bae..f75b166e3 100644 --- a/src/lib/lib_4e270.c +++ b/src/lib/lib_4e270.c @@ -12,8 +12,8 @@ GLOBAL_ASM( glabel func0004e270 -/* 4e270: 3c058006 */ lui $a1,%hi(var8005cf68) -/* 4e274: 24a5cf68 */ addiu $a1,$a1,%lo(var8005cf68) +/* 4e270: 3c058006 */ lui $a1,%hi(osViClock) +/* 4e274: 24a5cf68 */ addiu $a1,$a1,%lo(osViClock) /* 4e278: 8cae0000 */ lw $t6,0x0($a1) /* 4e27c: 44844000 */ mtc1 $a0,$f8 /* 4e280: 3c014f80 */ lui $at,0x4f80 diff --git a/src/lib/ultra/io/conteeplongwrite.c b/src/lib/ultra/io/conteeplongwrite.c index dc5f48ff3..d9df969a9 100644 --- a/src/lib/ultra/io/conteeplongwrite.c +++ b/src/lib/ultra/io/conteeplongwrite.c @@ -19,12 +19,12 @@ glabel osEepromLongWrite /* 6478: afa5004c */ sw $a1,0x4c($sp) /* 647c: 18e00025 */ blez $a3,.L00006514 /* 6480: 0000b025 */ or $s6,$zero,$zero -/* 6484: 3c15800a */ lui $s5,%hi(var8009c860) -/* 6488: 3c14800a */ lui $s4,%hi(var8009c828) -/* 648c: 3c13800a */ lui $s3,%hi(var8009c848) -/* 6490: 2673c848 */ addiu $s3,$s3,%lo(var8009c848) -/* 6494: 2694c828 */ addiu $s4,$s4,%lo(var8009c828) -/* 6498: 26b5c860 */ addiu $s5,$s5,%lo(var8009c860) +/* 6484: 3c15800a */ lui $s5,%hi(__osEepromTimerMsg) +/* 6488: 3c14800a */ lui $s4,%hi(__osEepromTimer) +/* 648c: 3c13800a */ lui $s3,%hi(__osEepromTimerQ) +/* 6490: 2673c848 */ addiu $s3,$s3,%lo(__osEepromTimerQ) +/* 6494: 2694c828 */ addiu $s4,$s4,%lo(__osEepromTimer) +/* 6498: 26b5c860 */ addiu $s5,$s5,%lo(__osEepromTimerMsg) /* 649c: 02e02025 */ or $a0,$s7,$zero .L000064a0: /* 64a0: 322500ff */ andi $a1,$s1,0xff diff --git a/src/lib/ultra/io/conteepread.c b/src/lib/ultra/io/conteepread.c index f334c3463..f1f129f56 100644 --- a/src/lib/ultra/io/conteepread.c +++ b/src/lib/ultra/io/conteepread.c @@ -7,12 +7,12 @@ glabel osEepromRead /* 501a8: afbf0024 */ sw $ra,0x24($sp) /* 501ac: afb20020 */ sw $s2,0x20($sp) /* 501b0: afb00018 */ sw $s0,0x18($sp) -/* 501b4: 3c11800a */ lui $s1,%hi(var8009ca80) +/* 501b4: 3c11800a */ lui $s1,%hi(__osEepPifRam) /* 501b8: 00c08025 */ or $s0,$a2,$zero /* 501bc: 00809025 */ or $s2,$a0,$zero /* 501c0: afa50054 */ sw $a1,0x54($sp) /* 501c4: 0c012a18 */ jal __osSiGetAccess -/* 501c8: 2631ca80 */ addiu $s1,$s1,%lo(var8009ca80) +/* 501c8: 2631ca80 */ addiu $s1,$s1,%lo(__osEepPifRam) /* 501cc: 02402025 */ or $a0,$s2,$zero /* 501d0: 0c012fb9 */ jal __osEepStatus /* 501d4: 27a5003c */ addiu $a1,$sp,0x3c @@ -61,16 +61,16 @@ glabel osEepromRead .L0005026c: /* 5026c: 0c0140d9 */ jal __osPackEepReadData /* 50270: 93a40057 */ lbu $a0,0x57($sp) -/* 50274: 3c05800a */ lui $a1,%hi(var8009ca80) -/* 50278: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) +/* 50274: 3c05800a */ lui $a1,%hi(__osEepPifRam) +/* 50278: 24a5ca80 */ addiu $a1,$a1,%lo(__osEepPifRam) /* 5027c: 0c012a34 */ jal __osSiRawStartDma /* 50280: 24040001 */ addiu $a0,$zero,0x1 /* 50284: 02402025 */ or $a0,$s2,$zero /* 50288: 00002825 */ or $a1,$zero,$zero /* 5028c: 0c0121bc */ jal osRecvMesg /* 50290: 24060001 */ addiu $a2,$zero,0x1 -/* 50294: 3c05800a */ lui $a1,%hi(var8009ca80) -/* 50298: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) +/* 50294: 3c05800a */ lui $a1,%hi(__osEepPifRam) +/* 50298: 24a5ca80 */ addiu $a1,$a1,%lo(__osEepPifRam) /* 5029c: 0c012a34 */ jal __osSiRawStartDma /* 502a0: 00002025 */ or $a0,$zero,$zero /* 502a4: 240c0004 */ addiu $t4,$zero,0x4 @@ -130,22 +130,22 @@ glabel osEepromRead GLOBAL_ASM( glabel __osPackEepReadData /* 50364: 27bdffe8 */ addiu $sp,$sp,-24 -/* 50368: 3c03800a */ lui $v1,%hi(var8009ca80) -/* 5036c: 2463ca80 */ addiu $v1,$v1,%lo(var8009ca80) +/* 50368: 3c03800a */ lui $v1,%hi(__osEepPifRam) +/* 5036c: 2463ca80 */ addiu $v1,$v1,%lo(__osEepPifRam) /* 50370: 240f0001 */ addiu $t7,$zero,0x1 /* 50374: ac6f003c */ sw $t7,0x3c($v1) /* 50378: 24180002 */ addiu $t8,$zero,0x2 /* 5037c: 24190008 */ addiu $t9,$zero,0x8 /* 50380: 24080004 */ addiu $t0,$zero,0x4 -/* 50384: 3c01800a */ lui $at,%hi(var8009ca80) -/* 50388: 3c02800a */ lui $v0,%hi(var8009ca80+0x1) +/* 50384: 3c01800a */ lui $at,%hi(__osEepPifRam) +/* 50388: 3c02800a */ lui $v0,%hi(__osEepPifRam+0x1) /* 5038c: afa40018 */ sw $a0,0x18($sp) /* 50390: a3b80008 */ sb $t8,0x8($sp) /* 50394: a3b90009 */ sb $t9,0x9($sp) /* 50398: a3a8000a */ sb $t0,0xa($sp) /* 5039c: a3a4000b */ sb $a0,0xb($sp) -/* 503a0: 2442ca81 */ addiu $v0,$v0,%lo(var8009ca80+0x1) -/* 503a4: a020ca80 */ sb $zero,%lo(var8009ca80)($at) +/* 503a0: 2442ca81 */ addiu $v0,$v0,%lo(__osEepPifRam+0x1) +/* 503a4: a020ca80 */ sb $zero,%lo(__osEepPifRam)($at) /* 503a8: a0400002 */ sb $zero,0x2($v0) /* 503ac: a0400001 */ sb $zero,0x1($v0) /* 503b0: a0400000 */ sb $zero,0x0($v0) diff --git a/src/lib/ultra/io/conteepwrite.c b/src/lib/ultra/io/conteepwrite.c index f7190ed24..ec9f36285 100644 --- a/src/lib/ultra/io/conteepwrite.c +++ b/src/lib/ultra/io/conteepwrite.c @@ -60,16 +60,16 @@ glabel osEepromWrite /* 4bd84: 93a4004f */ lbu $a0,0x4f($sp) /* 4bd88: 0c012f8e */ jal __osPackEepWriteData /* 4bd8c: 8fa50050 */ lw $a1,0x50($sp) -/* 4bd90: 3c05800a */ lui $a1,%hi(var8009ca80) -/* 4bd94: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) +/* 4bd90: 3c05800a */ lui $a1,%hi(__osEepPifRam) +/* 4bd94: 24a5ca80 */ addiu $a1,$a1,%lo(__osEepPifRam) /* 4bd98: 0c012a34 */ jal __osSiRawStartDma /* 4bd9c: 24040001 */ addiu $a0,$zero,0x1 /* 4bda0: 02202025 */ or $a0,$s1,$zero /* 4bda4: 00002825 */ or $a1,$zero,$zero /* 4bda8: 0c0121bc */ jal osRecvMesg /* 4bdac: 24060001 */ addiu $a2,$zero,0x1 -/* 4bdb0: 3c05800a */ lui $a1,%hi(var8009ca80) -/* 4bdb4: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) +/* 4bdb0: 3c05800a */ lui $a1,%hi(__osEepPifRam) +/* 4bdb4: 24a5ca80 */ addiu $a1,$a1,%lo(__osEepPifRam) /* 4bdb8: 0c012a34 */ jal __osSiRawStartDma /* 4bdbc: 00002025 */ or $a0,$zero,$zero /* 4bdc0: 240c0005 */ addiu $t4,$zero,0x5 @@ -108,8 +108,8 @@ glabel osEepromWrite GLOBAL_ASM( glabel __osPackEepWriteData /* 4be38: 27bdffe8 */ addiu $sp,$sp,-24 -/* 4be3c: 3c07800a */ lui $a3,%hi(var8009ca80) -/* 4be40: 24e7ca80 */ addiu $a3,$a3,%lo(var8009ca80) +/* 4be3c: 3c07800a */ lui $a3,%hi(__osEepPifRam) +/* 4be40: 24e7ca80 */ addiu $a3,$a3,%lo(__osEepPifRam) /* 4be44: 240f0001 */ addiu $t7,$zero,0x1 /* 4be48: 2418000a */ addiu $t8,$zero,0xa /* 4be4c: 24190001 */ addiu $t9,$zero,0x1 @@ -129,10 +129,10 @@ glabel __osPackEepWriteData /* 4be80: 24a50001 */ addiu $a1,$a1,0x1 /* 4be84: 1420fffb */ bnez $at,.L0004be74 /* 4be88: a0c90003 */ sb $t1,0x3($a2) -/* 4be8c: 3c01800a */ lui $at,%hi(var8009ca80) -/* 4be90: 3c02800a */ lui $v0,%hi(var8009ca80+0x1) -/* 4be94: 2442ca81 */ addiu $v0,$v0,%lo(var8009ca80+0x1) -/* 4be98: a020ca80 */ sb $zero,%lo(var8009ca80)($at) +/* 4be8c: 3c01800a */ lui $at,%hi(__osEepPifRam) +/* 4be90: 3c02800a */ lui $v0,%hi(__osEepPifRam+0x1) +/* 4be94: 2442ca81 */ addiu $v0,$v0,%lo(__osEepPifRam+0x1) +/* 4be98: a020ca80 */ sb $zero,%lo(__osEepPifRam)($at) /* 4be9c: a0400002 */ sb $zero,0x2($v0) /* 4bea0: a0400001 */ sb $zero,0x1($v0) /* 4bea4: a0400000 */ sb $zero,0x0($v0) @@ -156,20 +156,20 @@ glabel __osPackEepWriteData GLOBAL_ASM( glabel __osEepStatus /* 4bee4: 27bdffd0 */ addiu $sp,$sp,-48 -/* 4bee8: 3c02800a */ lui $v0,%hi(var8009ca80) +/* 4bee8: 3c02800a */ lui $v0,%hi(__osEepPifRam) /* 4beec: 3c03800a */ lui $v1,%hi(var8009cac0) /* 4bef0: afbf0014 */ sw $ra,0x14($sp) /* 4bef4: afa40030 */ sw $a0,0x30($sp) /* 4bef8: afa50034 */ sw $a1,0x34($sp) /* 4befc: 2463cac0 */ addiu $v1,$v1,%lo(var8009cac0) -/* 4bf00: 2442ca80 */ addiu $v0,$v0,%lo(var8009ca80) +/* 4bf00: 2442ca80 */ addiu $v0,$v0,%lo(__osEepPifRam) .L0004bf04: /* 4bf04: 24420004 */ addiu $v0,$v0,0x4 /* 4bf08: 0043082b */ sltu $at,$v0,$v1 /* 4bf0c: 1420fffd */ bnez $at,.L0004bf04 /* 4bf10: ac40fffc */ sw $zero,-0x4($v0) -/* 4bf14: 3c05800a */ lui $a1,%hi(var8009ca80) -/* 4bf18: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) +/* 4bf14: 3c05800a */ lui $a1,%hi(__osEepPifRam) +/* 4bf18: 24a5ca80 */ addiu $a1,$a1,%lo(__osEepPifRam) /* 4bf1c: 240e0001 */ addiu $t6,$zero,0x1 /* 4bf20: acae003c */ sw $t6,0x3c($a1) /* 4bf24: 00a01025 */ or $v0,$a1,$zero @@ -213,9 +213,9 @@ glabel __osEepStatus /* 4bfb8: 24060001 */ addiu $a2,$zero,0x1 /* 4bfbc: 241900fe */ addiu $t9,$zero,0xfe /* 4bfc0: 3c01800a */ lui $at,%hi(__osContLastCmd) -/* 4bfc4: 3c05800a */ lui $a1,%hi(var8009ca80) +/* 4bfc4: 3c05800a */ lui $a1,%hi(__osEepPifRam) /* 4bfc8: a039c820 */ sb $t9,%lo(__osContLastCmd)($at) -/* 4bfcc: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) +/* 4bfcc: 24a5ca80 */ addiu $a1,$a1,%lo(__osEepPifRam) /* 4bfd0: 0c012a34 */ jal __osSiRawStartDma /* 4bfd4: 00002025 */ or $a0,$zero,$zero /* 4bfd8: 8fa40030 */ lw $a0,0x30($sp) @@ -224,14 +224,14 @@ glabel __osEepStatus /* 4bfe4: 0c0121bc */ jal osRecvMesg /* 4bfe8: afa2002c */ sw $v0,0x2c($sp) /* 4bfec: 8fa3002c */ lw $v1,0x2c($sp) -/* 4bff0: 3c02800a */ lui $v0,%hi(var8009ca80+0x1) -/* 4bff4: 2442ca81 */ addiu $v0,$v0,%lo(var8009ca80+0x1) +/* 4bff0: 3c02800a */ lui $v0,%hi(__osEepPifRam+0x1) +/* 4bff4: 2442ca81 */ addiu $v0,$v0,%lo(__osEepPifRam+0x1) /* 4bff8: 10600003 */ beqz $v1,.L0004c008 -/* 4bffc: 3c01800a */ lui $at,%hi(var8009ca80) +/* 4bffc: 3c01800a */ lui $at,%hi(__osEepPifRam) /* 4c000: 1000001e */ b .L0004c07c /* 4c004: 00601025 */ or $v0,$v1,$zero .L0004c008: -/* 4c008: a020ca80 */ sb $zero,%lo(var8009ca80)($at) +/* 4c008: a020ca80 */ sb $zero,%lo(__osEepPifRam)($at) /* 4c00c: 88410003 */ lwl $at,0x3($v0) /* 4c010: 98410006 */ lwr $at,0x6($v0) /* 4c014: a0400002 */ sb $zero,0x2($v0) diff --git a/src/lib/ultra/io/contramread.c b/src/lib/ultra/io/contramread.c index d63aa83de..258ad2e3d 100644 --- a/src/lib/ultra/io/contramread.c +++ b/src/lib/ultra/io/contramread.c @@ -22,12 +22,12 @@ glabel __osContRamRead /* 4b8a4: 97a5006a */ lhu $a1,0x6a($sp) /* 4b8a8: 3c1e8006 */ lui $s8,%hi(var80060970) /* 4b8ac: 3c17800a */ lui $s7,%hi(__osContLastCmd) -/* 4b8b0: 3c148009 */ lui $s4,%hi(var80090a20) +/* 4b8b0: 3c148009 */ lui $s4,%hi(__osPfsPifRam) /* 4b8b4: 000570c3 */ sra $t6,$a1,0x3 /* 4b8b8: 00057940 */ sll $t7,$a1,0x5 /* 4b8bc: afaf0040 */ sw $t7,0x40($sp) /* 4b8c0: afae0044 */ sw $t6,0x44($sp) -/* 4b8c4: 26940a20 */ addiu $s4,$s4,%lo(var80090a20) +/* 4b8c4: 26940a20 */ addiu $s4,$s4,%lo(__osPfsPifRam) /* 4b8c8: 26f7c820 */ addiu $s7,$s7,%lo(__osContLastCmd) /* 4b8cc: 27de0970 */ addiu $s8,$s8,%lo(var80060970) .L0004b8d0: diff --git a/src/lib/ultra/io/contramwrite.c b/src/lib/ultra/io/contramwrite.c index ad1df9f4d..81df7442c 100644 --- a/src/lib/ultra/io/contramwrite.c +++ b/src/lib/ultra/io/contramwrite.c @@ -39,8 +39,8 @@ glabel __osContRamWrite /* 4b690: 0010c940 */ sll $t9,$s0,0x5 /* 4b694: 3c178006 */ lui $s7,%hi(var80060970) /* 4b698: 3c16800a */ lui $s6,%hi(__osContLastCmd) -/* 4b69c: 3c138009 */ lui $s3,%hi(var80090a20) -/* 4b6a0: 26730a20 */ addiu $s3,$s3,%lo(var80090a20) +/* 4b69c: 3c138009 */ lui $s3,%hi(__osPfsPifRam) +/* 4b6a0: 26730a20 */ addiu $s3,$s3,%lo(__osPfsPifRam) /* 4b6a4: 26d6c820 */ addiu $s6,$s6,%lo(__osContLastCmd) /* 4b6a8: 26f70970 */ addiu $s7,$s7,%lo(var80060970) /* 4b6ac: afb90040 */ sw $t9,0x40($sp) diff --git a/src/lib/ultra/io/controller.c b/src/lib/ultra/io/controller.c index edc6216a9..1ee046e18 100644 --- a/src/lib/ultra/io/controller.c +++ b/src/lib/ultra/io/controller.c @@ -3,8 +3,8 @@ GLOBAL_ASM( glabel osContInit /* 4a980: 27bdff90 */ addiu $sp,$sp,-112 -/* 4a984: 3c0e8006 */ lui $t6,%hi(var80060960) -/* 4a988: 8dce0960 */ lw $t6,%lo(var80060960)($t6) +/* 4a984: 3c0e8006 */ lui $t6,%hi(__osContInitialized) +/* 4a988: 8dce0960 */ lw $t6,%lo(__osContInitialized)($t6) /* 4a98c: afbf0024 */ sw $ra,0x24($sp) /* 4a990: afa40070 */ sw $a0,0x70($sp) /* 4a994: afa50074 */ sw $a1,0x74($sp) @@ -15,9 +15,9 @@ glabel osContInit /* 4a9a8: 00001025 */ or $v0,$zero,$zero .L0004a9ac: /* 4a9ac: 240f0001 */ addiu $t7,$zero,0x1 -/* 4a9b0: 3c018006 */ lui $at,%hi(var80060960) +/* 4a9b0: 3c018006 */ lui $at,%hi(__osContInitialized) /* 4a9b4: 0c012448 */ jal func00049120 -/* 4a9b8: ac2f0960 */ sw $t7,%lo(var80060960)($at) +/* 4a9b8: ac2f0960 */ sw $t7,%lo(__osContInitialized)($at) /* 4a9bc: afa20060 */ sw $v0,0x60($sp) /* 4a9c0: 8fb80060 */ lw $t8,0x60($sp) /* 4a9c4: afa30064 */ sw $v1,0x64($sp) @@ -85,10 +85,10 @@ glabel osContInit /* 4aab8: 3c01800a */ lui $at,%hi(__osContLastCmd) /* 4aabc: 0c012a04 */ jal __osSiCreateAccessQueue /* 4aac0: a020c820 */ sb $zero,%lo(__osContLastCmd)($at) -/* 4aac4: 3c04800a */ lui $a0,%hi(var8009c848) -/* 4aac8: 3c05800a */ lui $a1,%hi(var8009c860) -/* 4aacc: 24a5c860 */ addiu $a1,$a1,%lo(var8009c860) -/* 4aad0: 2484c848 */ addiu $a0,$a0,%lo(var8009c848) +/* 4aac4: 3c04800a */ lui $a0,%hi(__osEepromTimerQ) +/* 4aac8: 3c05800a */ lui $a1,%hi(__osEepromTimerMsg) +/* 4aacc: 24a5c860 */ addiu $a1,$a1,%lo(__osEepromTimerMsg) +/* 4aad0: 2484c848 */ addiu $a0,$a0,%lo(__osEepromTimerQ) /* 4aad4: 0c0120d0 */ jal osCreateMesgQueue /* 4aad8: 24060001 */ addiu $a2,$zero,0x1 /* 4aadc: 8fa20068 */ lw $v0,0x68($sp) diff --git a/src/lib/ultra/io/epirawdma.c b/src/lib/ultra/io/epirawdma.c index 1942424a9..7dd33b4ef 100644 --- a/src/lib/ultra/io/epirawdma.c +++ b/src/lib/ultra/io/epirawdma.c @@ -20,11 +20,11 @@ glabel osEPiRawStartDma /* 49c58: 8c620000 */ lw $v0,0x0($v1) /* 49c5c: 92020009 */ lbu $v0,0x9($s0) .L00049c60: -/* 49c60: 3c048006 */ lui $a0,%hi(var8005cf20) +/* 49c60: 3c048006 */ lui $a0,%hi(__osCurrentHandle) /* 49c64: 92190004 */ lbu $t9,0x4($s0) /* 49c68: 0002c080 */ sll $t8,$v0,0x2 /* 49c6c: 00982021 */ addu $a0,$a0,$t8 -/* 49c70: 8c84cf20 */ lw $a0,%lo(var8005cf20)($a0) +/* 49c70: 8c84cf20 */ lw $a0,%lo(__osCurrentHandle)($a0) /* 49c74: 90880004 */ lbu $t0,0x4($a0) /* 49c78: 5328003d */ beql $t9,$t0,.L00049d70 /* 49c7c: 00e02025 */ or $a0,$a3,$zero diff --git a/src/lib/ultra/io/epirawread.c b/src/lib/ultra/io/epirawread.c index ebda54b6a..158e8fec8 100644 --- a/src/lib/ultra/io/epirawread.c +++ b/src/lib/ultra/io/epirawread.c @@ -16,11 +16,11 @@ glabel osEPiRawReadIo /* 51a88: 8c620000 */ lw $v0,0x0($v1) /* 51a8c: 90820009 */ lbu $v0,0x9($a0) .L00051a90: -/* 51a90: 3c038006 */ lui $v1,%hi(var8005cf20) +/* 51a90: 3c038006 */ lui $v1,%hi(__osCurrentHandle) /* 51a94: 90990004 */ lbu $t9,0x4($a0) /* 51a98: 0002c080 */ sll $t8,$v0,0x2 /* 51a9c: 00781821 */ addu $v1,$v1,$t8 -/* 51aa0: 8c63cf20 */ lw $v1,%lo(var8005cf20)($v1) +/* 51aa0: 8c63cf20 */ lw $v1,%lo(__osCurrentHandle)($v1) /* 51aa4: 90680004 */ lbu $t0,0x4($v1) /* 51aa8: 5328003d */ beql $t9,$t0,.L00051ba0 /* 51aac: 8c8a000c */ lw $t2,0xc($a0) diff --git a/src/lib/ultra/io/epirawwrite.c b/src/lib/ultra/io/epirawwrite.c index d91403a5b..469fce031 100644 --- a/src/lib/ultra/io/epirawwrite.c +++ b/src/lib/ultra/io/epirawwrite.c @@ -16,11 +16,11 @@ glabel osEPiRawWriteIo /* 51928: 8c620000 */ lw $v0,0x0($v1) /* 5192c: 90820009 */ lbu $v0,0x9($a0) .L00051930: -/* 51930: 3c038006 */ lui $v1,%hi(var8005cf20) +/* 51930: 3c038006 */ lui $v1,%hi(__osCurrentHandle) /* 51934: 90990004 */ lbu $t9,0x4($a0) /* 51938: 0002c080 */ sll $t8,$v0,0x2 /* 5193c: 00781821 */ addu $v1,$v1,$t8 -/* 51940: 8c63cf20 */ lw $v1,%lo(var8005cf20)($v1) +/* 51940: 8c63cf20 */ lw $v1,%lo(__osCurrentHandle)($v1) /* 51944: 90680004 */ lbu $t0,0x4($v1) /* 51948: 5328003d */ beql $t9,$t0,.L00051a40 /* 5194c: 8c8a000c */ lw $t2,0xc($a0) diff --git a/src/lib/ultra/io/pfsgetstatus.c b/src/lib/ultra/io/pfsgetstatus.c index f7b4b5890..544e8197b 100644 --- a/src/lib/ultra/io/pfsgetstatus.c +++ b/src/lib/ultra/io/pfsgetstatus.c @@ -12,16 +12,16 @@ glabel __osPfsGetStatus /* 4baac: a02e0984 */ sb $t6,%lo(var80060984)($at) /* 4bab0: 0c012ed8 */ jal __osPfsRequestOneChannel /* 4bab4: 00002825 */ or $a1,$zero,$zero -/* 4bab8: 3c058009 */ lui $a1,%hi(var80090a20) -/* 4babc: 24a50a20 */ addiu $a1,$a1,%lo(var80090a20) +/* 4bab8: 3c058009 */ lui $a1,%hi(__osPfsPifRam) +/* 4babc: 24a50a20 */ addiu $a1,$a1,%lo(__osPfsPifRam) /* 4bac0: 0c012a34 */ jal __osSiRawStartDma /* 4bac4: 24040001 */ addiu $a0,$zero,0x1 /* 4bac8: 8fa40030 */ lw $a0,0x30($sp) /* 4bacc: 27a50028 */ addiu $a1,$sp,0x28 /* 4bad0: 0c0121bc */ jal osRecvMesg /* 4bad4: 24060001 */ addiu $a2,$zero,0x1 -/* 4bad8: 3c058009 */ lui $a1,%hi(var80090a20) -/* 4badc: 24a50a20 */ addiu $a1,$a1,%lo(var80090a20) +/* 4bad8: 3c058009 */ lui $a1,%hi(__osPfsPifRam) +/* 4badc: 24a50a20 */ addiu $a1,$a1,%lo(__osPfsPifRam) /* 4bae0: 0c012a34 */ jal __osSiRawStartDma /* 4bae4: 00002025 */ or $a0,$zero,$zero /* 4bae8: afa2002c */ sw $v0,0x2c($sp) @@ -63,10 +63,10 @@ glabel __osPfsGetStatus GLOBAL_ASM( glabel __osPfsRequestOneChannel /* 4bb60: 27bdffe8 */ addiu $sp,$sp,-24 -/* 4bb64: 3c068009 */ lui $a2,%hi(var80090a20) +/* 4bb64: 3c068009 */ lui $a2,%hi(__osPfsPifRam) /* 4bb68: 240700fe */ addiu $a3,$zero,0xfe /* 4bb6c: 3c01800a */ lui $at,%hi(__osContLastCmd) -/* 4bb70: 24c20a20 */ addiu $v0,$a2,%lo(var80090a20) +/* 4bb70: 24c20a20 */ addiu $v0,$a2,%lo(__osPfsPifRam) /* 4bb74: afa5001c */ sw $a1,0x1c($sp) /* 4bb78: a027c820 */ sb $a3,%lo(__osContLastCmd)($at) /* 4bb7c: 240f0001 */ addiu $t7,$zero,0x1 @@ -118,9 +118,9 @@ glabel __osPfsRequestOneChannel GLOBAL_ASM( glabel __osPfsGetOneChannelData -/* 4bc24: 3c028009 */ lui $v0,%hi(var80090a20) +/* 4bc24: 3c028009 */ lui $v0,%hi(__osPfsPifRam) /* 4bc28: 27bdffe8 */ addiu $sp,$sp,-24 -/* 4bc2c: 24420a20 */ addiu $v0,$v0,%lo(var80090a20) +/* 4bc2c: 24420a20 */ addiu $v0,$v0,%lo(__osPfsPifRam) /* 4bc30: 1880000b */ blez $a0,.L0004bc60 /* 4bc34: 00001825 */ or $v1,$zero,$zero /* 4bc38: 30870003 */ andi $a3,$a0,0x3 diff --git a/src/lib/ultra/io/pfsisplug.c b/src/lib/ultra/io/pfsisplug.c index e34a471f2..5e2404a18 100644 --- a/src/lib/ultra/io/pfsisplug.c +++ b/src/lib/ultra/io/pfsisplug.c @@ -19,8 +19,8 @@ glabel osPfsIsPlug /* 57a8: 0c012a18 */ jal __osSiGetAccess /* 57ac: 24110001 */ addiu $s1,$zero,0x1 /* 57b0: 3c1e800a */ lui $s8,%hi(__osContLastCmd+0x1) -/* 57b4: 3c138009 */ lui $s3,%hi(var80090a20) -/* 57b8: 26730a20 */ addiu $s3,$s3,%lo(var80090a20) +/* 57b4: 3c138009 */ lui $s3,%hi(__osPfsPifRam) +/* 57b8: 26730a20 */ addiu $s3,$s3,%lo(__osPfsPifRam) /* 57bc: 27dec821 */ addiu $s8,$s8,%lo(__osContLastCmd+0x1) /* 57c0: 00008025 */ or $s0,$zero,$zero /* 57c4: 27b70054 */ addiu $s7,$sp,0x54 @@ -115,9 +115,9 @@ glabel osPfsIsPlug GLOBAL_ASM( glabel __osPfsRequestData /* 58fc: 27bdfff0 */ addiu $sp,$sp,-16 -/* 5900: 3c058009 */ lui $a1,%hi(var80090a20) +/* 5900: 3c058009 */ lui $a1,%hi(__osPfsPifRam) /* 5904: 3c01800a */ lui $at,%hi(__osContLastCmd) -/* 5908: 24a20a20 */ addiu $v0,$a1,%lo(var80090a20) +/* 5908: 24a20a20 */ addiu $v0,$a1,%lo(__osPfsPifRam) /* 590c: afa40010 */ sw $a0,0x10($sp) /* 5910: a024c820 */ sb $a0,%lo(__osContLastCmd)($at) /* 5914: 240f0001 */ addiu $t7,$zero,0x1 @@ -168,10 +168,10 @@ glabel __osPfsGetInitData /* 59b0: 3c07800a */ lui $a3,%hi(__osContLastCmd+0x1) /* 59b4: 24e7c821 */ addiu $a3,$a3,%lo(__osContLastCmd+0x1) /* 59b8: 90ee0000 */ lbu $t6,0x0($a3) -/* 59bc: 3c038009 */ lui $v1,%hi(var80090a20) +/* 59bc: 3c038009 */ lui $v1,%hi(__osPfsPifRam) /* 59c0: 27bdffe8 */ addiu $sp,$sp,-24 /* 59c4: 00001025 */ or $v0,$zero,$zero -/* 59c8: 24630a20 */ addiu $v1,$v1,%lo(var80090a20) +/* 59c8: 24630a20 */ addiu $v1,$v1,%lo(__osPfsPifRam) /* 59cc: 19c00020 */ blez $t6,.L00005a50 /* 59d0: 00003025 */ or $a2,$zero,$zero /* 59d4: 27a8000c */ addiu $t0,$sp,0xc diff --git a/src/lib/ultra/io/piacs.c b/src/lib/ultra/io/piacs.c index 19d124414..c6c244a01 100644 --- a/src/lib/ultra/io/piacs.c +++ b/src/lib/ultra/io/piacs.c @@ -5,16 +5,16 @@ glabel __osPiCreateAccessQueue /* 49a90: 27bdffe8 */ addiu $sp,$sp,-24 /* 49a94: afbf0014 */ sw $ra,0x14($sp) /* 49a98: 240e0001 */ addiu $t6,$zero,0x1 -/* 49a9c: 3c018006 */ lui $at,%hi(var80060920) -/* 49aa0: 3c04800a */ lui $a0,%hi(var8009c7a8) +/* 49a9c: 3c018006 */ lui $at,%hi(__osPiAccessQueueEnabled) +/* 49aa0: 3c04800a */ lui $a0,%hi(__osPiAccessQueue) /* 49aa4: 3c05800a */ lui $a1,%hi(var8009c7a0) -/* 49aa8: ac2e0920 */ sw $t6,%lo(var80060920)($at) +/* 49aa8: ac2e0920 */ sw $t6,%lo(__osPiAccessQueueEnabled)($at) /* 49aac: 24a5c7a0 */ addiu $a1,$a1,%lo(var8009c7a0) -/* 49ab0: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) +/* 49ab0: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue) /* 49ab4: 0c0120d0 */ jal osCreateMesgQueue /* 49ab8: 24060001 */ addiu $a2,$zero,0x1 -/* 49abc: 3c04800a */ lui $a0,%hi(var8009c7a8) -/* 49ac0: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) +/* 49abc: 3c04800a */ lui $a0,%hi(__osPiAccessQueue) +/* 49ac0: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue) /* 49ac4: 00002825 */ or $a1,$zero,$zero /* 49ac8: 0c012238 */ jal osSendMesg /* 49acc: 00003025 */ or $a2,$zero,$zero @@ -26,8 +26,8 @@ glabel __osPiCreateAccessQueue GLOBAL_ASM( glabel __osPiGetAccess -/* 49ae0: 3c0e8006 */ lui $t6,%hi(var80060920) -/* 49ae4: 8dce0920 */ lw $t6,%lo(var80060920)($t6) +/* 49ae0: 3c0e8006 */ lui $t6,%hi(__osPiAccessQueueEnabled) +/* 49ae4: 8dce0920 */ lw $t6,%lo(__osPiAccessQueueEnabled)($t6) /* 49ae8: 27bdffe0 */ addiu $sp,$sp,-32 /* 49aec: afbf0014 */ sw $ra,0x14($sp) /* 49af0: 15c00003 */ bnez $t6,.L00049b00 @@ -35,8 +35,8 @@ glabel __osPiGetAccess /* 49af8: 0c0126a4 */ jal __osPiCreateAccessQueue /* 49afc: 00000000 */ nop .L00049b00: -/* 49b00: 3c04800a */ lui $a0,%hi(var8009c7a8) -/* 49b04: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) +/* 49b00: 3c04800a */ lui $a0,%hi(__osPiAccessQueue) +/* 49b04: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue) /* 49b08: 27a5001c */ addiu $a1,$sp,0x1c /* 49b0c: 0c0121bc */ jal osRecvMesg /* 49b10: 24060001 */ addiu $a2,$zero,0x1 @@ -50,8 +50,8 @@ GLOBAL_ASM( glabel __osPiRelAccess /* 49b24: 27bdffe8 */ addiu $sp,$sp,-24 /* 49b28: afbf0014 */ sw $ra,0x14($sp) -/* 49b2c: 3c04800a */ lui $a0,%hi(var8009c7a8) -/* 49b30: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) +/* 49b2c: 3c04800a */ lui $a0,%hi(__osPiAccessQueue) +/* 49b30: 2484c7a8 */ addiu $a0,$a0,%lo(__osPiAccessQueue) /* 49b34: 00002825 */ or $a1,$zero,$zero /* 49b38: 0c012238 */ jal osSendMesg /* 49b3c: 00003025 */ or $a2,$zero,$zero diff --git a/src/lib/ultra/io/pidma.c b/src/lib/ultra/io/pidma.c index f3a95b7fd..ff87815ec 100644 --- a/src/lib/ultra/io/pidma.c +++ b/src/lib/ultra/io/pidma.c @@ -3,8 +3,8 @@ GLOBAL_ASM( glabel osPiStartDma /* 4e530: 27bdffd8 */ addiu $sp,$sp,-40 -/* 4e534: 3c0e8006 */ lui $t6,%hi(var8005cf00) -/* 4e538: 8dcecf00 */ lw $t6,%lo(var8005cf00)($t6) +/* 4e534: 3c0e8006 */ lui $t6,%hi(__osPiDevMgr) +/* 4e538: 8dcecf00 */ lw $t6,%lo(__osPiDevMgr)($t6) /* 4e53c: afbf001c */ sw $ra,0x1c($sp) /* 4e540: afa40028 */ sw $a0,0x28($sp) /* 4e544: afa5002c */ sw $a1,0x2c($sp) diff --git a/src/lib/ultra/io/pigetcmdq.c b/src/lib/ultra/io/pigetcmdq.c index 75b2745cb..cd0bfc751 100644 --- a/src/lib/ultra/io/pigetcmdq.c +++ b/src/lib/ultra/io/pigetcmdq.c @@ -2,15 +2,15 @@ GLOBAL_ASM( glabel osPiGetCmdQueue -/* 52040: 3c0e8006 */ lui $t6,%hi(var8005cf00) -/* 52044: 8dcecf00 */ lw $t6,%lo(var8005cf00)($t6) +/* 52040: 3c0e8006 */ lui $t6,%hi(__osPiDevMgr) +/* 52044: 8dcecf00 */ lw $t6,%lo(__osPiDevMgr)($t6) /* 52048: 15c00003 */ bnez $t6,.L00052058 /* 5204c: 00000000 */ nop /* 52050: 03e00008 */ jr $ra /* 52054: 00001025 */ or $v0,$zero,$zero .L00052058: -/* 52058: 3c028006 */ lui $v0,%hi(var8005cf08) -/* 5205c: 8c42cf08 */ lw $v0,%lo(var8005cf08)($v0) +/* 52058: 3c028006 */ lui $v0,%hi(__osPiDevMgr+0x8) +/* 5205c: 8c42cf08 */ lw $v0,%lo(__osPiDevMgr+0x8)($v0) /* 52060: 03e00008 */ jr $ra /* 52064: 00000000 */ nop /* 52068: 00000000 */ nop diff --git a/src/lib/ultra/io/pimgr.c b/src/lib/ultra/io/pimgr.c index fe6eb6eba..63e20fb72 100644 --- a/src/lib/ultra/io/pimgr.c +++ b/src/lib/ultra/io/pimgr.c @@ -4,8 +4,8 @@ GLOBAL_ASM( glabel osCreatePiPanager /* 3360: 27bdffd0 */ addiu $sp,$sp,-48 /* 3364: afb00020 */ sw $s0,0x20($sp) -/* 3368: 3c108006 */ lui $s0,%hi(var8005cf00) -/* 336c: 2610cf00 */ addiu $s0,$s0,%lo(var8005cf00) +/* 3368: 3c108006 */ lui $s0,%hi(__osPiDevMgr) +/* 336c: 2610cf00 */ addiu $s0,$s0,%lo(__osPiDevMgr) /* 3370: 8e0e0000 */ lw $t6,0x0($s0) /* 3374: afbf0024 */ sw $ra,0x24($sp) /* 3378: afa40030 */ sw $a0,0x30($sp) @@ -16,23 +16,23 @@ glabel osCreatePiPanager /* 338c: 00c02825 */ or $a1,$a2,$zero /* 3390: 0c0120d0 */ jal osCreateMesgQueue /* 3394: 00e03025 */ or $a2,$a3,$zero -/* 3398: 3c048009 */ lui $a0,%hi(var800907c0) -/* 339c: 3c058009 */ lui $a1,%hi(var800907d8) -/* 33a0: 24a507d8 */ addiu $a1,$a1,%lo(var800907d8) -/* 33a4: 248407c0 */ addiu $a0,$a0,%lo(var800907c0) +/* 3398: 3c048009 */ lui $a0,%hi(piEventQueue) +/* 339c: 3c058009 */ lui $a1,%hi(piEventBuf) +/* 33a0: 24a507d8 */ addiu $a1,$a1,%lo(piEventBuf) +/* 33a4: 248407c0 */ addiu $a0,$a0,%lo(piEventQueue) /* 33a8: 0c0120d0 */ jal osCreateMesgQueue /* 33ac: 24060004 */ addiu $a2,$zero,0x4 -/* 33b0: 3c0f8006 */ lui $t7,%hi(var80060920) -/* 33b4: 8def0920 */ lw $t7,%lo(var80060920)($t7) +/* 33b0: 3c0f8006 */ lui $t7,%hi(__osPiAccessQueueEnabled) +/* 33b4: 8def0920 */ lw $t7,%lo(__osPiAccessQueueEnabled)($t7) /* 33b8: 15e00003 */ bnez $t7,.L000033c8 /* 33bc: 00000000 */ nop /* 33c0: 0c0126a4 */ jal __osPiCreateAccessQueue /* 33c4: 00000000 */ nop .L000033c8: -/* 33c8: 3c058009 */ lui $a1,%hi(var800907c0) +/* 33c8: 3c058009 */ lui $a1,%hi(piEventQueue) /* 33cc: 3c062222 */ lui $a2,0x2222 /* 33d0: 34c62222 */ ori $a2,$a2,0x2222 -/* 33d4: 24a507c0 */ addiu $a1,$a1,%lo(var800907c0) +/* 33d4: 24a507c0 */ addiu $a1,$a1,%lo(piEventQueue) /* 33d8: 0c012148 */ jal osSetEventMesg /* 33dc: 24040008 */ addiu $a0,$zero,0x8 /* 33e0: 2418ffff */ addiu $t8,$zero,-1 @@ -51,19 +51,19 @@ glabel osCreatePiPanager /* 3410: 00000000 */ nop /* 3414: 8fa90034 */ lw $t1,0x34($sp) /* 3418: 8faf0030 */ lw $t7,0x30($sp) -/* 341c: 3c048009 */ lui $a0,%hi(var80090390) -/* 3420: 3c0a8009 */ lui $t2,%hi(var800907c0) -/* 3424: 3c0b800a */ lui $t3,%hi(var8009c7a8) +/* 341c: 3c048009 */ lui $a0,%hi(piThread) +/* 3420: 3c0a8009 */ lui $t2,%hi(piEventQueue) +/* 3424: 3c0b800a */ lui $t3,%hi(__osPiAccessQueue) /* 3428: 3c0c7005 */ lui $t4,%hi(osPiRawStartDma) /* 342c: 3c0d7005 */ lui $t5,%hi(osEPiRawStartDma) -/* 3430: 3c0e8009 */ lui $t6,%hi(var800907c0) -/* 3434: 24840390 */ addiu $a0,$a0,%lo(var80090390) +/* 3430: 3c0e8009 */ lui $t6,%hi(piEventQueue) +/* 3434: 24840390 */ addiu $a0,$a0,%lo(piThread) /* 3438: 24080001 */ addiu $t0,$zero,0x1 -/* 343c: 254a07c0 */ addiu $t2,$t2,%lo(var800907c0) -/* 3440: 256bc7a8 */ addiu $t3,$t3,%lo(var8009c7a8) +/* 343c: 254a07c0 */ addiu $t2,$t2,%lo(piEventQueue) +/* 3440: 256bc7a8 */ addiu $t3,$t3,%lo(__osPiAccessQueue) /* 3444: 258c9b50 */ addiu $t4,$t4,%lo(osPiRawStartDma) /* 3448: 25ad9c20 */ addiu $t5,$t5,%lo(osEPiRawStartDma) -/* 344c: 25ce07c0 */ addiu $t6,$t6,%lo(var800907c0) +/* 344c: 25ce07c0 */ addiu $t6,$t6,%lo(piEventQueue) /* 3450: 3c067005 */ lui $a2,%hi(__osDevMgrMain) /* 3454: afa2002c */ sw $v0,0x2c($sp) /* 3458: ae080000 */ sw $t0,0x0($s0) @@ -79,9 +79,9 @@ glabel osCreatePiPanager /* 3480: ae090008 */ sw $t1,0x8($s0) /* 3484: 0c000fb8 */ jal osCreateThread /* 3488: afaf0014 */ sw $t7,0x14($sp) -/* 348c: 3c048009 */ lui $a0,%hi(var80090390) +/* 348c: 3c048009 */ lui $a0,%hi(piThread) /* 3490: 0c01207c */ jal osStartThread -/* 3494: 24840390 */ addiu $a0,$a0,%lo(var80090390) +/* 3494: 24840390 */ addiu $a0,$a0,%lo(piThread) /* 3498: 0c012588 */ jal __osRestoreInt /* 349c: 8fa4002c */ lw $a0,0x2c($sp) /* 34a0: 8fb80028 */ lw $t8,0x28($sp) diff --git a/src/lib/ultra/io/vimgr.c b/src/lib/ultra/io/vimgr.c index a77c9ff29..fdc974981 100644 --- a/src/lib/ultra/io/vimgr.c +++ b/src/lib/ultra/io/vimgr.c @@ -13,8 +13,8 @@ GLOBAL_ASM( glabel osCreateViManager /* 3050: 27bdffd0 */ addiu $sp,$sp,-48 /* 3054: afb00020 */ sw $s0,0x20($sp) -/* 3058: 3c108006 */ lui $s0,%hi(var8005cee0) -/* 305c: 2610cee0 */ addiu $s0,$s0,%lo(var8005cee0) +/* 3058: 3c108006 */ lui $s0,%hi(__osViDevMgr) +/* 305c: 2610cee0 */ addiu $s0,$s0,%lo(__osViDevMgr) /* 3060: 8e0e0000 */ lw $t6,0x0($s0) /* 3064: afbf0024 */ sw $ra,0x24($sp) /* 3068: afa40030 */ sw $a0,0x30($sp) @@ -23,33 +23,33 @@ glabel osCreateViManager /* 3074: 0c01246c */ jal __osTimerServicesInit /* 3078: 00000000 */ nop /* 307c: 3c018006 */ lui $at,%hi(var8005cefc) -/* 3080: 3c048009 */ lui $a0,%hi(var80090230) -/* 3084: 3c058009 */ lui $a1,%hi(var80090248) +/* 3080: 3c048009 */ lui $a0,%hi(__viEventQueue) +/* 3084: 3c058009 */ lui $a1,%hi(viEventBuf) /* 3088: ac20cefc */ sw $zero,%lo(var8005cefc)($at) -/* 308c: 24a50248 */ addiu $a1,$a1,%lo(var80090248) -/* 3090: 24840230 */ addiu $a0,$a0,%lo(var80090230) +/* 308c: 24a50248 */ addiu $a1,$a1,%lo(viEventBuf) +/* 3090: 24840230 */ addiu $a0,$a0,%lo(__viEventQueue) /* 3094: 0c0120d0 */ jal osCreateMesgQueue /* 3098: 24060005 */ addiu $a2,$zero,0x5 -/* 309c: 3c068009 */ lui $a2,%hi(var80090260) -/* 30a0: 3c078009 */ lui $a3,%hi(var80090278) -/* 30a4: 24e70278 */ addiu $a3,$a3,%lo(var80090278) -/* 30a8: 24c60260 */ addiu $a2,$a2,%lo(var80090260) +/* 309c: 3c068009 */ lui $a2,%hi(viRetraceMsg) +/* 30a0: 3c078009 */ lui $a3,%hi(viCounterMsg) +/* 30a4: 24e70278 */ addiu $a3,$a3,%lo(viCounterMsg) +/* 30a8: 24c60260 */ addiu $a2,$a2,%lo(viRetraceMsg) /* 30ac: 240f000d */ addiu $t7,$zero,0xd /* 30b0: 2418000e */ addiu $t8,$zero,0xe -/* 30b4: 3c058009 */ lui $a1,%hi(var80090230) +/* 30b4: 3c058009 */ lui $a1,%hi(__viEventQueue) /* 30b8: a4cf0000 */ sh $t7,0x0($a2) /* 30bc: a0c00002 */ sb $zero,0x2($a2) /* 30c0: acc00004 */ sw $zero,0x4($a2) /* 30c4: a4f80000 */ sh $t8,0x0($a3) /* 30c8: a0e00002 */ sb $zero,0x2($a3) /* 30cc: ace00004 */ sw $zero,0x4($a3) -/* 30d0: 24a50230 */ addiu $a1,$a1,%lo(var80090230) +/* 30d0: 24a50230 */ addiu $a1,$a1,%lo(__viEventQueue) /* 30d4: 0c012148 */ jal osSetEventMesg /* 30d8: 24040007 */ addiu $a0,$zero,0x7 -/* 30dc: 3c078009 */ lui $a3,%hi(var80090278) -/* 30e0: 3c058009 */ lui $a1,%hi(var80090230) -/* 30e4: 24e60278 */ addiu $a2,$a3,%lo(var80090278) -/* 30e8: 24a50230 */ addiu $a1,$a1,%lo(var80090230) +/* 30dc: 3c078009 */ lui $a3,%hi(viCounterMsg) +/* 30e0: 3c058009 */ lui $a1,%hi(__viEventQueue) +/* 30e4: 24e60278 */ addiu $a2,$a3,%lo(viCounterMsg) +/* 30e8: 24a50230 */ addiu $a1,$a1,%lo(__viEventQueue) /* 30ec: 0c012148 */ jal osSetEventMesg /* 30f0: 24040003 */ addiu $a0,$zero,0x3 /* 30f4: 2419ffff */ addiu $t9,$zero,-1 @@ -67,13 +67,13 @@ glabel osCreateViManager /* 3120: 0c01256c */ jal __osDisableInt /* 3124: 00000000 */ nop /* 3128: 8fab0030 */ lw $t3,0x30($sp) -/* 312c: 3c038009 */ lui $v1,%hi(var80090230) -/* 3130: 3c048009 */ lui $a0,%hi(var8008fe00) -/* 3134: 3c0a8009 */ lui $t2,%hi(var80090230) -/* 3138: 2484fe00 */ addiu $a0,$a0,%lo(var8008fe00) -/* 313c: 24630230 */ addiu $v1,$v1,%lo(var80090230) +/* 312c: 3c038009 */ lui $v1,%hi(__viEventQueue) +/* 3130: 3c048009 */ lui $a0,%hi(viThread) +/* 3134: 3c0a8009 */ lui $t2,%hi(__viEventQueue) +/* 3138: 2484fe00 */ addiu $a0,$a0,%lo(viThread) +/* 313c: 24630230 */ addiu $v1,$v1,%lo(__viEventQueue) /* 3140: 24090001 */ addiu $t1,$zero,0x1 -/* 3144: 254a0230 */ addiu $t2,$t2,%lo(var80090230) +/* 3144: 254a0230 */ addiu $t2,$t2,%lo(__viEventQueue) /* 3148: 3c067000 */ lui $a2,%hi(viMgrMain) /* 314c: afa2002c */ sw $v0,0x2c($sp) /* 3150: ae090000 */ sw $t1,0x0($s0) @@ -91,9 +91,9 @@ glabel osCreateViManager /* 3180: afab0014 */ sw $t3,0x14($sp) /* 3184: 0c012590 */ jal __osViInit /* 3188: 00000000 */ nop -/* 318c: 3c048009 */ lui $a0,%hi(var8008fe00) +/* 318c: 3c048009 */ lui $a0,%hi(viThread) /* 3190: 0c01207c */ jal osStartThread -/* 3194: 2484fe00 */ addiu $a0,$a0,%lo(var8008fe00) +/* 3194: 2484fe00 */ addiu $a0,$a0,%lo(viThread) /* 3198: 0c012588 */ jal __osRestoreInt /* 319c: 8fa4002c */ lw $a0,0x2c($sp) /* 31a0: 8fac0028 */ lw $t4,0x28($sp) diff --git a/src/lib/ultra/os/createmesgqueue.c b/src/lib/ultra/os/createmesgqueue.c index 296b09e46..12d2111e1 100644 --- a/src/lib/ultra/os/createmesgqueue.c +++ b/src/lib/ultra/os/createmesgqueue.c @@ -2,10 +2,10 @@ GLOBAL_ASM( glabel osCreateMesgQueue -/* 48340: 3c0e8006 */ lui $t6,%hi(var80060930) -/* 48344: 3c0f8006 */ lui $t7,%hi(var80060930) -/* 48348: 25ce0930 */ addiu $t6,$t6,%lo(var80060930) -/* 4834c: 25ef0930 */ addiu $t7,$t7,%lo(var80060930) +/* 48340: 3c0e8006 */ lui $t6,%hi(__osThreadTail) +/* 48344: 3c0f8006 */ lui $t7,%hi(__osThreadTail) +/* 48348: 25ce0930 */ addiu $t6,$t6,%lo(__osThreadTail) +/* 4834c: 25ef0930 */ addiu $t7,$t7,%lo(__osThreadTail) /* 48350: ac8e0000 */ sw $t6,0x0($a0) /* 48354: ac8f0004 */ sw $t7,0x4($a0) /* 48358: ac800008 */ sw $zero,0x8($a0) diff --git a/src/lib/ultra/os/createthread.c b/src/lib/ultra/os/createthread.c index 8b2e9de43..853cc12ea 100644 --- a/src/lib/ultra/os/createthread.c +++ b/src/lib/ultra/os/createthread.c @@ -40,8 +40,8 @@ glabel osCreateThread /* 3f6c: a4880010 */ sh $t0,0x10($a0) /* 3f70: 0c01256c */ jal __osDisableInt /* 3f74: a4800012 */ sh $zero,0x12($a0) -/* 3f78: 3c038006 */ lui $v1,%hi(var8006093c) -/* 3f7c: 2463093c */ addiu $v1,$v1,%lo(var8006093c) +/* 3f78: 3c038006 */ lui $v1,%hi(__osActiveQueue) +/* 3f7c: 2463093c */ addiu $v1,$v1,%lo(__osActiveQueue) /* 3f80: 8c690000 */ lw $t1,0x0($v1) /* 3f84: 00402025 */ or $a0,$v0,$zero /* 3f88: ae09000c */ sw $t1,0xc($s0) diff --git a/src/lib/ultra/os/destroythread.c b/src/lib/ultra/os/destroythread.c index 657ada51f..a94a4e64e 100644 --- a/src/lib/ultra/os/destroythread.c +++ b/src/lib/ultra/os/destroythread.c @@ -27,18 +27,18 @@ glabel __osDestroyThread /* 4a2a4: 0c012884 */ jal __osDequeueThread /* 4a2a8: 03002825 */ or $a1,$t8,$zero .L0004a2ac: -/* 4a2ac: 3c088006 */ lui $t0,%hi(var8006093c) -/* 4a2b0: 8d08093c */ lw $t0,%lo(var8006093c)($t0) +/* 4a2ac: 3c088006 */ lui $t0,%hi(__osActiveQueue) +/* 4a2b0: 8d08093c */ lw $t0,%lo(__osActiveQueue)($t0) /* 4a2b4: 8fa90038 */ lw $t1,0x38($sp) /* 4a2b8: 15090005 */ bne $t0,$t1,.L0004a2d0 /* 4a2bc: 00000000 */ nop /* 4a2c0: 8d0a000c */ lw $t2,0xc($t0) -/* 4a2c4: 3c018006 */ lui $at,%hi(var8006093c) +/* 4a2c4: 3c018006 */ lui $at,%hi(__osActiveQueue) /* 4a2c8: 10000013 */ b .L0004a318 -/* 4a2cc: ac2a093c */ sw $t2,%lo(var8006093c)($at) +/* 4a2cc: ac2a093c */ sw $t2,%lo(__osActiveQueue)($at) .L0004a2d0: -/* 4a2d0: 3c118006 */ lui $s1,%hi(var8006093c) -/* 4a2d4: 8e31093c */ lw $s1,%lo(var8006093c)($s1) +/* 4a2d0: 3c118006 */ lui $s1,%hi(__osActiveQueue) +/* 4a2d4: 8e31093c */ lw $s1,%lo(__osActiveQueue)($s1) /* 4a2d8: 2401ffff */ addiu $at,$zero,-1 /* 4a2dc: 8e2b0004 */ lw $t3,0x4($s1) /* 4a2e0: 1161000d */ beq $t3,$at,.L0004a318 diff --git a/src/lib/ultra/os/exceptasm.c b/src/lib/ultra/os/exceptasm.c index 516fc026f..bb265277d 100644 --- a/src/lib/ultra/os/exceptasm.c +++ b/src/lib/ultra/os/exceptasm.c @@ -93,8 +93,8 @@ glabel __osException /* 35dc: ff5f0100 */ sd $ra,0x100($k0) /* 35e0: 11200011 */ beqz $t1,.L00003628 /* 35e4: ff480110 */ sd $t0,0x110($k0) -/* 35e8: 3c088006 */ lui $t0,%hi(var8005cf70) -/* 35ec: 2508cf70 */ addiu $t0,$t0,%lo(var8005cf70) +/* 35e8: 3c088006 */ lui $t0,%hi(__osGlobalIntMask) +/* 35ec: 2508cf70 */ addiu $t0,$t0,%lo(__osGlobalIntMask) /* 35f0: 8d080000 */ lw $t0,0x0($t0) /* 35f4: 2401ffff */ addiu $at,$zero,-1 /* 35f8: 01015026 */ xor $t2,$t0,$at @@ -114,8 +114,8 @@ glabel __osException /* 362c: 8d29000c */ lw $t1,0xc($t1) /* 3630: 5120000c */ beqzl $t1,.L00003664 /* 3634: af490128 */ sw $t1,0x128($k0) -/* 3638: 3c088006 */ lui $t0,%hi(var8005cf70) -/* 363c: 2508cf70 */ addiu $t0,$t0,%lo(var8005cf70) +/* 3638: 3c088006 */ lui $t0,%hi(__osGlobalIntMask) +/* 363c: 2508cf70 */ addiu $t0,$t0,%lo(__osGlobalIntMask) /* 3640: 8d080000 */ lw $t0,0x0($t0) /* 3644: 8f4c0128 */ lw $t4,0x128($k0) /* 3648: 2401ffff */ addiu $at,$zero,-1 @@ -237,8 +237,8 @@ glabel __osException /* 3800: 24040010 */ addiu $a0,$zero,0x10 /* 3804: 1000ffd5 */ b .L0000375c /* 3808: 3209ff00 */ andi $t1,$s0,0xff00 -/* 380c: 3c088006 */ lui $t0,%hi(var8005cf70) -/* 3810: 2508cf70 */ addiu $t0,$t0,%lo(var8005cf70) +/* 380c: 3c088006 */ lui $t0,%hi(__osGlobalIntMask) +/* 3810: 2508cf70 */ addiu $t0,$t0,%lo(__osGlobalIntMask) /* 3814: 8d080000 */ lw $t0,0x0($t0) /* 3818: 3c11a430 */ lui $s1,0xa430 /* 381c: 8e310008 */ lw $s1,0x8($s1) @@ -340,8 +340,8 @@ glabel __osException /* 397c: ad2a0000 */ sw $t2,0x0($t1) /* 3980: 0c000eae */ jal send_mesg /* 3984: 24040070 */ addiu $a0,$zero,0x70 -/* 3988: 3c0a8006 */ lui $t2,%hi(var80060938) -/* 398c: 8d4a0938 */ lw $t2,%lo(var80060938)($t2) +/* 3988: 3c0a8006 */ lui $t2,%hi(__osRunQueue) +/* 398c: 8d4a0938 */ lw $t2,%lo(__osRunQueue)($t2) /* 3990: 2401efff */ addiu $at,$zero,-4097 /* 3994: 02018024 */ and $s0,$s0,$at /* 3998: 8d5b0118 */ lw $k1,0x118($t2) @@ -389,22 +389,22 @@ glabel __osException /* 3a34: 10000001 */ b .L00003a3c /* 3a38: 00000000 */ nop .L00003a3c: -/* 3a3c: 3c0a8006 */ lui $t2,%hi(var80060938) -/* 3a40: 8d4a0938 */ lw $t2,%lo(var80060938)($t2) +/* 3a3c: 3c0a8006 */ lui $t2,%hi(__osRunQueue) +/* 3a40: 8d4a0938 */ lw $t2,%lo(__osRunQueue)($t2) /* 3a44: 8f490004 */ lw $t1,0x4($k0) /* 3a48: 8d4b0004 */ lw $t3,0x4($t2) /* 3a4c: 012b082a */ slt $at,$t1,$t3 /* 3a50: 10200007 */ beqz $at,.L00003a70 /* 3a54: 00000000 */ nop -/* 3a58: 3c048006 */ lui $a0,%hi(var80060938) +/* 3a58: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 3a5c: 03402825 */ or $a1,$k0,$zero /* 3a60: 0c000f2e */ jal __osEnqueueThread -/* 3a64: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 3a64: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) /* 3a68: 08000f44 */ j 0x3d10 /* 3a6c: 00000000 */ nop .L00003a70: -/* 3a70: 3c098006 */ lui $t1,%hi(var80060938) -/* 3a74: 25290938 */ addiu $t1,$t1,%lo(var80060938) +/* 3a70: 3c098006 */ lui $t1,%hi(__osRunQueue) +/* 3a74: 25290938 */ addiu $t1,$t1,%lo(__osRunQueue) /* 3a78: 8d2a0000 */ lw $t2,0x0($t1) /* 3a7c: af4a0000 */ sw $t2,0x0($k0) /* 3a80: 08000f44 */ j 0x3d10 @@ -426,8 +426,8 @@ glabel __osException GLOBAL_ASM( glabel send_mesg -/* 3ab8: 3c0a800a */ lui $t2,%hi(var8009c6e0) -/* 3abc: 254ac6e0 */ addiu $t2,$t2,%lo(var8009c6e0) +/* 3ab8: 3c0a800a */ lui $t2,%hi(__osEventStateTab) +/* 3abc: 254ac6e0 */ addiu $t2,$t2,%lo(__osEventStateTab) /* 3ac0: 01445021 */ addu $t2,$t2,$a0 /* 3ac4: 8d490000 */ lw $t1,0x0($t2) /* 3ac8: 03e09025 */ or $s2,$ra,$zero @@ -467,10 +467,10 @@ glabel send_mesg /* 3b48: 0c000f40 */ jal __osPopThread /* 3b4c: 01202025 */ or $a0,$t1,$zero /* 3b50: 00405025 */ or $t2,$v0,$zero -/* 3b54: 3c048006 */ lui $a0,%hi(var80060938) +/* 3b54: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 3b58: 01402825 */ or $a1,$t2,$zero /* 3b5c: 0c000f2e */ jal __osEnqueueThread -/* 3b60: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 3b60: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) .L00003b64: /* 3b64: 02400008 */ jr $s2 /* 3b68: 00000000 */ nop @@ -531,8 +531,8 @@ glabel __osEnqueueAndYield /* 3c2c: 3369ff00 */ andi $t1,$k1,0xff00 /* 3c30: 5120000e */ beqzl $t1,.L00003c6c /* 3c34: 3c1ba430 */ lui $k1,0xa430 -/* 3c38: 3c088006 */ lui $t0,%hi(var8005cf70) -/* 3c3c: 2508cf70 */ addiu $t0,$t0,%lo(var8005cf70) +/* 3c38: 3c088006 */ lui $t0,%hi(__osGlobalIntMask) +/* 3c3c: 2508cf70 */ addiu $t0,$t0,%lo(__osGlobalIntMask) /* 3c40: 8d080000 */ lw $t0,0x0($t0) /* 3c44: 2401ffff */ addiu $at,$zero,-1 /* 3c48: 01014026 */ xor $t0,$t0,$at @@ -548,8 +548,8 @@ glabel __osEnqueueAndYield /* 3c6c: 8f7b000c */ lw $k1,0xc($k1) /* 3c70: 1360000b */ beqz $k1,.L00003ca0 /* 3c74: 00000000 */ nop -/* 3c78: 3c1a8006 */ lui $k0,%hi(var8005cf70) -/* 3c7c: 275acf70 */ addiu $k0,$k0,%lo(var8005cf70) +/* 3c78: 3c1a8006 */ lui $k0,%hi(__osGlobalIntMask) +/* 3c7c: 275acf70 */ addiu $k0,$k0,%lo(__osGlobalIntMask) /* 3c80: 8f5a0000 */ lw $k0,0x0($k0) /* 3c84: 8ca80128 */ lw $t0,0x128($a1) /* 3c88: 2401ffff */ addiu $at,$zero,-1 @@ -602,17 +602,17 @@ glabel __osPopThread GLOBAL_ASM( glabel __osDispatchThread -/* 3d10: 3c048006 */ lui $a0,%hi(var80060938) +/* 3d10: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 3d14: 0c000f40 */ jal __osPopThread -/* 3d18: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 3d18: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) /* 3d1c: 3c018006 */ lui $at,%hi(__osRunningThread) /* 3d20: ac220940 */ sw $v0,%lo(__osRunningThread)($at) /* 3d24: 24080004 */ addiu $t0,$zero,0x4 /* 3d28: a4480010 */ sh $t0,0x10($v0) /* 3d2c: 0040d025 */ or $k0,$v0,$zero -/* 3d30: 3c088006 */ lui $t0,%hi(var8005cf70) +/* 3d30: 3c088006 */ lui $t0,%hi(__osGlobalIntMask) /* 3d34: 8f5b0118 */ lw $k1,0x118($k0) -/* 3d38: 2508cf70 */ addiu $t0,$t0,%lo(var8005cf70) +/* 3d38: 2508cf70 */ addiu $t0,$t0,%lo(__osGlobalIntMask) /* 3d3c: 8d080000 */ lw $t0,0x0($t0) /* 3d40: 3c01ffff */ lui $at,0xffff /* 3d44: 3369ff00 */ andi $t1,$k1,0xff00 @@ -696,8 +696,8 @@ glabel __osDispatchThread /* 3e7c: d75f0228 */ ldc1 $f31,0x228($k0) .L00003e80: /* 3e80: 8f5b0128 */ lw $k1,0x128($k0) -/* 3e84: 3c1a8006 */ lui $k0,%hi(var8005cf70) -/* 3e88: 275acf70 */ addiu $k0,$k0,%lo(var8005cf70) +/* 3e84: 3c1a8006 */ lui $k0,%hi(__osGlobalIntMask) +/* 3e88: 275acf70 */ addiu $k0,$k0,%lo(__osGlobalIntMask) /* 3e8c: 8f5a0000 */ lw $k0,0x0($k0) /* 3e90: 001ad402 */ srl $k0,$k0,0x10 /* 3e94: 037ad824 */ and $k1,$k1,$k0 diff --git a/src/lib/ultra/os/initialize.c b/src/lib/ultra/os/initialize.c index 7b27b12c7..83f5f5a0d 100644 --- a/src/lib/ultra/os/initialize.c +++ b/src/lib/ultra/os/initialize.c @@ -5,11 +5,11 @@ glabel osInitialize /* 5b60: 27bdffc8 */ addiu $sp,$sp,-56 /* 5b64: afbf001c */ sw $ra,0x1c($sp) /* 5b68: 240e0001 */ addiu $t6,$zero,0x1 -/* 5b6c: 3c018009 */ lui $at,%hi(var80090a60) +/* 5b6c: 3c018009 */ lui $at,%hi(__osFinalRom) /* 5b70: afb10018 */ sw $s1,0x18($sp) /* 5b74: afb00014 */ sw $s0,0x14($sp) /* 5b78: 0c012b34 */ jal __osGetSR -/* 5b7c: ac2e0a60 */ sw $t6,%lo(var80090a60)($at) +/* 5b7c: ac2e0a60 */ sw $t6,%lo(__osFinalRom)($at) /* 5b80: 3c012000 */ lui $at,0x2000 /* 5b84: 0c012b30 */ jal __osSetSR /* 5b88: 00412025 */ or $a0,$v0,$at @@ -126,21 +126,21 @@ glabel osInitialize /* 5d30: 354ab2d2 */ ori $t2,$t2,0xb2d2 /* 5d34: 14400004 */ bnez $v0,.L00005d48 /* 5d38: 24010002 */ addiu $at,$zero,0x2 -/* 5d3c: 3c018006 */ lui $at,%hi(var8005cf68) +/* 5d3c: 3c018006 */ lui $at,%hi(osViClock) /* 5d40: 1000000b */ b .L00005d70 -/* 5d44: ac2acf68 */ sw $t2,%lo(var8005cf68)($at) +/* 5d44: ac2acf68 */ sw $t2,%lo(osViClock)($at) .L00005d48: /* 5d48: 14410006 */ bne $v0,$at,.L00005d64 /* 5d4c: 3c0b02e6 */ lui $t3,0x2e6 /* 5d50: 3c0902e6 */ lui $t1,0x2e6 /* 5d54: 3529d354 */ ori $t1,$t1,0xd354 -/* 5d58: 3c018006 */ lui $at,%hi(var8005cf68) +/* 5d58: 3c018006 */ lui $at,%hi(osViClock) /* 5d5c: 10000004 */ b .L00005d70 -/* 5d60: ac29cf68 */ sw $t1,%lo(var8005cf68)($at) +/* 5d60: ac29cf68 */ sw $t1,%lo(osViClock)($at) .L00005d64: /* 5d64: 356bd354 */ ori $t3,$t3,0xd354 -/* 5d68: 3c018006 */ lui $at,%hi(var8005cf68) -/* 5d6c: ac2bcf68 */ sw $t3,%lo(var8005cf68)($at) +/* 5d68: 3c018006 */ lui $at,%hi(osViClock) +/* 5d6c: ac2bcf68 */ sw $t3,%lo(osViClock)($at) .L00005d70: /* 5d70: 0c012c58 */ jal __osGetCause /* 5d74: 00000000 */ nop diff --git a/src/lib/ultra/os/interrupt.c b/src/lib/ultra/os/interrupt.c index 199b476b6..be033fb77 100644 --- a/src/lib/ultra/os/interrupt.c +++ b/src/lib/ultra/os/interrupt.c @@ -2,8 +2,8 @@ GLOBAL_ASM( glabel __osDisableInt -/* 495b0: 3c0a8006 */ lui $t2,%hi(var8005cf70) -/* 495b4: 254acf70 */ addiu $t2,$t2,%lo(var8005cf70) +/* 495b0: 3c0a8006 */ lui $t2,%hi(__osGlobalIntMask) +/* 495b4: 254acf70 */ addiu $t2,$t2,%lo(__osGlobalIntMask) /* 495b8: 8d4b0000 */ lw $t3,0x0($t2) /* 495bc: 316bff00 */ andi $t3,$t3,0xff00 /* 495c0: 40086000 */ mfc0 $t0,$12 diff --git a/src/lib/ultra/os/resetglobalintmask.c b/src/lib/ultra/os/resetglobalintmask.c index 8e9a5d603..3eb3f3667 100644 --- a/src/lib/ultra/os/resetglobalintmask.c +++ b/src/lib/ultra/os/resetglobalintmask.c @@ -8,15 +8,15 @@ glabel __osResetGlobalIntMask /* 518ac: 0c01256c */ jal __osDisableInt /* 518b0: afb00018 */ sw $s0,0x18($sp) /* 518b4: 8faf0028 */ lw $t7,0x28($sp) -/* 518b8: 3c0e8006 */ lui $t6,%hi(var8005cf70) -/* 518bc: 8dcecf70 */ lw $t6,%lo(var8005cf70)($t6) +/* 518b8: 3c0e8006 */ lui $t6,%hi(__osGlobalIntMask) +/* 518bc: 8dcecf70 */ lw $t6,%lo(__osGlobalIntMask)($t6) /* 518c0: 2401fbfe */ addiu $at,$zero,-1026 /* 518c4: 01e1c024 */ and $t8,$t7,$at /* 518c8: 0300c827 */ nor $t9,$t8,$zero /* 518cc: 00408025 */ or $s0,$v0,$zero -/* 518d0: 3c018006 */ lui $at,%hi(var8005cf70) +/* 518d0: 3c018006 */ lui $at,%hi(__osGlobalIntMask) /* 518d4: 01d94024 */ and $t0,$t6,$t9 -/* 518d8: ac28cf70 */ sw $t0,%lo(var8005cf70)($at) +/* 518d8: ac28cf70 */ sw $t0,%lo(__osGlobalIntMask)($at) /* 518dc: 0c012588 */ jal __osRestoreInt /* 518e0: 02002025 */ or $a0,$s0,$zero /* 518e4: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/lib/ultra/os/seteventmesg.c b/src/lib/ultra/os/seteventmesg.c index e07cc1305..99f08036d 100644 --- a/src/lib/ultra/os/seteventmesg.c +++ b/src/lib/ultra/os/seteventmesg.c @@ -10,9 +10,9 @@ glabel osSetEventMesg /* 48534: 0c01256c */ jal __osDisableInt /* 48538: afb00018 */ sw $s0,0x18($sp) /* 4853c: 8fae0028 */ lw $t6,0x28($sp) -/* 48540: 3c18800a */ lui $t8,%hi(var8009c6e0) +/* 48540: 3c18800a */ lui $t8,%hi(__osEventStateTab) /* 48544: 8fa8002c */ lw $t0,0x2c($sp) -/* 48548: 2718c6e0 */ addiu $t8,$t8,%lo(var8009c6e0) +/* 48548: 2718c6e0 */ addiu $t8,$t8,%lo(__osEventStateTab) /* 4854c: 000e78c0 */ sll $t7,$t6,0x3 /* 48550: 01f8c821 */ addu $t9,$t7,$t8 /* 48554: afb90020 */ sw $t9,0x20($sp) diff --git a/src/lib/ultra/os/setglobalintmask.c b/src/lib/ultra/os/setglobalintmask.c index c45c8ae8c..b3d290e0a 100644 --- a/src/lib/ultra/os/setglobalintmask.c +++ b/src/lib/ultra/os/setglobalintmask.c @@ -7,13 +7,13 @@ glabel __osSetGlobalIntMask /* 51bc8: afa40028 */ sw $a0,0x28($sp) /* 51bcc: 0c01256c */ jal __osDisableInt /* 51bd0: afb00018 */ sw $s0,0x18($sp) -/* 51bd4: 3c0e8006 */ lui $t6,%hi(var8005cf70) -/* 51bd8: 8dcecf70 */ lw $t6,%lo(var8005cf70)($t6) +/* 51bd4: 3c0e8006 */ lui $t6,%hi(__osGlobalIntMask) +/* 51bd8: 8dcecf70 */ lw $t6,%lo(__osGlobalIntMask)($t6) /* 51bdc: 8faf0028 */ lw $t7,0x28($sp) /* 51be0: 00408025 */ or $s0,$v0,$zero -/* 51be4: 3c018006 */ lui $at,%hi(var8005cf70) +/* 51be4: 3c018006 */ lui $at,%hi(__osGlobalIntMask) /* 51be8: 01cfc025 */ or $t8,$t6,$t7 -/* 51bec: ac38cf70 */ sw $t8,%lo(var8005cf70)($at) +/* 51bec: ac38cf70 */ sw $t8,%lo(__osGlobalIntMask)($at) /* 51bf0: 0c012588 */ jal __osRestoreInt /* 51bf4: 02002025 */ or $a0,$s0,$zero /* 51bf8: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/lib/ultra/os/setintmask.c b/src/lib/ultra/os/setintmask.c index 386166334..8563abb2f 100644 --- a/src/lib/ultra/os/setintmask.c +++ b/src/lib/ultra/os/setintmask.c @@ -4,8 +4,8 @@ GLOBAL_ASM( glabel osSetIntMask /* 48650: 400c6000 */ mfc0 $t4,$12 /* 48654: 3182ff01 */ andi $v0,$t4,0xff01 -/* 48658: 3c088006 */ lui $t0,%hi(var8005cf70) -/* 4865c: 2508cf70 */ addiu $t0,$t0,%lo(var8005cf70) +/* 48658: 3c088006 */ lui $t0,%hi(__osGlobalIntMask) +/* 4865c: 2508cf70 */ addiu $t0,$t0,%lo(__osGlobalIntMask) /* 48660: 8d0b0000 */ lw $t3,0x0($t0) /* 48664: 2401ffff */ addiu $at,$zero,-1 /* 48668: 01614026 */ xor $t0,$t3,$at diff --git a/src/lib/ultra/os/setthreadpri.c b/src/lib/ultra/os/setthreadpri.c index c68a020e5..91283a5e9 100644 --- a/src/lib/ultra/os/setthreadpri.c +++ b/src/lib/ultra/os/setthreadpri.c @@ -40,8 +40,8 @@ glabel osSetThreadPri /* 484b8: 01802825 */ or $a1,$t4,$zero .L000484bc: /* 484bc: 3c0d8006 */ lui $t5,%hi(__osRunningThread) -/* 484c0: 3c0f8006 */ lui $t7,%hi(var80060938) -/* 484c4: 8def0938 */ lw $t7,%lo(var80060938)($t7) +/* 484c0: 3c0f8006 */ lui $t7,%hi(__osRunQueue) +/* 484c4: 8def0938 */ lw $t7,%lo(__osRunQueue)($t7) /* 484c8: 8dad0940 */ lw $t5,%lo(__osRunningThread)($t5) /* 484cc: 8df90004 */ lw $t9,0x4($t7) /* 484d0: 8dae0004 */ lw $t6,0x4($t5) @@ -49,10 +49,10 @@ glabel osSetThreadPri /* 484d8: 10200006 */ beqz $at,.L000484f4 /* 484dc: 00000000 */ nop /* 484e0: 24080002 */ addiu $t0,$zero,0x2 -/* 484e4: 3c048006 */ lui $a0,%hi(var80060938) +/* 484e4: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 484e8: a5a80010 */ sh $t0,0x10($t5) /* 484ec: 0c000ee8 */ jal __osEnqueueAndYield -/* 484f0: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 484f0: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) .L000484f4: /* 484f4: 0c012588 */ jal __osRestoreInt /* 484f8: 02002025 */ or $a0,$s0,$zero diff --git a/src/lib/ultra/os/settimer.c b/src/lib/ultra/os/settimer.c index 1a1061fa2..1d93aa2dd 100644 --- a/src/lib/ultra/os/settimer.c +++ b/src/lib/ultra/os/settimer.c @@ -42,8 +42,8 @@ glabel osSetTimer /* 48ba8: ad19001c */ sw $t9,0x1c($t0) /* 48bac: 0c01250a */ jal __osInsertTimer /* 48bb0: 8fa40020 */ lw $a0,0x20($sp) -/* 48bb4: 3c0a8006 */ lui $t2,%hi(var800608a0) -/* 48bb8: 8d4a08a0 */ lw $t2,%lo(var800608a0)($t2) +/* 48bb4: 3c0a8006 */ lui $t2,%hi(__osTimerList) +/* 48bb8: 8d4a08a0 */ lw $t2,%lo(__osTimerList)($t2) /* 48bbc: afa20018 */ sw $v0,0x18($sp) /* 48bc0: afa3001c */ sw $v1,0x1c($sp) /* 48bc4: 8fa90020 */ lw $t1,0x20($sp) diff --git a/src/lib/ultra/os/startthread.c b/src/lib/ultra/os/startthread.c index 470ca9a97..c780b35bb 100644 --- a/src/lib/ultra/os/startthread.c +++ b/src/lib/ultra/os/startthread.c @@ -18,11 +18,11 @@ glabel osStartThread /* 48224: 00000000 */ nop /* 48228: 8fb80028 */ lw $t8,0x28($sp) /* 4822c: 240f0002 */ addiu $t7,$zero,0x2 -/* 48230: 3c048006 */ lui $a0,%hi(var80060938) +/* 48230: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 48234: a70f0010 */ sh $t7,0x10($t8) /* 48238: 8fa50028 */ lw $a1,0x28($sp) /* 4823c: 0c000f2e */ jal __osEnqueueThread -/* 48240: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 48240: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) /* 48244: 10000021 */ b .L000482cc /* 48248: 00000000 */ nop .L0004824c: @@ -30,18 +30,18 @@ glabel osStartThread /* 48250: 8f280008 */ lw $t0,0x8($t9) /* 48254: 11000005 */ beqz $t0,.L0004826c /* 48258: 00000000 */ nop -/* 4825c: 3c098006 */ lui $t1,%hi(var80060938) -/* 48260: 25290938 */ addiu $t1,$t1,%lo(var80060938) +/* 4825c: 3c098006 */ lui $t1,%hi(__osRunQueue) +/* 48260: 25290938 */ addiu $t1,$t1,%lo(__osRunQueue) /* 48264: 1509000a */ bne $t0,$t1,.L00048290 /* 48268: 00000000 */ nop .L0004826c: /* 4826c: 8fab0028 */ lw $t3,0x28($sp) /* 48270: 240a0002 */ addiu $t2,$zero,0x2 -/* 48274: 3c048006 */ lui $a0,%hi(var80060938) +/* 48274: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 48278: a56a0010 */ sh $t2,0x10($t3) /* 4827c: 8fa50028 */ lw $a1,0x28($sp) /* 48280: 0c000f2e */ jal __osEnqueueThread -/* 48284: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 48284: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) /* 48288: 10000010 */ b .L000482cc /* 4828c: 00000000 */ nop .L00048290: @@ -56,8 +56,8 @@ glabel osStartThread /* 482b0: 0c000f40 */ jal __osPopThread /* 482b4: 8de40008 */ lw $a0,0x8($t7) /* 482b8: 00408825 */ or $s1,$v0,$zero -/* 482bc: 3c048006 */ lui $a0,%hi(var80060938) -/* 482c0: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 482bc: 3c048006 */ lui $a0,%hi(__osRunQueue) +/* 482c0: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) /* 482c4: 0c000f2e */ jal __osEnqueueThread /* 482c8: 02202825 */ or $a1,$s1,$zero .L000482cc: @@ -71,8 +71,8 @@ glabel osStartThread /* 482e8: 00000000 */ nop .L000482ec: /* 482ec: 3c198006 */ lui $t9,%hi(__osRunningThread) -/* 482f0: 3c098006 */ lui $t1,%hi(var80060938) -/* 482f4: 8d290938 */ lw $t1,%lo(var80060938)($t1) +/* 482f0: 3c098006 */ lui $t1,%hi(__osRunQueue) +/* 482f4: 8d290938 */ lw $t1,%lo(__osRunQueue)($t1) /* 482f8: 8f390940 */ lw $t9,%lo(__osRunningThread)($t9) /* 482fc: 8d2a0004 */ lw $t2,0x4($t1) /* 48300: 8f280004 */ lw $t0,0x4($t9) @@ -80,10 +80,10 @@ glabel osStartThread /* 48308: 10200006 */ beqz $at,.L00048324 /* 4830c: 00000000 */ nop /* 48310: 240b0002 */ addiu $t3,$zero,0x2 -/* 48314: 3c048006 */ lui $a0,%hi(var80060938) +/* 48314: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 48318: a72b0010 */ sh $t3,0x10($t9) /* 4831c: 0c000ee8 */ jal __osEnqueueAndYield -/* 48320: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 48320: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) .L00048324: /* 48324: 0c012588 */ jal __osRestoreInt /* 48328: 02002025 */ or $a0,$s0,$zero diff --git a/src/lib/ultra/os/stoptimer.c b/src/lib/ultra/os/stoptimer.c index 2cd8a8023..d0731019d 100644 --- a/src/lib/ultra/os/stoptimer.c +++ b/src/lib/ultra/os/stoptimer.c @@ -16,8 +16,8 @@ glabel osStopTimer /* 48a58: 0c01256c */ jal __osDisableInt /* 48a5c: 00000000 */ nop /* 48a60: 8fb80030 */ lw $t8,0x30($sp) -/* 48a64: 3c088006 */ lui $t0,%hi(var800608a0) -/* 48a68: 8d0808a0 */ lw $t0,%lo(var800608a0)($t0) +/* 48a64: 3c088006 */ lui $t0,%hi(__osTimerList) +/* 48a68: 8d0808a0 */ lw $t0,%lo(__osTimerList)($t0) /* 48a6c: 8f190000 */ lw $t9,0x0($t8) /* 48a70: 00408025 */ or $s0,$v0,$zero /* 48a74: 1328000d */ beq $t9,$t0,.L00048aac @@ -36,7 +36,7 @@ glabel osStopTimer /* 48aa8: ad2f0004 */ sw $t7,0x4($t1) .L00048aac: /* 48aac: 8fa80030 */ lw $t0,0x30($sp) -/* 48ab0: 3c0f8006 */ lui $t7,%hi(var800608a0) +/* 48ab0: 3c0f8006 */ lui $t7,%hi(__osTimerList) /* 48ab4: 8d190000 */ lw $t9,0x0($t0) /* 48ab8: 8d180004 */ lw $t8,0x4($t0) /* 48abc: af190000 */ sw $t9,0x0($t8) @@ -48,7 +48,7 @@ glabel osStopTimer /* 48ad4: ada00000 */ sw $zero,0x0($t5) /* 48ad8: 8fae0030 */ lw $t6,0x30($sp) /* 48adc: adc00004 */ sw $zero,0x4($t6) -/* 48ae0: 8def08a0 */ lw $t7,%lo(var800608a0)($t7) +/* 48ae0: 8def08a0 */ lw $t7,%lo(__osTimerList)($t7) /* 48ae4: 8de90000 */ lw $t1,0x0($t7) /* 48ae8: 152f0003 */ bne $t1,$t7,.L00048af8 /* 48aec: 00000000 */ nop diff --git a/src/lib/ultra/os/timerintr.c b/src/lib/ultra/os/timerintr.c index c1927dcd1..6d5baa4ed 100644 --- a/src/lib/ultra/os/timerintr.c +++ b/src/lib/ultra/os/timerintr.c @@ -8,49 +8,49 @@ glabel __osTimerServicesInit /* 491bc: ac2fc784 */ sw $t7,%lo(var8009c784)($at) /* 491c0: ac2ec780 */ sw $t6,-0x3880($at) /* 491c4: 3c01800a */ lui $at,%hi(var8009c788) -/* 491c8: 3c188006 */ lui $t8,%hi(var800608a0) -/* 491cc: 8f1808a0 */ lw $t8,%lo(var800608a0)($t8) +/* 491c8: 3c188006 */ lui $t8,%hi(__osTimerList) +/* 491cc: 8f1808a0 */ lw $t8,%lo(__osTimerList)($t8) /* 491d0: ac20c788 */ sw $zero,%lo(var8009c788)($at) /* 491d4: 3c01800a */ lui $at,%hi(var8009c78c) /* 491d8: ac20c78c */ sw $zero,%lo(var8009c78c)($at) -/* 491dc: 3c198006 */ lui $t9,%hi(var800608a0) +/* 491dc: 3c198006 */ lui $t9,%hi(__osTimerList) /* 491e0: af180004 */ sw $t8,0x4($t8) -/* 491e4: 8f3908a0 */ lw $t9,%lo(var800608a0)($t9) -/* 491e8: 3c098006 */ lui $t1,%hi(var800608a0) +/* 491e4: 8f3908a0 */ lw $t9,%lo(__osTimerList)($t9) +/* 491e8: 3c098006 */ lui $t1,%hi(__osTimerList) /* 491ec: 240a0000 */ addiu $t2,$zero,0x0 /* 491f0: 8f280004 */ lw $t0,0x4($t9) /* 491f4: 240b0000 */ addiu $t3,$zero,0x0 -/* 491f8: 3c0c8006 */ lui $t4,%hi(var800608a0) +/* 491f8: 3c0c8006 */ lui $t4,%hi(__osTimerList) /* 491fc: af280000 */ sw $t0,0x0($t9) -/* 49200: 8d2908a0 */ lw $t1,%lo(var800608a0)($t1) -/* 49204: 3c0d8006 */ lui $t5,%hi(var800608a0) -/* 49208: 3c188006 */ lui $t8,%hi(var800608a0) +/* 49200: 8d2908a0 */ lw $t1,%lo(__osTimerList)($t1) +/* 49204: 3c0d8006 */ lui $t5,%hi(__osTimerList) +/* 49208: 3c188006 */ lui $t8,%hi(__osTimerList) /* 4920c: ad2a0010 */ sw $t2,0x10($t1) /* 49210: ad2b0014 */ sw $t3,0x14($t1) -/* 49214: 8d8c08a0 */ lw $t4,%lo(var800608a0)($t4) +/* 49214: 8d8c08a0 */ lw $t4,%lo(__osTimerList)($t4) /* 49218: 8d8e0010 */ lw $t6,0x10($t4) /* 4921c: 8d8f0014 */ lw $t7,0x14($t4) /* 49220: ad8e0008 */ sw $t6,0x8($t4) /* 49224: ad8f000c */ sw $t7,0xc($t4) -/* 49228: 8dad08a0 */ lw $t5,%lo(var800608a0)($t5) +/* 49228: 8dad08a0 */ lw $t5,%lo(__osTimerList)($t5) /* 4922c: ada00018 */ sw $zero,0x18($t5) -/* 49230: 8f1808a0 */ lw $t8,%lo(var800608a0)($t8) +/* 49230: 8f1808a0 */ lw $t8,%lo(__osTimerList)($t8) /* 49234: 03e00008 */ jr $ra /* 49238: af00001c */ sw $zero,0x1c($t8) ); GLOBAL_ASM( glabel __osTimerInterrupt -/* 4923c: 3c0e8006 */ lui $t6,%hi(var800608a0) -/* 49240: 8dce08a0 */ lw $t6,%lo(var800608a0)($t6) +/* 4923c: 3c0e8006 */ lui $t6,%hi(__osTimerList) +/* 49240: 8dce08a0 */ lw $t6,%lo(__osTimerList)($t6) /* 49244: 27bdffd8 */ addiu $sp,$sp,-40 /* 49248: afbf0014 */ sw $ra,0x14($sp) /* 4924c: 8dcf0000 */ lw $t7,0x0($t6) /* 49250: 11ee0054 */ beq $t7,$t6,.L000493a4 /* 49254: 00000000 */ nop .L00049258: -/* 49258: 3c188006 */ lui $t8,%hi(var800608a0) -/* 4925c: 8f1808a0 */ lw $t8,%lo(var800608a0)($t8) +/* 49258: 3c188006 */ lui $t8,%hi(__osTimerList) +/* 4925c: 8f1808a0 */ lw $t8,%lo(__osTimerList)($t8) /* 49260: 8f190000 */ lw $t9,0x0($t8) /* 49264: 17380006 */ bne $t9,$t8,.L00049280 /* 49268: afb90024 */ sw $t9,0x24($sp) @@ -183,8 +183,8 @@ glabel __osInsertTimer /* 4942c: afbf0014 */ sw $ra,0x14($sp) /* 49430: 0c01256c */ jal __osDisableInt /* 49434: afa40038 */ sw $a0,0x38($sp) -/* 49438: 3c0e8006 */ lui $t6,%hi(var800608a0) -/* 4943c: 8dce08a0 */ lw $t6,%lo(var800608a0)($t6) +/* 49438: 3c0e8006 */ lui $t6,%hi(__osTimerList) +/* 4943c: 8dce08a0 */ lw $t6,%lo(__osTimerList)($t6) /* 49440: afa20024 */ sw $v0,0x24($sp) /* 49444: 8fb80038 */ lw $t8,0x38($sp) /* 49448: 8dcf0000 */ lw $t7,0x0($t6) @@ -211,7 +211,7 @@ glabel __osInsertTimer /* 49498: 8f2c0000 */ lw $t4,0x0($t9) /* 4949c: 8f0f0014 */ lw $t7,0x14($t8) /* 494a0: 8f0e0010 */ lw $t6,0x10($t8) -/* 494a4: 3c188006 */ lui $t8,%hi(var800608a0) +/* 494a4: 3c188006 */ lui $t8,%hi(__osTimerList) /* 494a8: 01af082b */ sltu $at,$t5,$t7 /* 494ac: 018e4023 */ subu $t0,$t4,$t6 /* 494b0: 01014023 */ subu $t0,$t0,$at @@ -219,7 +219,7 @@ glabel __osInsertTimer /* 494b8: af290004 */ sw $t1,0x4($t9) /* 494bc: af280000 */ sw $t0,0x0($t9) /* 494c0: 8faa0034 */ lw $t2,0x34($sp) -/* 494c4: 8f1808a0 */ lw $t8,%lo(var800608a0)($t8) +/* 494c4: 8f1808a0 */ lw $t8,%lo(__osTimerList)($t8) /* 494c8: 8d4b0000 */ lw $t3,0x0($t2) /* 494cc: 1178000d */ beq $t3,$t8,.L00049504 /* 494d0: afab0034 */ sw $t3,0x34($sp) @@ -239,10 +239,10 @@ glabel __osInsertTimer /* 49504: 8fb90038 */ lw $t9,0x38($sp) /* 49508: 8fa80028 */ lw $t0,0x28($sp) /* 4950c: 8fa9002c */ lw $t1,0x2c($sp) -/* 49510: 3c188006 */ lui $t8,%hi(var800608a0) +/* 49510: 3c188006 */ lui $t8,%hi(__osTimerList) /* 49514: af280010 */ sw $t0,0x10($t9) /* 49518: af290014 */ sw $t1,0x14($t9) -/* 4951c: 8f1808a0 */ lw $t8,%lo(var800608a0)($t8) +/* 4951c: 8f1808a0 */ lw $t8,%lo(__osTimerList)($t8) /* 49520: 8faa0034 */ lw $t2,0x34($sp) /* 49524: 1158000d */ beq $t2,$t8,.L0004955c /* 49528: 00000000 */ nop diff --git a/src/lib/ultra/os/yieldthread.c b/src/lib/ultra/os/yieldthread.c index f5bedf215..6d2344f1a 100644 --- a/src/lib/ultra/os/yieldthread.c +++ b/src/lib/ultra/os/yieldthread.c @@ -9,9 +9,9 @@ glabel osYieldThread /* 51c20: 3c0f8006 */ lui $t7,%hi(__osRunningThread) /* 51c24: 8def0940 */ lw $t7,%lo(__osRunningThread)($t7) /* 51c28: 240e0002 */ addiu $t6,$zero,0x2 -/* 51c2c: 3c048006 */ lui $a0,%hi(var80060938) +/* 51c2c: 3c048006 */ lui $a0,%hi(__osRunQueue) /* 51c30: 00408025 */ or $s0,$v0,$zero -/* 51c34: 24840938 */ addiu $a0,$a0,%lo(var80060938) +/* 51c34: 24840938 */ addiu $a0,$a0,%lo(__osRunQueue) /* 51c38: 0c000ee8 */ jal __osEnqueueAndYield /* 51c3c: a5ee0010 */ sh $t6,0x10($t7) /* 51c40: 0c012588 */ jal __osRestoreInt