From 8dd2979eaf6569d6ca9445337d378b544b73aa37 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 3 Oct 2020 12:52:46 +1000 Subject: [PATCH] Identify more libultra functions --- src/boot/boot.c | 2 +- src/game/game_095320.c | 4 ++-- src/game/game_157db0.c | 2 +- src/game/game_167ae0.c | 6 +++--- src/game/pak/pak.c | 6 +++--- src/include/lib/lib_04a80.h | 2 +- src/include/lib/lib_488e0.h | 2 +- src/include/lib/lib_49a90.h | 4 ++-- src/include/lib/lib_4a980.h | 3 +-- src/include/lib/lib_4e530.h | 2 -- src/include/lib/lib_4f350.h | 3 --- src/include/lib/lib_50130.h | 3 --- src/include/lib/lib_51890.h | 2 +- src/include/lib/lib_51900.h | 2 +- src/include/lib/lib_51a60.h | 4 ++-- src/include/lib/lib_51c10.h | 2 +- src/include/lib/lib_51ec0.h | 2 -- src/include/lib/lib_52070.h | 2 +- src/lib/lib_03050.c | 10 +++++----- src/lib/lib_04a80.c | 4 ++-- src/lib/lib_09660.c | 2 +- src/lib/lib_0d0a0.c | 6 +++--- src/lib/lib_12dc0.c | 2 +- src/lib/lib_13900.c | 6 +++--- src/lib/lib_488e0.c | 2 +- src/lib/lib_49a90.c | 4 ++-- src/lib/lib_49c20.c | 18 +++++++++--------- src/lib/lib_4a980.c | 6 +++--- src/lib/lib_4e530.c | 16 ++++++++-------- src/lib/lib_4f350.c | 6 +++--- src/lib/lib_50130.c | 8 ++++---- src/lib/lib_51890.c | 2 +- src/lib/lib_51900.c | 2 +- src/lib/lib_51a60.c | 4 ++-- src/lib/lib_51c10.c | 2 +- src/lib/lib_51ec0.c | 4 ++-- src/lib/lib_52070.c | 2 +- 37 files changed, 74 insertions(+), 85 deletions(-) diff --git a/src/boot/boot.c b/src/boot/boot.c index 748eea84b..64a9d911e 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -1178,7 +1178,7 @@ glabel func00002078 /* 20b4: 15210015 */ bne $t1,$at,.L0000210c .L000020b8: /* 20b8: 3c048009 */ lui $a0,%hi(var8008de18) -/* 20bc: 0c01228c */ jal func00048a30 +/* 20bc: 0c01228c */ jal osStopTimer /* 20c0: 2484de18 */ addiu $a0,$a0,%lo(var8008de18) /* 20c4: 0c002446 */ jal func00009118 /* 20c8: 00000000 */ nop diff --git a/src/game/game_095320.c b/src/game/game_095320.c index 91d4fbf83..bb6d5aff1 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -53,7 +53,7 @@ void func0f095350(u32 arg0, u32 *arg1) volatile u32 *ptr; u32 value; - func00049ae0(); + __osPiGetAccess(); ptr = (u32 *)(xorBoobless(0x04600010 ^ 0xb00b1e55) | 0xa0000000); @@ -65,7 +65,7 @@ void func0f095350(u32 arg0, u32 *arg1) *arg1 = *(u32 *)(osRomBase | arg0 | 0xa0000000); - func00049b24(); + __osPiRelAccess(); } void tagsAllocatePtrs(void) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 888217869..156afb815 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -4017,7 +4017,7 @@ glabel func0f15b534 /* f15b798: 3484b295 */ ori $a0,$a0,0xb295 /* f15b79c: 00408825 */ or $s1,$v0,$zero /* f15b7a0: 02002025 */ or $a0,$s0,$zero -/* f15b7a4: 0c013994 */ jal func0004e650 +/* f15b7a4: 0c013994 */ jal osPiReadIo /* f15b7a8: 27a5003c */ addiu $a1,$sp,0x3c /* f15b7ac: 8fa9003c */ lw $t1,0x3c($sp) /* f15b7b0: 11310010 */ beq $t1,$s1,.L0f15b7f4 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 74ee776c5..42d8fa81b 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -3967,7 +3967,7 @@ glabel getEffectiveSlowMotion /* f16b874: 3484d42a */ ori $a0,$a0,0xd42a /* f16b878: afa20024 */ sw $v0,0x24($sp) /* f16b87c: 8fa4002c */ lw $a0,0x2c($sp) -/* f16b880: 0c013994 */ jal func0004e650 +/* f16b880: 0c013994 */ jal osPiReadIo /* f16b884: 27a50028 */ addiu $a1,$sp,0x28 /* f16b888: 8fae0028 */ lw $t6,0x28($sp) /* f16b88c: 8faf0024 */ lw $t7,0x24($sp) @@ -4039,10 +4039,10 @@ glabel getEffectiveSlowMotion //u32 getEffectiveSlowMotion(void) //{ //#if PIRACYCHECKS -// u32 salt = sub54321(0xb000de8d); +// u32 addr = sub54321(0xb000de8d); // u32 actual; // u32 expected = sub54321(0x1741d42a); -// func0004e650(salt, &actual); +// osPiReadIo(addr, &actual); // // if (actual != expected) { // extern u32 _rspMicrocodeStart; diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 3befa5dcf..ca3ceeec1 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -1672,7 +1672,7 @@ glabel func0f117848 /* f11785c: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) /* f117860: 00002825 */ or $a1,$zero,$zero /* f117864: 27a60018 */ addiu $a2,$sp,0x18 -/* f117868: 0c0140fc */ jal func000503f0 +/* f117868: 0c0140fc */ jal osEepromLongRead /* f11786c: 24070800 */ addiu $a3,$zero,0x800 /* f117870: 0c005451 */ jal func00015144 /* f117874: 00000000 */ sll $zero,$zero,0x0 @@ -10901,7 +10901,7 @@ glabel func0f11e3fc /* f11e404: 0c00543a */ jal func000150e8 /* f11e408: 00000000 */ sll $zero,$zero,0x0 /* f11e40c: 3c04800a */ lui $a0,%hi(var80099e78) -/* f11e410: 0c01404c */ jal func00050130 +/* f11e410: 0c01404c */ jal osEepromProbe /* f11e414: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) /* f11e418: 0c005451 */ jal func00015144 /* f11e41c: afa2001c */ sw $v0,0x1c($sp) @@ -10943,7 +10943,7 @@ glabel func0f11e478 /* f11e494: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) /* f11e498: 93a50023 */ lbu $a1,0x23($sp) /* f11e49c: 8fa60024 */ lw $a2,0x24($sp) -/* f11e4a0: 0c0140fc */ jal func000503f0 +/* f11e4a0: 0c0140fc */ jal osEepromLongRead /* f11e4a4: 8fa70028 */ lw $a3,0x28($sp) /* f11e4a8: 0c005451 */ jal func00015144 /* f11e4ac: afa2001c */ sw $v0,0x1c($sp) diff --git a/src/include/lib/lib_04a80.h b/src/include/lib/lib_04a80.h index 3a5efafb2..0f6a89e48 100644 --- a/src/include/lib/lib_04a80.h +++ b/src/include/lib/lib_04a80.h @@ -9,7 +9,7 @@ u32 func00004c50(void); u32 func000050ec(void); u32 func000051a4(void); u32 func00005770(void); -u32 func000058fc(void); +u32 __osPfsRequestData(void); u32 func000059b0(void); u32 func00005a60(void); u32 func00005a7c(void); diff --git a/src/include/lib/lib_488e0.h b/src/include/lib/lib_488e0.h index fd41f2868..f9898b056 100644 --- a/src/include/lib/lib_488e0.h +++ b/src/include/lib/lib_488e0.h @@ -4,6 +4,6 @@ #include "types.h" s32 osSendMesg(OSMesgQueue *mq, OSMesg msg, s32 flag); -u32 func00048a30(void); +u32 osStopTimer(void); #endif diff --git a/src/include/lib/lib_49a90.h b/src/include/lib/lib_49a90.h index 1b3c667e7..adcc06cf0 100644 --- a/src/include/lib/lib_49a90.h +++ b/src/include/lib/lib_49a90.h @@ -4,7 +4,7 @@ #include "types.h" u32 __osPiCreateAccessQueue(void); -u32 func00049ae0(void); -u32 func00049b24(void); +u32 __osPiGetAccess(void); +u32 __osPiRelAccess(void); #endif diff --git a/src/include/lib/lib_4a980.h b/src/include/lib/lib_4a980.h index d7c4009ab..75e5c06d6 100644 --- a/src/include/lib/lib_4a980.h +++ b/src/include/lib/lib_4a980.h @@ -3,8 +3,7 @@ #include #include "types.h" -u32 func0004a980(void); -u32 func0004aaf0(void); +u32 __osContGetInitData(void); u32 func0004abc0(void); #endif diff --git a/src/include/lib/lib_4e530.h b/src/include/lib/lib_4e530.h index 712c23308..8a15e6314 100644 --- a/src/include/lib/lib_4e530.h +++ b/src/include/lib/lib_4e530.h @@ -3,8 +3,6 @@ #include #include "types.h" -u32 func0004e530(void); u32 func0004e640(void); -void func0004e650(u32 salt, u32 *actual); #endif diff --git a/src/include/lib/lib_4f350.h b/src/include/lib/lib_4f350.h index 537fdb5e1..f91c4bbce 100644 --- a/src/include/lib/lib_4f350.h +++ b/src/include/lib/lib_4f350.h @@ -3,7 +3,4 @@ #include #include "types.h" -u32 func0004f350(void); -u32 func0004f3d4(void); - #endif diff --git a/src/include/lib/lib_50130.h b/src/include/lib/lib_50130.h index 0e24752bf..539d347de 100644 --- a/src/include/lib/lib_50130.h +++ b/src/include/lib/lib_50130.h @@ -3,9 +3,6 @@ #include #include "types.h" -u32 func00050130(void); -u32 func000501a0(void); u32 func00050364(void); -u32 func000503f0(void); #endif diff --git a/src/include/lib/lib_51890.h b/src/include/lib/lib_51890.h index 8e7461764..8d88bdba8 100644 --- a/src/include/lib/lib_51890.h +++ b/src/include/lib/lib_51890.h @@ -4,6 +4,6 @@ #include "types.h" u32 func00051890(void); -u32 func000518a0(void); +u32 __osResetGlobalIntMask(void); #endif diff --git a/src/include/lib/lib_51900.h b/src/include/lib/lib_51900.h index 8724f9600..0ab603dad 100644 --- a/src/include/lib/lib_51900.h +++ b/src/include/lib/lib_51900.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func00051900(void); +u32 osEPiRawWriteIo(void); #endif diff --git a/src/include/lib/lib_51a60.h b/src/include/lib/lib_51a60.h index 3e24becec..5fa06cf74 100644 --- a/src/include/lib/lib_51a60.h +++ b/src/include/lib/lib_51a60.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func00051a60(void); -u32 func00051bc0(void); +u32 osEPiRawReadIo(void); +u32 __osSetGlobalIntMask(void); #endif diff --git a/src/include/lib/lib_51c10.h b/src/include/lib/lib_51c10.h index e4dcfc6d2..1cfb04d96 100644 --- a/src/include/lib/lib_51c10.h +++ b/src/include/lib/lib_51c10.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func00051c10(void); +u32 osYieldThread(void); #endif diff --git a/src/include/lib/lib_51ec0.h b/src/include/lib/lib_51ec0.h index 61f4015ee..18c6f7817 100644 --- a/src/include/lib/lib_51ec0.h +++ b/src/include/lib/lib_51ec0.h @@ -4,7 +4,5 @@ #include "types.h" u32 func00051ec0(void); -u32 func00051ef0(void); -u32 func00052040(void); #endif diff --git a/src/include/lib/lib_52070.h b/src/include/lib/lib_52070.h index f8ac23c87..ded9b11df 100644 --- a/src/include/lib/lib_52070.h +++ b/src/include/lib/lib_52070.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func00052070(void); +u32 osPiRawReadIo(void); u32 func000520c0(void); #endif diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c index 29becb046..28091872f 100644 --- a/src/lib/lib_03050.c +++ b/src/lib/lib_03050.c @@ -95,7 +95,7 @@ glabel osCreateViManager /* 313c: 24630230 */ addiu $v1,$v1,%lo(var80090230) /* 3140: 24090001 */ addiu $t1,$zero,0x1 /* 3144: 254a0230 */ addiu $t2,$t2,%lo(var80090230) -/* 3148: 3c067000 */ lui $a2,%hi(func000031d0) +/* 3148: 3c067000 */ lui $a2,%hi(viMgrMain) /* 314c: afa2002c */ sw $v0,0x2c($sp) /* 3150: ae090000 */ sw $t1,0x0($s0) /* 3154: ae040004 */ sw $a0,0x4($s0) @@ -104,7 +104,7 @@ glabel osCreateViManager /* 3160: ae000010 */ sw $zero,0x10($s0) /* 3164: ae000014 */ sw $zero,0x14($s0) /* 3168: ae000018 */ sw $zero,0x18($s0) -/* 316c: 24c631d0 */ addiu $a2,$a2,%lo(func000031d0) +/* 316c: 24c631d0 */ addiu $a2,$a2,%lo(viMgrMain) /* 3170: afaa0010 */ sw $t2,0x10($sp) /* 3174: 00002825 */ or $a1,$zero,$zero /* 3178: 02003825 */ or $a3,$s0,$zero @@ -133,7 +133,7 @@ glabel osCreateViManager ); GLOBAL_ASM( -glabel func000031d0 +glabel viMgrMain /* 31d0: 27bdffb0 */ addiu $sp,$sp,-80 /* 31d4: afbf0034 */ sw $ra,0x34($sp) /* 31d8: afb70030 */ sw $s7,0x30($sp) @@ -307,7 +307,7 @@ glabel osCreatePiPanager /* 3444: 258c9b50 */ addiu $t4,$t4,%lo(osPiRawStartDma) /* 3448: 25ad9c20 */ addiu $t5,$t5,%lo(osEPiRawStartDma) /* 344c: 25ce07c0 */ addiu $t6,$t6,%lo(var800907c0) -/* 3450: 3c067005 */ lui $a2,%hi(func00049e00) +/* 3450: 3c067005 */ lui $a2,%hi(__osDevMgrMain) /* 3454: afa2002c */ sw $v0,0x2c($sp) /* 3458: ae080000 */ sw $t0,0x0($s0) /* 345c: ae040004 */ sw $a0,0x4($s0) @@ -315,7 +315,7 @@ glabel osCreatePiPanager /* 3464: ae0b0010 */ sw $t3,0x10($s0) /* 3468: ae0c0014 */ sw $t4,0x14($s0) /* 346c: ae0d0018 */ sw $t5,0x18($s0) -/* 3470: 24c69e00 */ addiu $a2,$a2,%lo(func00049e00) +/* 3470: 24c69e00 */ addiu $a2,$a2,%lo(__osDevMgrMain) /* 3474: afae0010 */ sw $t6,0x10($sp) /* 3478: 00002825 */ or $a1,$zero,$zero /* 347c: 02003825 */ or $a3,$s0,$zero diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c index 9a935f49e..31d591c17 100644 --- a/src/lib/lib_04a80.c +++ b/src/lib/lib_04a80.c @@ -1019,7 +1019,7 @@ glabel func00005770 /* 57c8: 27b60067 */ addiu $s6,$sp,0x67 /* 57cc: 27b40068 */ addiu $s4,$sp,0x68 .L000057d0: -/* 57d0: 0c00163f */ jal func000058fc +/* 57d0: 0c00163f */ jal __osPfsRequestData /* 57d4: 00002025 */ or $a0,$zero,$zero /* 57d8: 24040001 */ addiu $a0,$zero,0x1 /* 57dc: 0c012a34 */ jal __osSiRawStartDma @@ -1105,7 +1105,7 @@ glabel func00005770 ); GLOBAL_ASM( -glabel func000058fc +glabel __osPfsRequestData /* 58fc: 27bdfff0 */ addiu $sp,$sp,-16 /* 5900: 3c058009 */ lui $a1,%hi(var80090a20) /* 5904: 3c01800a */ lui $at,%hi(__osContLastCmd) diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index cd6758111..a34f0e20c 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -161,7 +161,7 @@ glabel func00009690 /* 9810: afae0018 */ sw $t6,0x18($sp) /* 9814: 24050001 */ addiu $a1,$zero,0x1 /* 9818: 00003025 */ or $a2,$zero,$zero -/* 981c: 0c01394c */ jal func0004e530 +/* 981c: 0c01394c */ jal osPiStartDma /* 9820: afb00010 */ sw $s0,0x10($sp) /* 9824: 0c012d20 */ jal osVirtualToPhysical /* 9828: 02002025 */ or $a0,$s0,$zero diff --git a/src/lib/lib_0d0a0.c b/src/lib/lib_0d0a0.c index f6f9b72f8..7b9d2c31f 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -101,7 +101,7 @@ glabel func0000d0f8 /* d1c0: 00003025 */ or $a2,$zero,$zero /* d1c4: 02803825 */ or $a3,$s4,$zero /* d1c8: afb30010 */ sw $s3,0x10($sp) -/* d1cc: 0c01394c */ jal func0004e530 +/* d1cc: 0c01394c */ jal osPiStartDma /* d1d0: afb60018 */ sw $s6,0x18($sp) /* d1d4: 26520001 */ addiu $s2,$s2,0x1 /* d1d8: 26100001 */ addiu $s0,$s0,0x1 @@ -132,7 +132,7 @@ glabel func0000d0f8 /* d238: 02803825 */ or $a3,$s4,$zero /* d23c: afb30010 */ sw $s3,0x10($sp) /* d240: afa30014 */ sw $v1,0x14($sp) -/* d244: 0c01394c */ jal func0004e530 +/* d244: 0c01394c */ jal osPiStartDma /* d248: afb60018 */ sw $s6,0x18($sp) .L0000d24c: /* d24c: 8fbf004c */ lw $ra,0x4c($sp) @@ -189,7 +189,7 @@ glabel func0000d29c /* d2fc: 0c0034a3 */ jal xorDeadbabe /* d300: afa60030 */ sw $a2,0x30($sp) /* d304: 00402025 */ or $a0,$v0,$zero -/* d308: 0c013994 */ jal func0004e650 +/* d308: 0c013994 */ jal osPiReadIo /* d30c: 27a50024 */ addiu $a1,$sp,0x24 /* d310: 8fa30030 */ lw $v1,0x30($sp) /* d314: 00002025 */ or $a0,$zero,$zero diff --git a/src/lib/lib_12dc0.c b/src/lib/lib_12dc0.c index a8f4f94df..ed7693657 100644 --- a/src/lib/lib_12dc0.c +++ b/src/lib/lib_12dc0.c @@ -172,7 +172,7 @@ glabel func00012f30 /* 12f70: 26109880 */ addiu $s0,$s0,%lo(var80099880) .L00012f74: /* 12f74: 02202025 */ or $a0,$s1,$zero -/* 12f78: 0c013994 */ jal func0004e650 +/* 12f78: 0c013994 */ jal osPiReadIo /* 12f7c: 02002825 */ or $a1,$s0,$zero /* 12f80: 26100004 */ addiu $s0,$s0,0x4 /* 12f84: 1612fffb */ bne $s0,$s2,.L00012f74 diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 913c82a35..b9ad5cd73 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -484,7 +484,7 @@ glabel func00013e84 /* 13eb0: 26249e78 */ addiu $a0,$s1,%lo(var80099e78) /* 13eb4: ac400000 */ sw $zero,0x0($v0) /* 13eb8: 24c69f38 */ addiu $a2,$a2,%lo(var80099f38) -/* 13ebc: 0c012a60 */ jal func0004a980 +/* 13ebc: 0c012a60 */ jal osContInit /* 13ec0: 24a5eeac */ addiu $a1,$a1,%lo(var8005eeac) /* 13ec4: 240f0001 */ addiu $t7,$zero,0x1 /* 13ec8: 3c018006 */ lui $at,%hi(var8005eeb4) @@ -506,14 +506,14 @@ glabel func00013e84 /* 13f00: 3c11800a */ lui $s1,%hi(var80099e78) /* 13f04: 26319e78 */ addiu $s1,$s1,%lo(var80099e78) /* 13f08: 2410000f */ addiu $s0,$zero,0xf -/* 13f0c: 0c013cd4 */ jal func0004f350 +/* 13f0c: 0c013cd4 */ jal osContStartQuery /* 13f10: 02202025 */ or $a0,$s1,$zero /* 13f14: 02202025 */ or $a0,$s1,$zero /* 13f18: 00002825 */ or $a1,$zero,$zero /* 13f1c: 0c0121bc */ jal osRecvMesg /* 13f20: 24060001 */ addiu $a2,$zero,0x1 /* 13f24: 3c04800a */ lui $a0,%hi(var80099f38) -/* 13f28: 0c013cf5 */ jal func0004f3d4 +/* 13f28: 0c013cf5 */ jal osContGetQuery /* 13f2c: 24849f38 */ addiu $a0,$a0,%lo(var80099f38) /* 13f30: 3c03800a */ lui $v1,%hi(var80099f38) /* 13f34: 24639f38 */ addiu $v1,$v1,%lo(var80099f38) diff --git a/src/lib/lib_488e0.c b/src/lib/lib_488e0.c index 1e048aa34..eae68fff2 100644 --- a/src/lib/lib_488e0.c +++ b/src/lib/lib_488e0.c @@ -111,7 +111,7 @@ glabel osSendMesg ); GLOBAL_ASM( -glabel func00048a30 +glabel osStopTimer /* 48a30: 27bdffd0 */ addiu $sp,$sp,-48 /* 48a34: afa40030 */ sw $a0,0x30($sp) /* 48a38: 8fae0030 */ lw $t6,0x30($sp) diff --git a/src/lib/lib_49a90.c b/src/lib/lib_49a90.c index f5606669e..c62f009b2 100644 --- a/src/lib/lib_49a90.c +++ b/src/lib/lib_49a90.c @@ -40,7 +40,7 @@ glabel __osPiCreateAccessQueue ); GLOBAL_ASM( -glabel func00049ae0 +glabel __osPiGetAccess /* 49ae0: 3c0e8006 */ lui $t6,%hi(var80060920) /* 49ae4: 8dce0920 */ lw $t6,%lo(var80060920)($t6) /* 49ae8: 27bdffe0 */ addiu $sp,$sp,-32 @@ -62,7 +62,7 @@ glabel func00049ae0 ); GLOBAL_ASM( -glabel func00049b24 +glabel __osPiRelAccess /* 49b24: 27bdffe8 */ addiu $sp,$sp,-24 /* 49b28: afbf0014 */ sw $ra,0x14($sp) /* 49b2c: 3c04800a */ lui $a0,%hi(var8009c7a8) diff --git a/src/lib/lib_49c20.c b/src/lib/lib_49c20.c index 6700759d6..458033e3d 100644 --- a/src/lib/lib_49c20.c +++ b/src/lib/lib_49c20.c @@ -161,7 +161,7 @@ glabel osEPiRawStartDma ); GLOBAL_ASM( -glabel func00049e00 +glabel __osDevMgrMain /* 49e00: 27bdff88 */ addiu $sp,$sp,-120 /* 49e04: afb3002c */ sw $s3,0x2c($sp) /* 49e08: afbe0040 */ sw $s8,0x40($sp) @@ -235,7 +235,7 @@ glabel func00049e00 /* 49f04: 0c0121bc */ jal osRecvMesg /* 49f08: 8e840010 */ lw $a0,0x10($s4) /* 49f0c: 3c040010 */ lui $a0,0x10 -/* 49f10: 0c014628 */ jal func000518a0 +/* 49f10: 0c014628 */ jal __osResetGlobalIntMask /* 49f14: 34840401 */ ori $a0,$a0,0x401 /* 49f18: 8e060010 */ lw $a2,0x10($s0) /* 49f1c: 8faf0074 */ lw $t7,0x74($sp) @@ -243,7 +243,7 @@ glabel func00049e00 /* 49f24: 00c1c025 */ or $t8,$a2,$at /* 49f28: 03003025 */ or $a2,$t8,$zero /* 49f2c: 02602825 */ or $a1,$s3,$zero -/* 49f30: 0c014640 */ jal func00051900 +/* 49f30: 0c014640 */ jal osEPiRawWriteIo /* 49f34: 8de40014 */ lw $a0,0x14($t7) .L00049f38: /* 49f38: 8e84000c */ lw $a0,0xc($s4) @@ -265,18 +265,18 @@ glabel func00049e00 /* 49f78: 3c011000 */ lui $at,0x1000 /* 49f7c: 02602825 */ or $a1,$s3,$zero /* 49f80: 00c15825 */ or $t3,$a2,$at -/* 49f84: 0c014640 */ jal func00051900 +/* 49f84: 0c014640 */ jal osEPiRawWriteIo /* 49f88: 01603025 */ or $a2,$t3,$zero /* 49f8c: 8fac0074 */ lw $t4,0x74($sp) /* 49f90: 02602825 */ or $a1,$s3,$zero /* 49f94: 8e060010 */ lw $a2,0x10($s0) -/* 49f98: 0c014640 */ jal func00051900 +/* 49f98: 0c014640 */ jal osEPiRawWriteIo /* 49f9c: 8d840014 */ lw $a0,0x14($t4) /* 49fa0: 8fad0074 */ lw $t5,0x74($sp) /* 49fa4: 3c050500 */ lui $a1,0x500 /* 49fa8: 34a50508 */ ori $a1,$a1,0x508 /* 49fac: 27a60054 */ addiu $a2,$sp,0x54 -/* 49fb0: 0c014698 */ jal func00051a60 +/* 49fb0: 0c014698 */ jal osEPiRawReadIo /* 49fb4: 8da40014 */ lw $a0,0x14($t5) /* 49fb8: 8fae0054 */ lw $t6,0x54($sp) /* 49fbc: 8fb80074 */ lw $t8,0x74($sp) @@ -288,7 +288,7 @@ glabel func00049e00 /* 49fd4: 3c010100 */ lui $at,0x100 /* 49fd8: 8f040014 */ lw $a0,0x14($t8) /* 49fdc: 00c1c825 */ or $t9,$a2,$at -/* 49fe0: 0c014640 */ jal func00051900 +/* 49fe0: 0c014640 */ jal osEPiRawWriteIo /* 49fe4: 03203025 */ or $a2,$t9,$zero /* 49fe8: 24080004 */ addiu $t0,$zero,0x4 .L00049fec: @@ -297,7 +297,7 @@ glabel func00049e00 /* 49ff4: 3c0aa460 */ lui $t2,0xa460 /* 49ff8: 3c040010 */ lui $a0,0x10 /* 49ffc: ad490010 */ sw $t1,0x10($t2) -/* 4a000: 0c0146f0 */ jal func00051bc0 +/* 4a000: 0c0146f0 */ jal __osSetGlobalIntMask /* 4a004: 34840c01 */ ori $a0,$a0,0xc01 /* 4a008: 8fa50074 */ lw $a1,0x74($sp) .L0004a00c: @@ -323,7 +323,7 @@ glabel func00049e00 /* 4a050: 9719001a */ lhu $t9,0x1a($t8) /* 4a054: 56f9ff7e */ bnel $s7,$t9,.L00049e50 /* 4a058: 8e840008 */ lw $a0,0x8($s4) -/* 4a05c: 0c014704 */ jal func00051c10 +/* 4a05c: 0c014704 */ jal osYieldThread /* 4a060: 00000000 */ nop /* 4a064: 1000ff7a */ b .L00049e50 /* 4a068: 8e840008 */ lw $a0,0x8($s4) diff --git a/src/lib/lib_4a980.c b/src/lib/lib_4a980.c index d792e14a2..bf5e6460a 100644 --- a/src/lib/lib_4a980.c +++ b/src/lib/lib_4a980.c @@ -17,7 +17,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004a980 +glabel osContInit /* 4a980: 27bdff90 */ addiu $sp,$sp,-112 /* 4a984: 3c0e8006 */ lui $t6,%hi(var80060960) /* 4a988: 8dce0960 */ lw $t6,%lo(var80060960)($t6) @@ -96,7 +96,7 @@ glabel func0004a980 /* 4aaa4: 0c0121bc */ jal osRecvMesg /* 4aaa8: 24060001 */ addiu $a2,$zero,0x1 /* 4aaac: 8fa40074 */ lw $a0,0x74($sp) -/* 4aab0: 0c012abc */ jal func0004aaf0 +/* 4aab0: 0c012abc */ jal __osContGetInitData /* 4aab4: 8fa50078 */ lw $a1,0x78($sp) /* 4aab8: 3c01800a */ lui $at,%hi(__osContLastCmd) /* 4aabc: 0c012a04 */ jal __osSiCreateAccessQueue @@ -116,7 +116,7 @@ glabel func0004a980 ); GLOBAL_ASM( -glabel func0004aaf0 +glabel __osContGetInitData /* 4aaf0: 3c0f800a */ lui $t7,%hi(__osContLastCmd+0x1) /* 4aaf4: 91efc821 */ lbu $t7,%lo(__osContLastCmd+0x1)($t7) /* 4aaf8: 27bdffe8 */ addiu $sp,$sp,-24 diff --git a/src/lib/lib_4e530.c b/src/lib/lib_4e530.c index 8702fd640..0d4724c02 100644 --- a/src/lib/lib_4e530.c +++ b/src/lib/lib_4e530.c @@ -15,7 +15,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004e530 +glabel osPiStartDma /* 4e530: 27bdffd8 */ addiu $sp,$sp,-40 /* 4e534: 3c0e8006 */ lui $t6,%hi(var8005cf00) /* 4e538: 8dcecf00 */ lw $t6,%lo(var8005cf00)($t6) @@ -63,17 +63,17 @@ glabel func0004e530 /* 4e5d4: 8fab002c */ lw $t3,0x2c($sp) /* 4e5d8: 1561000a */ bne $t3,$at,.L0004e604 /* 4e5dc: 00000000 */ nop -/* 4e5e0: 0c014810 */ jal func00052040 +/* 4e5e0: 0c014810 */ jal osPiGetCmdQueue /* 4e5e4: 00000000 */ nop /* 4e5e8: 00408825 */ or $s1,$v0,$zero /* 4e5ec: 02202025 */ or $a0,$s1,$zero /* 4e5f0: 8fa50028 */ lw $a1,0x28($sp) -/* 4e5f4: 0c0147bc */ jal func00051ef0 +/* 4e5f4: 0c0147bc */ jal osJamMesg /* 4e5f8: 00003025 */ or $a2,$zero,$zero /* 4e5fc: 10000009 */ b .L0004e624 /* 4e600: 00408025 */ or $s0,$v0,$zero .L0004e604: -/* 4e604: 0c014810 */ jal func00052040 +/* 4e604: 0c014810 */ jal osPiGetCmdQueue /* 4e608: 00000000 */ nop /* 4e60c: 00408825 */ or $s1,$v0,$zero /* 4e610: 02202025 */ or $a0,$s1,$zero @@ -101,16 +101,16 @@ glabel func0004e640 ); GLOBAL_ASM( -glabel func0004e650 +glabel osPiReadIo /* 4e650: 27bdffe0 */ addiu $sp,$sp,-32 /* 4e654: afbf0014 */ sw $ra,0x14($sp) /* 4e658: afa40020 */ sw $a0,0x20($sp) -/* 4e65c: 0c0126b8 */ jal func00049ae0 +/* 4e65c: 0c0126b8 */ jal __osPiGetAccess /* 4e660: afa50024 */ sw $a1,0x24($sp) /* 4e664: 8fa40020 */ lw $a0,0x20($sp) -/* 4e668: 0c01481c */ jal func00052070 +/* 4e668: 0c01481c */ jal osPiRawReadIo /* 4e66c: 8fa50024 */ lw $a1,0x24($sp) -/* 4e670: 0c0126c9 */ jal func00049b24 +/* 4e670: 0c0126c9 */ jal __osPiRelAccess /* 4e674: afa2001c */ sw $v0,0x1c($sp) /* 4e678: 8fbf0014 */ lw $ra,0x14($sp) /* 4e67c: 8fa2001c */ lw $v0,0x1c($sp) diff --git a/src/lib/lib_4f350.c b/src/lib/lib_4f350.c index 2a3244b2a..cebb59c3f 100644 --- a/src/lib/lib_4f350.c +++ b/src/lib/lib_4f350.c @@ -14,7 +14,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004f350 +glabel osContStartQuery /* 4f350: 27bdffe0 */ addiu $sp,$sp,-32 /* 4f354: afbf0014 */ sw $ra,0x14($sp) /* 4f358: afa40020 */ sw $a0,0x20($sp) @@ -52,12 +52,12 @@ glabel func0004f350 ); GLOBAL_ASM( -glabel func0004f3d4 +glabel osContGetQuery /* 4f3d4: 27bdffe0 */ addiu $sp,$sp,-32 /* 4f3d8: afbf0014 */ sw $ra,0x14($sp) /* 4f3dc: afa40020 */ sw $a0,0x20($sp) /* 4f3e0: 8fa50020 */ lw $a1,0x20($sp) -/* 4f3e4: 0c012abc */ jal func0004aaf0 +/* 4f3e4: 0c012abc */ jal __osContGetInitData /* 4f3e8: 27a4001f */ addiu $a0,$sp,0x1f /* 4f3ec: 8fbf0014 */ lw $ra,0x14($sp) /* 4f3f0: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/lib/lib_50130.c b/src/lib/lib_50130.c index d36089a65..862595499 100644 --- a/src/lib/lib_50130.c +++ b/src/lib/lib_50130.c @@ -15,7 +15,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00050130 +glabel osEepromProbe /* 50130: 27bdffd0 */ addiu $sp,$sp,-48 /* 50134: afbf0014 */ sw $ra,0x14($sp) /* 50138: 0c012a18 */ jal __osSiGetAccess @@ -50,7 +50,7 @@ glabel func00050130 ); GLOBAL_ASM( -glabel func000501a0 +glabel osEepromRead /* 501a0: 27bdffb0 */ addiu $sp,$sp,-80 /* 501a4: afb1001c */ sw $s1,0x1c($sp) /* 501a8: afbf0024 */ sw $ra,0x24($sp) @@ -216,7 +216,7 @@ glabel func00050364 ); GLOBAL_ASM( -glabel func000503f0 +glabel osEepromLongRead /* 503f0: 27bdffe0 */ addiu $sp,$sp,-32 /* 503f4: afa7002c */ sw $a3,0x2c($sp) /* 503f8: 8fae002c */ lw $t6,0x2c($sp) @@ -229,7 +229,7 @@ glabel func000503f0 .L00050414: /* 50414: 8fa40020 */ lw $a0,0x20($sp) /* 50418: 93a50027 */ lbu $a1,0x27($sp) -/* 5041c: 0c014068 */ jal func000501a0 +/* 5041c: 0c014068 */ jal osEepromRead /* 50420: 8fa60028 */ lw $a2,0x28($sp) /* 50424: afa2001c */ sw $v0,0x1c($sp) /* 50428: 8faf001c */ lw $t7,0x1c($sp) diff --git a/src/lib/lib_51890.c b/src/lib/lib_51890.c index 4c3c66de7..fafbc3bd9 100644 --- a/src/lib/lib_51890.c +++ b/src/lib/lib_51890.c @@ -20,7 +20,7 @@ glabel func00051890 ); GLOBAL_ASM( -glabel func000518a0 +glabel __osResetGlobalIntMask /* 518a0: 27bdffd8 */ addiu $sp,$sp,-40 /* 518a4: afbf001c */ sw $ra,0x1c($sp) /* 518a8: afa40028 */ sw $a0,0x28($sp) diff --git a/src/lib/lib_51900.c b/src/lib/lib_51900.c index 719e3d4d3..15c49680b 100644 --- a/src/lib/lib_51900.c +++ b/src/lib/lib_51900.c @@ -11,7 +11,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00051900 +glabel osEPiRawWriteIo /* 51900: 3c03a460 */ lui $v1,0xa460 /* 51904: 34630010 */ ori $v1,$v1,0x10 /* 51908: 8c620000 */ lw $v0,0x0($v1) diff --git a/src/lib/lib_51a60.c b/src/lib/lib_51a60.c index 1cfaa343b..f2938dfe1 100644 --- a/src/lib/lib_51a60.c +++ b/src/lib/lib_51a60.c @@ -12,7 +12,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00051a60 +glabel osEPiRawReadIo /* 51a60: 3c03a460 */ lui $v1,0xa460 /* 51a64: 34630010 */ ori $v1,$v1,0x10 /* 51a68: 8c620000 */ lw $v0,0x0($v1) @@ -116,7 +116,7 @@ glabel func00051a60 ); GLOBAL_ASM( -glabel func00051bc0 +glabel __osSetGlobalIntMask /* 51bc0: 27bdffd8 */ addiu $sp,$sp,-40 /* 51bc4: afbf001c */ sw $ra,0x1c($sp) /* 51bc8: afa40028 */ sw $a0,0x28($sp) diff --git a/src/lib/lib_51c10.c b/src/lib/lib_51c10.c index d988972db..25ab02804 100644 --- a/src/lib/lib_51c10.c +++ b/src/lib/lib_51c10.c @@ -13,7 +13,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00051c10 +glabel osYieldThread /* 51c10: 27bdffd8 */ addiu $sp,$sp,-40 /* 51c14: afbf001c */ sw $ra,0x1c($sp) /* 51c18: 0c01256c */ jal __osDisableInt diff --git a/src/lib/lib_51ec0.c b/src/lib/lib_51ec0.c index f712dd4cb..333d56bdb 100644 --- a/src/lib/lib_51ec0.c +++ b/src/lib/lib_51ec0.c @@ -32,7 +32,7 @@ glabel func00051ec0 ); GLOBAL_ASM( -glabel func00051ef0 +glabel osJamMesg /* 51ef0: 27bdffd8 */ addiu $sp,$sp,-40 /* 51ef4: afbf001c */ sw $ra,0x1c($sp) /* 51ef8: afa40028 */ sw $a0,0x28($sp) @@ -128,7 +128,7 @@ glabel func00051ef0 ); GLOBAL_ASM( -glabel func00052040 +glabel osPiGetCmdQueue /* 52040: 3c0e8006 */ lui $t6,%hi(var8005cf00) /* 52044: 8dcecf00 */ lw $t6,%lo(var8005cf00)($t6) /* 52048: 15c00003 */ bnez $t6,.L00052058 diff --git a/src/lib/lib_52070.c b/src/lib/lib_52070.c index 8785a4659..64bb2659f 100644 --- a/src/lib/lib_52070.c +++ b/src/lib/lib_52070.c @@ -14,7 +14,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00052070 +glabel osPiRawReadIo /* 52070: 3c03a460 */ lui $v1,0xa460 /* 52074: 34630010 */ ori $v1,$v1,0x10 /* 52078: 8c620000 */ lw $v0,0x0($v1)