diff --git a/Makefile b/Makefile index 3d757198df..66ff3a12a7 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ MAKEREL := tools/makerel.py IMAGENAME := gz2e01.iso # Options -INCLUDES := -i include -i include/dolphin/ -i src +INCLUDES := -i include -i include/dolphin/ -i src -i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include -i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include -i libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include -i libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include -i libs/PowerPC_EABI_Support/Runtime/Inc/ # Assembler flags ASFLAGS := -mgekko -I include diff --git a/asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s b/asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s deleted file mode 100644 index 2c2c6aba0c..0000000000 --- a/asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s +++ /dev/null @@ -1,177 +0,0 @@ -lbl_80365C20: -/* 80365C20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80365C24 7C 08 02 A6 */ mflr r0 -/* 80365C28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80365C2C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80365C30 7C BF 2B 78 */ mr r31, r5 -/* 80365C34 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80365C38 7C 7E 1B 78 */ mr r30, r3 -/* 80365C3C 90 81 00 08 */ stw r4, 8(r1) -/* 80365C40 A0 03 00 04 */ lhz r0, 4(r3) -/* 80365C44 54 00 D7 7E */ rlwinm r0, r0, 0x1a, 0x1d, 0x1f -/* 80365C48 28 00 00 01 */ cmplwi r0, 1 -/* 80365C4C 40 82 00 10 */ bne lbl_80365C5C -/* 80365C50 88 1E 00 0A */ lbz r0, 0xa(r30) -/* 80365C54 28 00 00 00 */ cmplwi r0, 0 -/* 80365C58 41 82 00 14 */ beq lbl_80365C6C -lbl_80365C5C: -/* 80365C5C 38 00 00 28 */ li r0, 0x28 -/* 80365C60 38 60 FF FF */ li r3, -1 -/* 80365C64 90 0D 94 28 */ stw r0, errno(r13) -/* 80365C68 48 00 02 10 */ b lbl_80365E78 -lbl_80365C6C: -/* 80365C6C 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365C70 54 00 DF 7E */ rlwinm r0, r0, 0x1b, 0x1d, 0x1f -/* 80365C74 28 00 00 01 */ cmplwi r0, 1 -/* 80365C78 40 82 00 34 */ bne lbl_80365CAC -/* 80365C7C 38 80 00 00 */ li r4, 0 -/* 80365C80 4B FF F4 61 */ bl __flush_buffer -/* 80365C84 2C 03 00 00 */ cmpwi r3, 0 -/* 80365C88 41 82 00 24 */ beq lbl_80365CAC -/* 80365C8C 38 00 00 01 */ li r0, 1 -/* 80365C90 38 80 00 00 */ li r4, 0 -/* 80365C94 98 1E 00 0A */ stb r0, 0xa(r30) -/* 80365C98 38 00 00 28 */ li r0, 0x28 -/* 80365C9C 38 60 FF FF */ li r3, -1 -/* 80365CA0 90 9E 00 28 */ stw r4, 0x28(r30) -/* 80365CA4 90 0D 94 28 */ stw r0, errno(r13) -/* 80365CA8 48 00 01 D0 */ b lbl_80365E78 -lbl_80365CAC: -/* 80365CAC 2C 1F 00 01 */ cmpwi r31, 1 -/* 80365CB0 40 82 00 B4 */ bne lbl_80365D64 -/* 80365CB4 A0 1E 00 04 */ lhz r0, 4(r30) -/* 80365CB8 3B E0 00 00 */ li r31, 0 -/* 80365CBC 38 80 00 00 */ li r4, 0 -/* 80365CC0 54 00 D7 7E */ rlwinm r0, r0, 0x1a, 0x1d, 0x1f -/* 80365CC4 28 00 00 01 */ cmplwi r0, 1 -/* 80365CC8 41 82 00 0C */ beq lbl_80365CD4 -/* 80365CCC 28 00 00 02 */ cmplwi r0, 2 -/* 80365CD0 40 82 00 10 */ bne lbl_80365CE0 -lbl_80365CD4: -/* 80365CD4 88 1E 00 0A */ lbz r0, 0xa(r30) -/* 80365CD8 28 00 00 00 */ cmplwi r0, 0 -/* 80365CDC 41 82 00 14 */ beq lbl_80365CF0 -lbl_80365CE0: -/* 80365CE0 38 00 00 28 */ li r0, 0x28 -/* 80365CE4 38 60 FF FF */ li r3, -1 -/* 80365CE8 90 0D 94 28 */ stw r0, errno(r13) -/* 80365CEC 48 00 00 6C */ b lbl_80365D58 -lbl_80365CF0: -/* 80365CF0 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365CF4 54 05 DF 7F */ rlwinm. r5, r0, 0x1b, 0x1d, 0x1f -/* 80365CF8 40 82 00 0C */ bne lbl_80365D04 -/* 80365CFC 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 80365D00 48 00 00 58 */ b lbl_80365D58 -lbl_80365D04: -/* 80365D04 80 FE 00 1C */ lwz r7, 0x1c(r30) -/* 80365D08 28 05 00 03 */ cmplwi r5, 3 -/* 80365D0C 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 80365D10 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80365D14 7C C7 00 50 */ subf r6, r7, r0 -/* 80365D18 7C 63 32 14 */ add r3, r3, r6 -/* 80365D1C 41 80 00 0C */ blt lbl_80365D28 -/* 80365D20 38 85 FF FE */ addi r4, r5, -2 -/* 80365D24 7C 64 18 50 */ subf r3, r4, r3 -lbl_80365D28: -/* 80365D28 88 1E 00 05 */ lbz r0, 5(r30) -/* 80365D2C 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f -/* 80365D30 40 82 00 28 */ bne lbl_80365D58 -/* 80365D34 7C 04 30 51 */ subf. r0, r4, r6 -/* 80365D38 7C 09 03 A6 */ mtctr r0 -/* 80365D3C 41 82 00 1C */ beq lbl_80365D58 -lbl_80365D40: -/* 80365D40 88 07 00 00 */ lbz r0, 0(r7) -/* 80365D44 38 E7 00 01 */ addi r7, r7, 1 -/* 80365D48 28 00 00 0A */ cmplwi r0, 0xa -/* 80365D4C 40 82 00 08 */ bne lbl_80365D54 -/* 80365D50 38 63 00 01 */ addi r3, r3, 1 -lbl_80365D54: -/* 80365D54 42 00 FF EC */ bdnz lbl_80365D40 -lbl_80365D58: -/* 80365D58 80 01 00 08 */ lwz r0, 8(r1) -/* 80365D5C 7C 00 1A 14 */ add r0, r0, r3 -/* 80365D60 90 01 00 08 */ stw r0, 8(r1) -lbl_80365D64: -/* 80365D64 2C 1F 00 02 */ cmpwi r31, 2 -/* 80365D68 41 82 00 90 */ beq lbl_80365DF8 -/* 80365D6C 88 1E 00 04 */ lbz r0, 4(r30) -/* 80365D70 54 00 EF 7E */ rlwinm r0, r0, 0x1d, 0x1d, 0x1f -/* 80365D74 28 00 00 03 */ cmplwi r0, 3 -/* 80365D78 41 82 00 80 */ beq lbl_80365DF8 -/* 80365D7C 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365D80 54 00 DF 7E */ rlwinm r0, r0, 0x1b, 0x1d, 0x1f -/* 80365D84 28 00 00 02 */ cmplwi r0, 2 -/* 80365D88 41 82 00 0C */ beq lbl_80365D94 -/* 80365D8C 28 00 00 03 */ cmplwi r0, 3 -/* 80365D90 40 82 00 68 */ bne lbl_80365DF8 -lbl_80365D94: -/* 80365D94 80 61 00 08 */ lwz r3, 8(r1) -/* 80365D98 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80365D9C 7C 03 00 40 */ cmplw r3, r0 -/* 80365DA0 40 80 00 10 */ bge lbl_80365DB0 -/* 80365DA4 80 1E 00 34 */ lwz r0, 0x34(r30) -/* 80365DA8 7C 03 00 40 */ cmplw r3, r0 -/* 80365DAC 40 80 00 18 */ bge lbl_80365DC4 -lbl_80365DB0: -/* 80365DB0 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365DB4 38 60 00 00 */ li r3, 0 -/* 80365DB8 50 60 2E 34 */ rlwimi r0, r3, 5, 0x18, 0x1a -/* 80365DBC 98 1E 00 08 */ stb r0, 8(r30) -/* 80365DC0 48 00 00 48 */ b lbl_80365E08 -lbl_80365DC4: -/* 80365DC4 80 9E 00 1C */ lwz r4, 0x1c(r30) -/* 80365DC8 7C 00 18 50 */ subf r0, r0, r3 -/* 80365DCC 38 60 00 02 */ li r3, 2 -/* 80365DD0 7C 04 02 14 */ add r0, r4, r0 -/* 80365DD4 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80365DD8 80 81 00 08 */ lwz r4, 8(r1) -/* 80365DDC 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80365DE0 7C 04 00 50 */ subf r0, r4, r0 -/* 80365DE4 90 1E 00 28 */ stw r0, 0x28(r30) -/* 80365DE8 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365DEC 50 60 2E 34 */ rlwimi r0, r3, 5, 0x18, 0x1a -/* 80365DF0 98 1E 00 08 */ stb r0, 8(r30) -/* 80365DF4 48 00 00 14 */ b lbl_80365E08 -lbl_80365DF8: -/* 80365DF8 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365DFC 38 60 00 00 */ li r3, 0 -/* 80365E00 50 60 2E 34 */ rlwimi r0, r3, 5, 0x18, 0x1a -/* 80365E04 98 1E 00 08 */ stb r0, 8(r30) -lbl_80365E08: -/* 80365E08 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365E0C 54 00 DF 7F */ rlwinm. r0, r0, 0x1b, 0x1d, 0x1f -/* 80365E10 40 82 00 64 */ bne lbl_80365E74 -/* 80365E14 81 9E 00 38 */ lwz r12, 0x38(r30) -/* 80365E18 28 0C 00 00 */ cmplwi r12, 0 -/* 80365E1C 41 82 00 44 */ beq lbl_80365E60 -/* 80365E20 7F E5 FB 78 */ mr r5, r31 -/* 80365E24 38 81 00 08 */ addi r4, r1, 8 -/* 80365E28 80 7E 00 00 */ lwz r3, 0(r30) -/* 80365E2C 80 DE 00 48 */ lwz r6, 0x48(r30) -/* 80365E30 7D 89 03 A6 */ mtctr r12 -/* 80365E34 4E 80 04 21 */ bctrl -/* 80365E38 2C 03 00 00 */ cmpwi r3, 0 -/* 80365E3C 41 82 00 24 */ beq lbl_80365E60 -/* 80365E40 38 00 00 01 */ li r0, 1 -/* 80365E44 38 80 00 00 */ li r4, 0 -/* 80365E48 98 1E 00 0A */ stb r0, 0xa(r30) -/* 80365E4C 38 00 00 28 */ li r0, 0x28 -/* 80365E50 38 60 FF FF */ li r3, -1 -/* 80365E54 90 9E 00 28 */ stw r4, 0x28(r30) -/* 80365E58 90 0D 94 28 */ stw r0, errno(r13) -/* 80365E5C 48 00 00 1C */ b lbl_80365E78 -lbl_80365E60: -/* 80365E60 38 60 00 00 */ li r3, 0 -/* 80365E64 98 7E 00 09 */ stb r3, 9(r30) -/* 80365E68 80 01 00 08 */ lwz r0, 8(r1) -/* 80365E6C 90 1E 00 18 */ stw r0, 0x18(r30) -/* 80365E70 90 7E 00 28 */ stw r3, 0x28(r30) -lbl_80365E74: -/* 80365E74 38 60 00 00 */ li r3, 0 -lbl_80365E78: -/* 80365E78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80365E7C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80365E80 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80365E84 7C 08 03 A6 */ mtlr r0 -/* 80365E88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80365E8C 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s b/asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s deleted file mode 100644 index 59806cdf02..0000000000 --- a/asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80365BB4: -/* 80365BB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80365BB8 7C 08 02 A6 */ mflr r0 -/* 80365BBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80365BC0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80365BC4 7C BF 2B 78 */ mr r31, r5 -/* 80365BC8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80365BCC 7C 9E 23 78 */ mr r30, r4 -/* 80365BD0 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80365BD4 7C 7D 1B 78 */ mr r29, r3 -/* 80365BD8 38 60 00 02 */ li r3, 2 -/* 80365BDC 4B FF F8 8D */ bl __begin_critical_region -/* 80365BE0 7F A3 EB 78 */ mr r3, r29 -/* 80365BE4 7F C4 F3 78 */ mr r4, r30 -/* 80365BE8 7F E5 FB 78 */ mr r5, r31 -/* 80365BEC 48 00 00 35 */ bl _fseek -/* 80365BF0 7C 60 1B 78 */ mr r0, r3 -/* 80365BF4 38 60 00 02 */ li r3, 2 -/* 80365BF8 7C 1F 03 78 */ mr r31, r0 -/* 80365BFC 4B FF F8 69 */ bl __end_critical_region -/* 80365C00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80365C04 7F E3 FB 78 */ mr r3, r31 -/* 80365C08 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80365C0C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80365C10 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80365C14 7C 08 03 A6 */ mtlr r0 -/* 80365C18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80365C1C 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s b/asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s deleted file mode 100644 index 2b7f2a21e7..0000000000 --- a/asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80365E90: -/* 80365E90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80365E94 7C 08 02 A6 */ mflr r0 -/* 80365E98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80365E9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80365EA0 93 C1 00 08 */ stw r30, 8(r1) -/* 80365EA4 7C 7E 1B 78 */ mr r30, r3 -/* 80365EA8 38 60 00 02 */ li r3, 2 -/* 80365EAC 4B FF F5 BD */ bl __begin_critical_region -/* 80365EB0 A0 1E 00 04 */ lhz r0, 4(r30) -/* 80365EB4 38 80 00 00 */ li r4, 0 -/* 80365EB8 54 00 D7 7E */ rlwinm r0, r0, 0x1a, 0x1d, 0x1f -/* 80365EBC 28 00 00 01 */ cmplwi r0, 1 -/* 80365EC0 41 82 00 0C */ beq lbl_80365ECC -/* 80365EC4 28 00 00 02 */ cmplwi r0, 2 -/* 80365EC8 40 82 00 10 */ bne lbl_80365ED8 -lbl_80365ECC: -/* 80365ECC 88 1E 00 0A */ lbz r0, 0xa(r30) -/* 80365ED0 28 00 00 00 */ cmplwi r0, 0 -/* 80365ED4 41 82 00 14 */ beq lbl_80365EE8 -lbl_80365ED8: -/* 80365ED8 38 00 00 28 */ li r0, 0x28 -/* 80365EDC 3B E0 FF FF */ li r31, -1 -/* 80365EE0 90 0D 94 28 */ stw r0, errno(r13) -/* 80365EE4 48 00 00 6C */ b lbl_80365F50 -lbl_80365EE8: -/* 80365EE8 88 1E 00 08 */ lbz r0, 8(r30) -/* 80365EEC 54 05 DF 7F */ rlwinm. r5, r0, 0x1b, 0x1d, 0x1f -/* 80365EF0 40 82 00 0C */ bne lbl_80365EFC -/* 80365EF4 83 FE 00 18 */ lwz r31, 0x18(r30) -/* 80365EF8 48 00 00 58 */ b lbl_80365F50 -lbl_80365EFC: -/* 80365EFC 80 FE 00 1C */ lwz r7, 0x1c(r30) -/* 80365F00 28 05 00 03 */ cmplwi r5, 3 -/* 80365F04 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 80365F08 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80365F0C 7C C7 00 50 */ subf r6, r7, r0 -/* 80365F10 7F E3 32 14 */ add r31, r3, r6 -/* 80365F14 41 80 00 0C */ blt lbl_80365F20 -/* 80365F18 38 85 FF FE */ addi r4, r5, -2 -/* 80365F1C 7F E4 F8 50 */ subf r31, r4, r31 -lbl_80365F20: -/* 80365F20 88 1E 00 05 */ lbz r0, 5(r30) -/* 80365F24 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f -/* 80365F28 40 82 00 28 */ bne lbl_80365F50 -/* 80365F2C 7C 04 30 51 */ subf. r0, r4, r6 -/* 80365F30 7C 09 03 A6 */ mtctr r0 -/* 80365F34 41 82 00 1C */ beq lbl_80365F50 -lbl_80365F38: -/* 80365F38 88 07 00 00 */ lbz r0, 0(r7) -/* 80365F3C 38 E7 00 01 */ addi r7, r7, 1 -/* 80365F40 28 00 00 0A */ cmplwi r0, 0xa -/* 80365F44 40 82 00 08 */ bne lbl_80365F4C -/* 80365F48 3B FF 00 01 */ addi r31, r31, 1 -lbl_80365F4C: -/* 80365F4C 42 00 FF EC */ bdnz lbl_80365F38 -lbl_80365F50: -/* 80365F50 38 60 00 02 */ li r3, 2 -/* 80365F54 4B FF F5 11 */ bl __end_critical_region -/* 80365F58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80365F5C 7F E3 FB 78 */ mr r3, r31 -/* 80365F60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80365F64 83 C1 00 08 */ lwz r30, 8(r1) -/* 80365F68 7C 08 03 A6 */ mtlr r0 -/* 80365F6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365F70 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s b/asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s deleted file mode 100644 index 40ce1f78dc..0000000000 --- a/asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80362BC8: -/* 80362BC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80362BCC 7C 08 02 A6 */ mflr r0 -/* 80362BD0 28 04 00 00 */ cmplwi r4, 0 -/* 80362BD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80362BD8 41 82 00 38 */ beq lbl_80362C10 -/* 80362BDC 80 A4 FF FC */ lwz r5, -4(r4) -/* 80362BE0 54 A0 07 FF */ clrlwi. r0, r5, 0x1f -/* 80362BE4 40 82 00 0C */ bne lbl_80362BF0 -/* 80362BE8 80 A5 00 08 */ lwz r5, 8(r5) -/* 80362BEC 48 00 00 10 */ b lbl_80362BFC -lbl_80362BF0: -/* 80362BF0 80 04 FF F8 */ lwz r0, -8(r4) -/* 80362BF4 54 05 00 38 */ rlwinm r5, r0, 0, 0, 0x1c -/* 80362BF8 38 A5 FF F8 */ addi r5, r5, -8 -lbl_80362BFC: -/* 80362BFC 28 05 00 44 */ cmplwi r5, 0x44 -/* 80362C00 41 81 00 0C */ bgt lbl_80362C0C -/* 80362C04 48 00 00 1D */ bl deallocate_from_fixed_pools -/* 80362C08 48 00 00 08 */ b lbl_80362C10 -lbl_80362C0C: -/* 80362C0C 48 00 01 6D */ bl deallocate_from_var_pools -lbl_80362C10: -/* 80362C10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80362C14 7C 08 03 A6 */ mtlr r0 -/* 80362C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80362C1C 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s b/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s deleted file mode 100644 index 844b96a5bf..0000000000 --- a/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_80362C20: -/* 80362C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80362C24 7C 08 02 A6 */ mflr r0 -/* 80362C28 3C C0 80 3A */ lis r6, fix_pool_sizes@ha /* 0x803A2220@ha */ -/* 80362C2C 38 E0 00 00 */ li r7, 0 -/* 80362C30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80362C34 38 C6 22 20 */ addi r6, r6, fix_pool_sizes@l /* 0x803A2220@l */ -/* 80362C38 48 00 00 0C */ b lbl_80362C44 -lbl_80362C3C: -/* 80362C3C 38 C6 00 04 */ addi r6, r6, 4 -/* 80362C40 38 E7 00 01 */ addi r7, r7, 1 -lbl_80362C44: -/* 80362C44 80 06 00 00 */ lwz r0, 0(r6) -/* 80362C48 7C 05 00 40 */ cmplw r5, r0 -/* 80362C4C 41 81 FF F0 */ bgt lbl_80362C3C -/* 80362C50 39 04 FF FC */ addi r8, r4, -4 -/* 80362C54 54 E5 18 38 */ slwi r5, r7, 3 -/* 80362C58 80 84 FF FC */ lwz r4, -4(r4) -/* 80362C5C 38 A5 00 04 */ addi r5, r5, 4 -/* 80362C60 7C A3 2A 14 */ add r5, r3, r5 -/* 80362C64 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80362C68 28 00 00 00 */ cmplwi r0, 0 -/* 80362C6C 40 82 00 74 */ bne lbl_80362CE0 -/* 80362C70 80 C5 00 04 */ lwz r6, 4(r5) -/* 80362C74 7C 06 20 40 */ cmplw r6, r4 -/* 80362C78 41 82 00 68 */ beq lbl_80362CE0 -/* 80362C7C 80 05 00 00 */ lwz r0, 0(r5) -/* 80362C80 7C 00 20 40 */ cmplw r0, r4 -/* 80362C84 40 82 00 1C */ bne lbl_80362CA0 -/* 80362C88 80 06 00 00 */ lwz r0, 0(r6) -/* 80362C8C 90 05 00 04 */ stw r0, 4(r5) -/* 80362C90 80 C5 00 00 */ lwz r6, 0(r5) -/* 80362C94 80 06 00 00 */ lwz r0, 0(r6) -/* 80362C98 90 05 00 00 */ stw r0, 0(r5) -/* 80362C9C 48 00 00 44 */ b lbl_80362CE0 -lbl_80362CA0: -/* 80362CA0 80 04 00 04 */ lwz r0, 4(r4) -/* 80362CA4 80 C4 00 00 */ lwz r6, 0(r4) -/* 80362CA8 90 06 00 04 */ stw r0, 4(r6) -/* 80362CAC 80 04 00 00 */ lwz r0, 0(r4) -/* 80362CB0 80 C4 00 04 */ lwz r6, 4(r4) -/* 80362CB4 90 06 00 00 */ stw r0, 0(r6) -/* 80362CB8 80 05 00 04 */ lwz r0, 4(r5) -/* 80362CBC 90 04 00 04 */ stw r0, 4(r4) -/* 80362CC0 80 C4 00 04 */ lwz r6, 4(r4) -/* 80362CC4 80 06 00 00 */ lwz r0, 0(r6) -/* 80362CC8 90 04 00 00 */ stw r0, 0(r4) -/* 80362CCC 80 C4 00 00 */ lwz r6, 0(r4) -/* 80362CD0 90 86 00 04 */ stw r4, 4(r6) -/* 80362CD4 80 C4 00 04 */ lwz r6, 4(r4) -/* 80362CD8 90 86 00 00 */ stw r4, 0(r6) -/* 80362CDC 90 85 00 04 */ stw r4, 4(r5) -lbl_80362CE0: -/* 80362CE0 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80362CE4 90 08 00 04 */ stw r0, 4(r8) -/* 80362CE8 91 04 00 0C */ stw r8, 0xc(r4) -/* 80362CEC 80 C4 00 10 */ lwz r6, 0x10(r4) -/* 80362CF0 34 06 FF FF */ addic. r0, r6, -1 -/* 80362CF4 90 04 00 10 */ stw r0, 0x10(r4) -/* 80362CF8 40 82 00 70 */ bne lbl_80362D68 -/* 80362CFC 80 05 00 04 */ lwz r0, 4(r5) -/* 80362D00 7C 00 20 40 */ cmplw r0, r4 -/* 80362D04 40 82 00 0C */ bne lbl_80362D10 -/* 80362D08 80 04 00 04 */ lwz r0, 4(r4) -/* 80362D0C 90 05 00 04 */ stw r0, 4(r5) -lbl_80362D10: -/* 80362D10 80 05 00 00 */ lwz r0, 0(r5) -/* 80362D14 7C 00 20 40 */ cmplw r0, r4 -/* 80362D18 40 82 00 0C */ bne lbl_80362D24 -/* 80362D1C 80 04 00 00 */ lwz r0, 0(r4) -/* 80362D20 90 05 00 00 */ stw r0, 0(r5) -lbl_80362D24: -/* 80362D24 80 04 00 04 */ lwz r0, 4(r4) -/* 80362D28 80 C4 00 00 */ lwz r6, 0(r4) -/* 80362D2C 90 06 00 04 */ stw r0, 4(r6) -/* 80362D30 80 04 00 00 */ lwz r0, 0(r4) -/* 80362D34 80 C4 00 04 */ lwz r6, 4(r4) -/* 80362D38 90 06 00 00 */ stw r0, 0(r6) -/* 80362D3C 80 05 00 04 */ lwz r0, 4(r5) -/* 80362D40 7C 00 20 40 */ cmplw r0, r4 -/* 80362D44 40 82 00 0C */ bne lbl_80362D50 -/* 80362D48 38 00 00 00 */ li r0, 0 -/* 80362D4C 90 05 00 04 */ stw r0, 4(r5) -lbl_80362D50: -/* 80362D50 80 05 00 00 */ lwz r0, 0(r5) -/* 80362D54 7C 00 20 40 */ cmplw r0, r4 -/* 80362D58 40 82 00 0C */ bne lbl_80362D64 -/* 80362D5C 38 00 00 00 */ li r0, 0 -/* 80362D60 90 05 00 00 */ stw r0, 0(r5) -lbl_80362D64: -/* 80362D64 48 00 00 15 */ bl deallocate_from_var_pools -lbl_80362D68: -/* 80362D68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80362D6C 7C 08 03 A6 */ mtlr r0 -/* 80362D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80362D74 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s b/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s deleted file mode 100644 index be89111a07..0000000000 --- a/asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_80362D78: -/* 80362D78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80362D7C 7C 08 02 A6 */ mflr r0 -/* 80362D80 39 04 FF F8 */ addi r8, r4, -8 -/* 80362D84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80362D88 80 84 FF F8 */ lwz r4, -8(r4) -/* 80362D8C 80 A8 00 04 */ lwz r5, 4(r8) -/* 80362D90 54 80 07 FA */ rlwinm r0, r4, 0, 0x1f, 0x1d -/* 80362D94 54 86 00 38 */ rlwinm r6, r4, 0, 0, 0x1c -/* 80362D98 90 08 00 00 */ stw r0, 0(r8) -/* 80362D9C 7C E8 32 14 */ add r7, r8, r6 -/* 80362DA0 54 A4 00 3C */ rlwinm r4, r5, 0, 0, 0x1e -/* 80362DA4 80 07 00 00 */ lwz r0, 0(r7) -/* 80362DA8 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 80362DAC 90 07 00 00 */ stw r0, 0(r7) -/* 80362DB0 90 C7 FF FC */ stw r6, -4(r7) -/* 80362DB4 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80362DB8 54 05 00 38 */ rlwinm r5, r0, 0, 0, 0x1c -/* 80362DBC 38 05 FF FC */ addi r0, r5, -4 -/* 80362DC0 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362DC4 28 05 00 00 */ cmplwi r5, 0 -/* 80362DC8 41 82 01 8C */ beq lbl_80362F54 -/* 80362DCC 80 A5 00 08 */ lwz r5, 8(r5) -/* 80362DD0 90 A8 00 08 */ stw r5, 8(r8) -/* 80362DD4 80 A8 00 08 */ lwz r5, 8(r8) -/* 80362DD8 91 05 00 0C */ stw r8, 0xc(r5) -/* 80362DDC 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362DE0 90 A8 00 0C */ stw r5, 0xc(r8) -/* 80362DE4 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362DE8 91 05 00 08 */ stw r8, 8(r5) -/* 80362DEC 7D 04 01 2E */ stwx r8, r4, r0 -/* 80362DF0 7D 24 00 2E */ lwzx r9, r4, r0 -/* 80362DF4 80 A9 00 00 */ lwz r5, 0(r9) -/* 80362DF8 54 A5 07 7B */ rlwinm. r5, r5, 0, 0x1d, 0x1d -/* 80362DFC 40 82 00 94 */ bne lbl_80362E90 -/* 80362E00 81 09 FF FC */ lwz r8, -4(r9) -/* 80362E04 55 05 07 BD */ rlwinm. r5, r8, 0, 0x1e, 0x1e -/* 80362E08 41 82 00 0C */ beq lbl_80362E14 -/* 80362E0C 7D 27 4B 78 */ mr r7, r9 -/* 80362E10 48 00 00 84 */ b lbl_80362E94 -lbl_80362E14: -/* 80362E14 7C E8 48 50 */ subf r7, r8, r9 -/* 80362E18 80 A7 00 00 */ lwz r5, 0(r7) -/* 80362E1C 54 A5 07 7E */ clrlwi r5, r5, 0x1d -/* 80362E20 90 A7 00 00 */ stw r5, 0(r7) -/* 80362E24 80 A9 00 00 */ lwz r5, 0(r9) -/* 80362E28 80 C7 00 00 */ lwz r6, 0(r7) -/* 80362E2C 54 A5 00 38 */ rlwinm r5, r5, 0, 0, 0x1c -/* 80362E30 7C A8 2A 14 */ add r5, r8, r5 -/* 80362E34 54 A5 00 38 */ rlwinm r5, r5, 0, 0, 0x1c -/* 80362E38 7C C5 2B 78 */ or r5, r6, r5 -/* 80362E3C 90 A7 00 00 */ stw r5, 0(r7) -/* 80362E40 80 A7 00 00 */ lwz r5, 0(r7) -/* 80362E44 54 A5 07 BD */ rlwinm. r5, r5, 0, 0x1e, 0x1e -/* 80362E48 40 82 00 18 */ bne lbl_80362E60 -/* 80362E4C 80 A9 00 00 */ lwz r5, 0(r9) -/* 80362E50 54 A5 00 38 */ rlwinm r5, r5, 0, 0, 0x1c -/* 80362E54 7C C8 2A 14 */ add r6, r8, r5 -/* 80362E58 38 A6 FF FC */ addi r5, r6, -4 -/* 80362E5C 7C C7 29 2E */ stwx r6, r7, r5 -lbl_80362E60: -/* 80362E60 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362E64 7C 05 48 40 */ cmplw r5, r9 -/* 80362E68 40 82 00 0C */ bne lbl_80362E74 -/* 80362E6C 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 80362E70 7C A4 01 2E */ stwx r5, r4, r0 -lbl_80362E74: -/* 80362E74 80 C9 00 08 */ lwz r6, 8(r9) -/* 80362E78 80 A9 00 0C */ lwz r5, 0xc(r9) -/* 80362E7C 90 C5 00 08 */ stw r6, 8(r5) -/* 80362E80 80 C9 00 0C */ lwz r6, 0xc(r9) -/* 80362E84 80 A6 00 08 */ lwz r5, 8(r6) -/* 80362E88 90 C5 00 0C */ stw r6, 0xc(r5) -/* 80362E8C 48 00 00 08 */ b lbl_80362E94 -lbl_80362E90: -/* 80362E90 7D 27 4B 78 */ mr r7, r9 -lbl_80362E94: -/* 80362E94 7C E4 01 2E */ stwx r7, r4, r0 -/* 80362E98 7D 24 00 2E */ lwzx r9, r4, r0 -/* 80362E9C 80 C9 00 00 */ lwz r6, 0(r9) -/* 80362EA0 54 CA 00 38 */ rlwinm r10, r6, 0, 0, 0x1c -/* 80362EA4 7D 09 52 14 */ add r8, r9, r10 -/* 80362EA8 80 E8 00 00 */ lwz r7, 0(r8) -/* 80362EAC 54 E5 07 BD */ rlwinm. r5, r7, 0, 0x1e, 0x1e -/* 80362EB0 40 82 00 B0 */ bne lbl_80362F60 -/* 80362EB4 54 C5 07 7E */ clrlwi r5, r6, 0x1d -/* 80362EB8 54 E6 00 38 */ rlwinm r6, r7, 0, 0, 0x1c -/* 80362EBC 90 A9 00 00 */ stw r5, 0(r9) -/* 80362EC0 7C EA 32 14 */ add r7, r10, r6 -/* 80362EC4 54 E5 00 38 */ rlwinm r5, r7, 0, 0, 0x1c -/* 80362EC8 80 C9 00 00 */ lwz r6, 0(r9) -/* 80362ECC 7C C5 2B 78 */ or r5, r6, r5 -/* 80362ED0 90 A9 00 00 */ stw r5, 0(r9) -/* 80362ED4 80 A9 00 00 */ lwz r5, 0(r9) -/* 80362ED8 54 A5 07 BD */ rlwinm. r5, r5, 0, 0x1e, 0x1e -/* 80362EDC 40 82 00 0C */ bne lbl_80362EE8 -/* 80362EE0 38 A7 FF FC */ addi r5, r7, -4 -/* 80362EE4 7C E9 29 2E */ stwx r7, r9, r5 -lbl_80362EE8: -/* 80362EE8 80 A9 00 00 */ lwz r5, 0(r9) -/* 80362EEC 54 A5 07 BD */ rlwinm. r5, r5, 0, 0x1e, 0x1e -/* 80362EF0 40 82 00 14 */ bne lbl_80362F04 -/* 80362EF4 7C A9 38 2E */ lwzx r5, r9, r7 -/* 80362EF8 54 A5 07 B8 */ rlwinm r5, r5, 0, 0x1e, 0x1c -/* 80362EFC 7C A9 39 2E */ stwx r5, r9, r7 -/* 80362F00 48 00 00 10 */ b lbl_80362F10 -lbl_80362F04: -/* 80362F04 7C A9 38 2E */ lwzx r5, r9, r7 -/* 80362F08 60 A5 00 04 */ ori r5, r5, 4 -/* 80362F0C 7C A9 39 2E */ stwx r5, r9, r7 -lbl_80362F10: -/* 80362F10 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362F14 7C 05 40 40 */ cmplw r5, r8 -/* 80362F18 40 82 00 0C */ bne lbl_80362F24 -/* 80362F1C 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 80362F20 7C A4 01 2E */ stwx r5, r4, r0 -lbl_80362F24: -/* 80362F24 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362F28 7C 05 40 40 */ cmplw r5, r8 -/* 80362F2C 40 82 00 0C */ bne lbl_80362F38 -/* 80362F30 38 A0 00 00 */ li r5, 0 -/* 80362F34 7C A4 01 2E */ stwx r5, r4, r0 -lbl_80362F38: -/* 80362F38 80 C8 00 08 */ lwz r6, 8(r8) -/* 80362F3C 80 A8 00 0C */ lwz r5, 0xc(r8) -/* 80362F40 90 C5 00 08 */ stw r6, 8(r5) -/* 80362F44 80 C8 00 0C */ lwz r6, 0xc(r8) -/* 80362F48 80 A8 00 08 */ lwz r5, 8(r8) -/* 80362F4C 90 C5 00 0C */ stw r6, 0xc(r5) -/* 80362F50 48 00 00 10 */ b lbl_80362F60 -lbl_80362F54: -/* 80362F54 7D 04 01 2E */ stwx r8, r4, r0 -/* 80362F58 91 08 00 08 */ stw r8, 8(r8) -/* 80362F5C 91 08 00 0C */ stw r8, 0xc(r8) -lbl_80362F60: -/* 80362F60 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80362F64 80 C4 00 08 */ lwz r6, 8(r4) -/* 80362F68 80 05 00 00 */ lwz r0, 0(r5) -/* 80362F6C 54 00 00 38 */ rlwinm r0, r0, 0, 0, 0x1c -/* 80362F70 7C 06 00 40 */ cmplw r6, r0 -/* 80362F74 40 80 00 08 */ bge lbl_80362F7C -/* 80362F78 90 04 00 08 */ stw r0, 8(r4) -lbl_80362F7C: -/* 80362F7C 80 A4 00 10 */ lwz r5, 0x10(r4) -/* 80362F80 38 E0 00 00 */ li r7, 0 -/* 80362F84 54 A0 07 BD */ rlwinm. r0, r5, 0, 0x1e, 0x1e -/* 80362F88 40 82 00 20 */ bne lbl_80362FA8 -/* 80362F8C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80362F90 54 A6 00 38 */ rlwinm r6, r5, 0, 0, 0x1c -/* 80362F94 54 05 00 38 */ rlwinm r5, r0, 0, 0, 0x1c -/* 80362F98 38 05 FF E8 */ addi r0, r5, -24 -/* 80362F9C 7C 06 00 40 */ cmplw r6, r0 -/* 80362FA0 40 82 00 08 */ bne lbl_80362FA8 -/* 80362FA4 38 E0 00 01 */ li r7, 1 -lbl_80362FA8: -/* 80362FA8 2C 07 00 00 */ cmpwi r7, 0 -/* 80362FAC 41 82 00 50 */ beq lbl_80362FFC -/* 80362FB0 80 A4 00 04 */ lwz r5, 4(r4) -/* 80362FB4 7C 05 20 40 */ cmplw r5, r4 -/* 80362FB8 40 82 00 08 */ bne lbl_80362FC0 -/* 80362FBC 38 A0 00 00 */ li r5, 0 -lbl_80362FC0: -/* 80362FC0 80 03 00 00 */ lwz r0, 0(r3) -/* 80362FC4 7C 00 20 40 */ cmplw r0, r4 -/* 80362FC8 40 82 00 08 */ bne lbl_80362FD0 -/* 80362FCC 90 A3 00 00 */ stw r5, 0(r3) -lbl_80362FD0: -/* 80362FD0 28 05 00 00 */ cmplwi r5, 0 -/* 80362FD4 41 82 00 14 */ beq lbl_80362FE8 -/* 80362FD8 80 04 00 00 */ lwz r0, 0(r4) -/* 80362FDC 90 05 00 00 */ stw r0, 0(r5) -/* 80362FE0 80 65 00 00 */ lwz r3, 0(r5) -/* 80362FE4 90 A3 00 04 */ stw r5, 4(r3) -lbl_80362FE8: -/* 80362FE8 38 00 00 00 */ li r0, 0 -/* 80362FEC 7C 83 23 78 */ mr r3, r4 -/* 80362FF0 90 04 00 04 */ stw r0, 4(r4) -/* 80362FF4 90 04 00 00 */ stw r0, 0(r4) -/* 80362FF8 4B FF F9 1D */ bl __sys_free -lbl_80362FFC: -/* 80362FFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80363000 7C 08 03 A6 */ mtlr r0 -/* 80363004 38 21 00 10 */ addi r1, r1, 0x10 -/* 80363008 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/alloc/free.s b/asm/MSL_C/MSL_Common/Src/alloc/free.s deleted file mode 100644 index 8d79d0bf68..0000000000 --- a/asm/MSL_C/MSL_Common/Src/alloc/free.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80362B58: -/* 80362B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80362B5C 7C 08 02 A6 */ mflr r0 -/* 80362B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80362B64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80362B68 7C 7F 1B 78 */ mr r31, r3 -/* 80362B6C 38 60 00 01 */ li r3, 1 -/* 80362B70 48 00 28 F9 */ bl __begin_critical_region -/* 80362B74 88 0D 94 20 */ lbz r0, data_804519A0(r13) -/* 80362B78 28 00 00 00 */ cmplwi r0, 0 -/* 80362B7C 40 82 00 20 */ bne lbl_80362B9C -/* 80362B80 3C 60 80 45 */ lis r3, protopool@ha /* 0x8044D540@ha */ -/* 80362B84 38 80 00 00 */ li r4, 0 -/* 80362B88 38 63 D5 40 */ addi r3, r3, protopool@l /* 0x8044D540@l */ -/* 80362B8C 38 A0 00 34 */ li r5, 0x34 -/* 80362B90 4B CA 08 C9 */ bl memset -/* 80362B94 38 00 00 01 */ li r0, 1 -/* 80362B98 98 0D 94 20 */ stb r0, data_804519A0(r13) -lbl_80362B9C: -/* 80362B9C 3C 60 80 45 */ lis r3, protopool@ha /* 0x8044D540@ha */ -/* 80362BA0 7F E4 FB 78 */ mr r4, r31 -/* 80362BA4 38 63 D5 40 */ addi r3, r3, protopool@l /* 0x8044D540@l */ -/* 80362BA8 48 00 00 21 */ bl __pool_free -/* 80362BAC 38 60 00 01 */ li r3, 1 -/* 80362BB0 48 00 28 B5 */ bl __end_critical_region -/* 80362BB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80362BB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80362BBC 7C 08 03 A6 */ mtlr r0 -/* 80362BC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80362BC4 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/arith/div.s b/asm/MSL_C/MSL_Common/Src/arith/div.s deleted file mode 100644 index fc62107725..0000000000 --- a/asm/MSL_C/MSL_Common/Src/arith/div.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80365078: -/* 80365078 7C 67 1B 79 */ or. r7, r3, r3 -/* 8036507C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80365080 38 A0 00 01 */ li r5, 1 -/* 80365084 38 C0 00 01 */ li r6, 1 -/* 80365088 40 80 00 0C */ bge lbl_80365094 -/* 8036508C 7C E7 00 D0 */ neg r7, r7 -/* 80365090 38 A0 FF FF */ li r5, -1 -lbl_80365094: -/* 80365094 2C 04 00 00 */ cmpwi r4, 0 -/* 80365098 40 80 00 0C */ bge lbl_803650A4 -/* 8036509C 7C 84 00 D0 */ neg r4, r4 -/* 803650A0 38 C0 FF FF */ li r6, -1 -lbl_803650A4: -/* 803650A4 7C 67 23 D6 */ divw r3, r7, r4 -/* 803650A8 7C 05 31 D6 */ mullw r0, r5, r6 -/* 803650AC 7C 63 01 D6 */ mullw r3, r3, r0 -/* 803650B0 7C 03 21 D6 */ mullw r0, r3, r4 -/* 803650B4 90 61 00 08 */ stw r3, 8(r1) -/* 803650B8 7C 86 01 D6 */ mullw r4, r6, r0 -/* 803650BC 7C 07 29 D6 */ mullw r0, r7, r5 -/* 803650C0 7C 84 00 50 */ subf r4, r4, r0 -/* 803650C4 90 81 00 0C */ stw r4, 0xc(r1) -/* 803650C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803650CC 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/char_io/__put_char.s b/asm/MSL_C/MSL_Common/Src/char_io/__put_char.s deleted file mode 100644 index 75f304be57..0000000000 --- a/asm/MSL_C/MSL_Common/Src/char_io/__put_char.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_803652AC: -/* 803652AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803652B0 7C 08 02 A6 */ mflr r0 -/* 803652B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803652B8 38 00 00 00 */ li r0, 0 -/* 803652BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803652C0 7C 9F 23 78 */ mr r31, r4 -/* 803652C4 93 C1 00 08 */ stw r30, 8(r1) -/* 803652C8 7C 7E 1B 78 */ mr r30, r3 -/* 803652CC A0 84 00 04 */ lhz r4, 4(r4) -/* 803652D0 90 1F 00 28 */ stw r0, 0x28(r31) -/* 803652D4 54 83 D7 7E */ rlwinm r3, r4, 0x1a, 0x1d, 0x1f -/* 803652D8 88 1F 00 0A */ lbz r0, 0xa(r31) -/* 803652DC 28 00 00 00 */ cmplwi r0, 0 -/* 803652E0 40 82 00 0C */ bne lbl_803652EC -/* 803652E4 2C 03 00 00 */ cmpwi r3, 0 -/* 803652E8 40 82 00 0C */ bne lbl_803652F4 -lbl_803652EC: -/* 803652EC 38 60 FF FF */ li r3, -1 -/* 803652F0 48 00 01 5C */ b lbl_8036544C -lbl_803652F4: -/* 803652F4 2C 03 00 02 */ cmpwi r3, 2 -/* 803652F8 40 82 00 08 */ bne lbl_80365300 -/* 803652FC 48 00 11 D1 */ bl __stdio_atexit -lbl_80365300: -/* 80365300 88 1F 00 08 */ lbz r0, 8(r31) -/* 80365304 54 00 DF 7F */ rlwinm. r0, r0, 0x1b, 0x1d, 0x1f -/* 80365308 40 82 00 54 */ bne lbl_8036535C -/* 8036530C 88 7F 00 04 */ lbz r3, 4(r31) -/* 80365310 54 60 EF BD */ rlwinm. r0, r3, 0x1d, 0x1e, 0x1e -/* 80365314 54 63 EF 7E */ rlwinm r3, r3, 0x1d, 0x1d, 0x1f -/* 80365318 41 82 00 44 */ beq lbl_8036535C -/* 8036531C 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 80365320 41 82 00 24 */ beq lbl_80365344 -/* 80365324 7F E3 FB 78 */ mr r3, r31 -/* 80365328 38 80 00 00 */ li r4, 0 -/* 8036532C 38 A0 00 02 */ li r5, 2 -/* 80365330 48 00 08 85 */ bl fseek -/* 80365334 2C 03 00 00 */ cmpwi r3, 0 -/* 80365338 41 82 00 0C */ beq lbl_80365344 -/* 8036533C 38 60 00 00 */ li r3, 0 -/* 80365340 48 00 01 0C */ b lbl_8036544C -lbl_80365344: -/* 80365344 88 1F 00 08 */ lbz r0, 8(r31) -/* 80365348 38 60 00 01 */ li r3, 1 -/* 8036534C 50 60 2E 34 */ rlwimi r0, r3, 5, 0x18, 0x1a -/* 80365350 7F E3 FB 78 */ mr r3, r31 -/* 80365354 98 1F 00 08 */ stb r0, 8(r31) -/* 80365358 4B FF FE 4D */ bl __prep_buffer -lbl_8036535C: -/* 8036535C 88 1F 00 08 */ lbz r0, 8(r31) -/* 80365360 54 00 DF 7E */ rlwinm r0, r0, 0x1b, 0x1d, 0x1f -/* 80365364 28 00 00 01 */ cmplwi r0, 1 -/* 80365368 41 82 00 1C */ beq lbl_80365384 -/* 8036536C 38 60 00 01 */ li r3, 1 -/* 80365370 38 00 00 00 */ li r0, 0 -/* 80365374 98 7F 00 0A */ stb r3, 0xa(r31) -/* 80365378 38 60 FF FF */ li r3, -1 -/* 8036537C 90 1F 00 28 */ stw r0, 0x28(r31) -/* 80365380 48 00 00 CC */ b lbl_8036544C -lbl_80365384: -/* 80365384 88 1F 00 04 */ lbz r0, 4(r31) -/* 80365388 54 00 FF BE */ rlwinm r0, r0, 0x1f, 0x1e, 0x1f -/* 8036538C 28 00 00 02 */ cmplwi r0, 2 -/* 80365390 41 82 00 1C */ beq lbl_803653AC -/* 80365394 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 80365398 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 8036539C 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 803653A0 7C 03 00 50 */ subf r0, r3, r0 -/* 803653A4 7C 04 00 40 */ cmplw r4, r0 -/* 803653A8 40 82 00 30 */ bne lbl_803653D8 -lbl_803653AC: -/* 803653AC 7F E3 FB 78 */ mr r3, r31 -/* 803653B0 38 80 00 00 */ li r4, 0 -/* 803653B4 4B FF FD 2D */ bl __flush_buffer -/* 803653B8 2C 03 00 00 */ cmpwi r3, 0 -/* 803653BC 41 82 00 1C */ beq lbl_803653D8 -/* 803653C0 38 60 00 01 */ li r3, 1 -/* 803653C4 38 00 00 00 */ li r0, 0 -/* 803653C8 98 7F 00 0A */ stb r3, 0xa(r31) -/* 803653CC 38 60 FF FF */ li r3, -1 -/* 803653D0 90 1F 00 28 */ stw r0, 0x28(r31) -/* 803653D4 48 00 00 78 */ b lbl_8036544C -lbl_803653D8: -/* 803653D8 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 803653DC 38 03 FF FF */ addi r0, r3, -1 -/* 803653E0 90 1F 00 28 */ stw r0, 0x28(r31) -/* 803653E4 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 803653E8 38 03 00 01 */ addi r0, r3, 1 -/* 803653EC 90 1F 00 24 */ stw r0, 0x24(r31) -/* 803653F0 9B C3 00 00 */ stb r30, 0(r3) -/* 803653F4 88 1F 00 04 */ lbz r0, 4(r31) -/* 803653F8 54 00 FF BE */ rlwinm r0, r0, 0x1f, 0x1e, 0x1f -/* 803653FC 28 00 00 02 */ cmplwi r0, 2 -/* 80365400 41 82 00 48 */ beq lbl_80365448 -/* 80365404 28 00 00 00 */ cmplwi r0, 0 -/* 80365408 41 82 00 0C */ beq lbl_80365414 -/* 8036540C 2C 1E 00 0A */ cmpwi r30, 0xa -/* 80365410 40 82 00 30 */ bne lbl_80365440 -lbl_80365414: -/* 80365414 7F E3 FB 78 */ mr r3, r31 -/* 80365418 38 80 00 00 */ li r4, 0 -/* 8036541C 4B FF FC C5 */ bl __flush_buffer -/* 80365420 2C 03 00 00 */ cmpwi r3, 0 -/* 80365424 41 82 00 1C */ beq lbl_80365440 -/* 80365428 38 60 00 01 */ li r3, 1 -/* 8036542C 38 00 00 00 */ li r0, 0 -/* 80365430 98 7F 00 0A */ stb r3, 0xa(r31) -/* 80365434 38 60 FF FF */ li r3, -1 -/* 80365438 90 1F 00 28 */ stw r0, 0x28(r31) -/* 8036543C 48 00 00 10 */ b lbl_8036544C -lbl_80365440: -/* 80365440 38 00 00 00 */ li r0, 0 -/* 80365444 90 1F 00 28 */ stw r0, 0x28(r31) -lbl_80365448: -/* 80365448 57 C3 06 3E */ clrlwi r3, r30, 0x18 -lbl_8036544C: -/* 8036544C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80365450 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80365454 83 C1 00 08 */ lwz r30, 8(r1) -/* 80365458 7C 08 03 A6 */ mtlr r0 -/* 8036545C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365460 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/char_io/fputs.s b/asm/MSL_C/MSL_Common/Src/char_io/fputs.s deleted file mode 100644 index 5b73e97b1f..0000000000 --- a/asm/MSL_C/MSL_Common/Src/char_io/fputs.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_803651D8: -/* 803651D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803651DC 7C 08 02 A6 */ mflr r0 -/* 803651E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 803651E4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803651E8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803651EC 3B C0 00 00 */ li r30, 0 -/* 803651F0 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803651F4 7C 9D 23 78 */ mr r29, r4 -/* 803651F8 93 81 00 10 */ stw r28, 0x10(r1) -/* 803651FC 7C 7C 1B 78 */ mr r28, r3 -/* 80365200 38 60 00 02 */ li r3, 2 -/* 80365204 48 00 02 65 */ bl __begin_critical_region -/* 80365208 48 00 00 68 */ b lbl_80365270 -lbl_8036520C: -/* 8036520C 7F A3 EB 78 */ mr r3, r29 -/* 80365210 38 80 FF FF */ li r4, -1 -/* 80365214 48 00 3F 01 */ bl fwide -/* 80365218 2C 03 00 00 */ cmpwi r3, 0 -/* 8036521C 41 80 00 0C */ blt lbl_80365228 -/* 80365220 38 60 FF FF */ li r3, -1 -/* 80365224 48 00 00 3C */ b lbl_80365260 -lbl_80365228: -/* 80365228 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 8036522C 38 03 FF FF */ addi r0, r3, -1 -/* 80365230 28 03 00 00 */ cmplwi r3, 0 -/* 80365234 90 1D 00 28 */ stw r0, 0x28(r29) -/* 80365238 41 82 00 1C */ beq lbl_80365254 -/* 8036523C 80 9D 00 24 */ lwz r4, 0x24(r29) -/* 80365240 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80365244 38 04 00 01 */ addi r0, r4, 1 -/* 80365248 90 1D 00 24 */ stw r0, 0x24(r29) -/* 8036524C 9B E4 00 00 */ stb r31, 0(r4) -/* 80365250 48 00 00 10 */ b lbl_80365260 -lbl_80365254: -/* 80365254 7F E3 FB 78 */ mr r3, r31 -/* 80365258 7F A4 EB 78 */ mr r4, r29 -/* 8036525C 48 00 00 51 */ bl __put_char -lbl_80365260: -/* 80365260 2C 03 FF FF */ cmpwi r3, -1 -/* 80365264 40 82 00 0C */ bne lbl_80365270 -/* 80365268 3B C0 FF FF */ li r30, -1 -/* 8036526C 48 00 00 14 */ b lbl_80365280 -lbl_80365270: -/* 80365270 88 1C 00 00 */ lbz r0, 0(r28) -/* 80365274 3B 9C 00 01 */ addi r28, r28, 1 -/* 80365278 7C 1F 07 75 */ extsb. r31, r0 -/* 8036527C 40 82 FF 90 */ bne lbl_8036520C -lbl_80365280: -/* 80365280 38 60 00 02 */ li r3, 2 -/* 80365284 48 00 01 E1 */ bl __end_critical_region -/* 80365288 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8036528C 7F C3 F3 78 */ mr r3, r30 -/* 80365290 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80365294 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80365298 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 8036529C 83 81 00 10 */ lwz r28, 0x10(r1) -/* 803652A0 7C 08 03 A6 */ mtlr r0 -/* 803652A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803652A8 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/extras/stricmp.s b/asm/MSL_C/MSL_Common/Src/extras/stricmp.s deleted file mode 100644 index b5e49e9ad2..0000000000 --- a/asm/MSL_C/MSL_Common/Src/extras/stricmp.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8036CA94: -/* 8036CA94 88 03 00 00 */ lbz r0, 0(r3) -/* 8036CA98 38 63 00 01 */ addi r3, r3, 1 -/* 8036CA9C 7C 00 07 74 */ extsb r0, r0 -/* 8036CAA0 2C 00 FF FF */ cmpwi r0, -1 -/* 8036CAA4 40 82 00 0C */ bne lbl_8036CAB0 -/* 8036CAA8 38 A0 FF FF */ li r5, -1 -/* 8036CAAC 48 00 00 14 */ b lbl_8036CAC0 -lbl_8036CAB0: -/* 8036CAB0 3C A0 80 3D */ lis r5, __lower_map@ha /* 0x803D2D18@ha */ -/* 8036CAB4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8036CAB8 38 A5 2D 18 */ addi r5, r5, __lower_map@l /* 0x803D2D18@l */ -/* 8036CABC 7C A5 00 AE */ lbzx r5, r5, r0 -lbl_8036CAC0: -/* 8036CAC0 88 04 00 00 */ lbz r0, 0(r4) -/* 8036CAC4 7C A6 07 74 */ extsb r6, r5 -/* 8036CAC8 38 84 00 01 */ addi r4, r4, 1 -/* 8036CACC 7C 00 07 74 */ extsb r0, r0 -/* 8036CAD0 2C 00 FF FF */ cmpwi r0, -1 -/* 8036CAD4 40 82 00 0C */ bne lbl_8036CAE0 -/* 8036CAD8 38 00 FF FF */ li r0, -1 -/* 8036CADC 48 00 00 14 */ b lbl_8036CAF0 -lbl_8036CAE0: -/* 8036CAE0 3C A0 80 3D */ lis r5, __lower_map@ha /* 0x803D2D18@ha */ -/* 8036CAE4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8036CAE8 38 A5 2D 18 */ addi r5, r5, __lower_map@l /* 0x803D2D18@l */ -/* 8036CAEC 7C 05 00 AE */ lbzx r0, r5, r0 -lbl_8036CAF0: -/* 8036CAF0 7C 00 07 74 */ extsb r0, r0 -/* 8036CAF4 7C 06 00 00 */ cmpw r6, r0 -/* 8036CAF8 40 80 00 0C */ bge lbl_8036CB04 -/* 8036CAFC 38 60 FF FF */ li r3, -1 -/* 8036CB00 4E 80 00 20 */ blr -lbl_8036CB04: -/* 8036CB04 40 81 00 0C */ ble lbl_8036CB10 -/* 8036CB08 38 60 00 01 */ li r3, 1 -/* 8036CB0C 4E 80 00 20 */ blr -lbl_8036CB10: -/* 8036CB10 7C C0 07 75 */ extsb. r0, r6 -/* 8036CB14 40 82 FF 80 */ bne stricmp -/* 8036CB18 38 60 00 00 */ li r3, 0 -/* 8036CB1C 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/extras/strnicmp.s b/asm/MSL_C/MSL_Common/Src/extras/strnicmp.s deleted file mode 100644 index a31914c87a..0000000000 --- a/asm/MSL_C/MSL_Common/Src/extras/strnicmp.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8036CA74: -/* 8036CA74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CA78 7C 08 02 A6 */ mflr r0 -/* 8036CA7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CA80 4B FF 8D 9D */ bl __msl_strnicmp -/* 8036CA84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CA88 7C 08 03 A6 */ mtlr r0 -/* 8036CA8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CA90 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s b/asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s deleted file mode 100644 index 962a9ba481..0000000000 --- a/asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8036581C: -/* 8036581C 7C A9 03 A6 */ mtctr r5 -/* 80365820 2C 05 00 00 */ cmpwi r5, 0 -/* 80365824 40 81 00 94 */ ble lbl_803658B8 -lbl_80365828: -/* 80365828 88 03 00 00 */ lbz r0, 0(r3) -/* 8036582C 38 63 00 01 */ addi r3, r3, 1 -/* 80365830 7C 00 07 74 */ extsb r0, r0 -/* 80365834 2C 00 FF FF */ cmpwi r0, -1 -/* 80365838 40 82 00 0C */ bne lbl_80365844 -/* 8036583C 38 A0 FF FF */ li r5, -1 -/* 80365840 48 00 00 14 */ b lbl_80365854 -lbl_80365844: -/* 80365844 3C A0 80 3D */ lis r5, __lower_map@ha /* 0x803D2D18@ha */ -/* 80365848 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8036584C 38 A5 2D 18 */ addi r5, r5, __lower_map@l /* 0x803D2D18@l */ -/* 80365850 7C A5 00 AE */ lbzx r5, r5, r0 -lbl_80365854: -/* 80365854 88 04 00 00 */ lbz r0, 0(r4) -/* 80365858 7C A6 07 74 */ extsb r6, r5 -/* 8036585C 38 84 00 01 */ addi r4, r4, 1 -/* 80365860 7C 00 07 74 */ extsb r0, r0 -/* 80365864 2C 00 FF FF */ cmpwi r0, -1 -/* 80365868 40 82 00 0C */ bne lbl_80365874 -/* 8036586C 38 00 FF FF */ li r0, -1 -/* 80365870 48 00 00 14 */ b lbl_80365884 -lbl_80365874: -/* 80365874 3C A0 80 3D */ lis r5, __lower_map@ha /* 0x803D2D18@ha */ -/* 80365878 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8036587C 38 A5 2D 18 */ addi r5, r5, __lower_map@l /* 0x803D2D18@l */ -/* 80365880 7C 05 00 AE */ lbzx r0, r5, r0 -lbl_80365884: -/* 80365884 7C 00 07 74 */ extsb r0, r0 -/* 80365888 7C 06 00 00 */ cmpw r6, r0 -/* 8036588C 40 80 00 0C */ bge lbl_80365898 -/* 80365890 38 60 FF FF */ li r3, -1 -/* 80365894 4E 80 00 20 */ blr -lbl_80365898: -/* 80365898 40 81 00 0C */ ble lbl_803658A4 -/* 8036589C 38 60 00 01 */ li r3, 1 -/* 803658A0 4E 80 00 20 */ blr -lbl_803658A4: -/* 803658A4 7C C0 07 75 */ extsb. r0, r6 -/* 803658A8 40 82 00 0C */ bne lbl_803658B4 -/* 803658AC 38 60 00 00 */ li r3, 0 -/* 803658B0 4E 80 00 20 */ blr -lbl_803658B4: -/* 803658B4 42 00 FF 74 */ bdnz lbl_80365828 -lbl_803658B8: -/* 803658B8 38 60 00 00 */ li r3, 0 -/* 803658BC 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s b/asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s deleted file mode 100644 index f408bf1e8b..0000000000 --- a/asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_80365F74: -/* 80365F74 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80365F78 7C 08 02 A6 */ mflr r0 -/* 80365F7C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80365F80 BF 61 00 1C */ stmw r27, 0x1c(r1) -/* 80365F84 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80365F88 7C BD 2B 78 */ mr r29, r5 -/* 80365F8C 3B E0 00 00 */ li r31, 0 -/* 80365F90 41 82 00 0C */ beq lbl_80365F9C -/* 80365F94 28 04 00 00 */ cmplwi r4, 0 -/* 80365F98 40 82 00 0C */ bne lbl_80365FA4 -lbl_80365F9C: -/* 80365F9C 38 60 00 00 */ li r3, 0 -/* 80365FA0 48 00 00 D8 */ b lbl_80366078 -lbl_80365FA4: -/* 80365FA4 7C 9E 23 78 */ mr r30, r4 -/* 80365FA8 48 00 00 C4 */ b lbl_8036606C -lbl_80365FAC: -/* 80365FAC A0 DE 00 00 */ lhz r6, 0(r30) -/* 80365FB0 28 06 00 00 */ cmplwi r6, 0 -/* 80365FB4 40 82 00 10 */ bne lbl_80365FC4 -/* 80365FB8 38 00 00 00 */ li r0, 0 -/* 80365FBC 7C 1C F9 AE */ stbx r0, r28, r31 -/* 80365FC0 48 00 00 B8 */ b lbl_80366078 -lbl_80365FC4: -/* 80365FC4 80 02 CC 68 */ lwz r0, lit_74(r2) -/* 80365FC8 28 06 00 80 */ cmplwi r6, 0x80 -/* 80365FCC 3B DE 00 02 */ addi r30, r30, 2 -/* 80365FD0 90 01 00 08 */ stw r0, 8(r1) -/* 80365FD4 40 80 00 0C */ bge lbl_80365FE0 -/* 80365FD8 3B 60 00 01 */ li r27, 1 -/* 80365FDC 48 00 00 18 */ b lbl_80365FF4 -lbl_80365FE0: -/* 80365FE0 28 06 08 00 */ cmplwi r6, 0x800 -/* 80365FE4 40 80 00 0C */ bge lbl_80365FF0 -/* 80365FE8 3B 60 00 02 */ li r27, 2 -/* 80365FEC 48 00 00 08 */ b lbl_80365FF4 -lbl_80365FF0: -/* 80365FF0 3B 60 00 03 */ li r27, 3 -lbl_80365FF4: -/* 80365FF4 2C 1B 00 02 */ cmpwi r27, 2 -/* 80365FF8 38 A1 00 0C */ addi r5, r1, 0xc -/* 80365FFC 7C A5 DA 14 */ add r5, r5, r27 -/* 80366000 41 82 00 2C */ beq lbl_8036602C -/* 80366004 40 80 00 10 */ bge lbl_80366014 -/* 80366008 2C 1B 00 01 */ cmpwi r27, 1 -/* 8036600C 40 80 00 30 */ bge lbl_8036603C -/* 80366010 48 00 00 3C */ b lbl_8036604C -lbl_80366014: -/* 80366014 2C 1B 00 04 */ cmpwi r27, 4 -/* 80366018 40 80 00 34 */ bge lbl_8036604C -/* 8036601C 54 C0 06 BE */ clrlwi r0, r6, 0x1a -/* 80366020 54 C6 D5 BE */ rlwinm r6, r6, 0x1a, 0x16, 0x1f -/* 80366024 60 00 00 80 */ ori r0, r0, 0x80 -/* 80366028 9C 05 FF FF */ stbu r0, -1(r5) -lbl_8036602C: -/* 8036602C 54 C0 06 BE */ clrlwi r0, r6, 0x1a -/* 80366030 54 C6 D5 BE */ rlwinm r6, r6, 0x1a, 0x16, 0x1f -/* 80366034 60 00 00 80 */ ori r0, r0, 0x80 -/* 80366038 9C 05 FF FF */ stbu r0, -1(r5) -lbl_8036603C: -/* 8036603C 38 81 00 08 */ addi r4, r1, 8 -/* 80366040 7C 04 D8 AE */ lbzx r0, r4, r27 -/* 80366044 7C C0 03 78 */ or r0, r6, r0 -/* 80366048 98 05 FF FF */ stb r0, -1(r5) -lbl_8036604C: -/* 8036604C 7C 1F DA 14 */ add r0, r31, r27 -/* 80366050 7C 00 E8 40 */ cmplw r0, r29 -/* 80366054 41 81 00 24 */ bgt lbl_80366078 -/* 80366058 7F 65 DB 78 */ mr r5, r27 -/* 8036605C 7C 7C FA 14 */ add r3, r28, r31 -/* 80366060 38 81 00 0C */ addi r4, r1, 0xc -/* 80366064 48 00 2A 85 */ bl strncpy -/* 80366068 7F FF DA 14 */ add r31, r31, r27 -lbl_8036606C: -/* 8036606C 7C 1F E8 40 */ cmplw r31, r29 -/* 80366070 7F E3 FB 78 */ mr r3, r31 -/* 80366074 40 81 FF 38 */ ble lbl_80365FAC -lbl_80366078: -/* 80366078 BB 61 00 1C */ lmw r27, 0x1c(r1) -/* 8036607C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80366080 7C 08 03 A6 */ mtlr r0 -/* 80366084 38 21 00 30 */ addi r1, r1, 0x30 -/* 80366088 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s b/asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s deleted file mode 100644 index 3c4cf5a4b8..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_803669D0: -/* 803669D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803669D4 7C 08 02 A6 */ mflr r0 -/* 803669D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803669DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803669E0 7C BF 2B 78 */ mr r31, r5 -/* 803669E4 93 C1 00 08 */ stw r30, 8(r1) -/* 803669E8 7C 7E 1B 78 */ mr r30, r3 -/* 803669EC 7C 83 23 78 */ mr r3, r4 -/* 803669F0 38 80 00 01 */ li r4, 1 -/* 803669F4 7F C6 F3 78 */ mr r6, r30 -/* 803669F8 4B FF ED A9 */ bl fwrite -/* 803669FC 7C 1F 18 40 */ cmplw r31, r3 -/* 80366A00 40 82 00 0C */ bne lbl_80366A0C -/* 80366A04 7F C3 F3 78 */ mr r3, r30 -/* 80366A08 48 00 00 08 */ b lbl_80366A10 -lbl_80366A0C: -/* 80366A0C 38 60 00 00 */ li r3, 0 -lbl_80366A10: -/* 80366A10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80366A14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80366A18 83 C1 00 08 */ lwz r30, 8(r1) -/* 80366A1C 7C 08 03 A6 */ mtlr r0 -/* 80366A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80366A24 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s b/asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s deleted file mode 100644 index 05e2d3ad02..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80366964: -/* 80366964 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80366968 7C 08 02 A6 */ mflr r0 -/* 8036696C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80366970 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80366974 93 C1 00 08 */ stw r30, 8(r1) -/* 80366978 7C 7E 1B 78 */ mr r30, r3 -/* 8036697C 80 63 00 08 */ lwz r3, 8(r3) -/* 80366980 80 DE 00 04 */ lwz r6, 4(r30) -/* 80366984 7C 03 2A 14 */ add r0, r3, r5 -/* 80366988 7C 00 30 40 */ cmplw r0, r6 -/* 8036698C 7F E3 30 50 */ subf r31, r3, r6 -/* 80366990 41 81 00 08 */ bgt lbl_80366998 -/* 80366994 7C BF 2B 78 */ mr r31, r5 -lbl_80366998: -/* 80366998 80 1E 00 00 */ lwz r0, 0(r30) -/* 8036699C 7F E5 FB 78 */ mr r5, r31 -/* 803669A0 7C 60 1A 14 */ add r3, r0, r3 -/* 803669A4 4B C9 CB 9D */ bl memcpy -/* 803669A8 80 1E 00 08 */ lwz r0, 8(r30) -/* 803669AC 38 60 00 01 */ li r3, 1 -/* 803669B0 7C 00 FA 14 */ add r0, r0, r31 -/* 803669B4 90 1E 00 08 */ stw r0, 8(r30) -/* 803669B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803669BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 803669C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803669C4 7C 08 03 A6 */ mtlr r0 -/* 803669C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803669CC 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/__pformatter.s b/asm/MSL_C/MSL_Common/Src/printf/__pformatter.s deleted file mode 100644 index 9c17fbcb52..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/__pformatter.s +++ /dev/null @@ -1,543 +0,0 @@ -lbl_80366A28: -/* 80366A28 94 21 FD 40 */ stwu r1, -0x2c0(r1) -/* 80366A2C 7C 08 02 A6 */ mflr r0 -/* 80366A30 90 01 02 C4 */ stw r0, 0x2c4(r1) -/* 80366A34 38 00 00 20 */ li r0, 0x20 -/* 80366A38 BE 61 02 8C */ stmw r19, 0x28c(r1) -/* 80366A3C 7C 7F 1B 78 */ mr r31, r3 -/* 80366A40 7C 9E 23 78 */ mr r30, r4 -/* 80366A44 7C DD 33 78 */ mr r29, r6 -/* 80366A48 7C BA 2B 78 */ mr r26, r5 -/* 80366A4C 3B 01 02 7C */ addi r24, r1, 0x27c -/* 80366A50 3A A1 02 7B */ addi r21, r1, 0x27b -/* 80366A54 3B 60 00 00 */ li r27, 0 -/* 80366A58 98 01 00 09 */ stb r0, 9(r1) -/* 80366A5C 48 00 07 1C */ b lbl_80367178 -lbl_80366A60: -/* 80366A60 7F 43 D3 78 */ mr r3, r26 -/* 80366A64 38 80 00 25 */ li r4, 0x25 -/* 80366A68 48 00 1E BD */ bl strchr -/* 80366A6C 7C 79 1B 79 */ or. r25, r3, r3 -/* 80366A70 40 82 00 3C */ bne lbl_80366AAC -/* 80366A74 7F 43 D3 78 */ mr r3, r26 -/* 80366A78 48 00 21 6D */ bl strlen -/* 80366A7C 7C 65 1B 79 */ or. r5, r3, r3 -/* 80366A80 7F 7B 2A 14 */ add r27, r27, r5 -/* 80366A84 41 82 07 00 */ beq lbl_80367184 -/* 80366A88 7F EC FB 78 */ mr r12, r31 -/* 80366A8C 7F C3 F3 78 */ mr r3, r30 -/* 80366A90 7F 44 D3 78 */ mr r4, r26 -/* 80366A94 7D 89 03 A6 */ mtctr r12 -/* 80366A98 4E 80 04 21 */ bctrl -/* 80366A9C 28 03 00 00 */ cmplwi r3, 0 -/* 80366AA0 40 82 06 E4 */ bne lbl_80367184 -/* 80366AA4 38 60 FF FF */ li r3, -1 -/* 80366AA8 48 00 06 E0 */ b lbl_80367188 -lbl_80366AAC: -/* 80366AAC 7C BA C8 51 */ subf. r5, r26, r25 -/* 80366AB0 7F 7B 2A 14 */ add r27, r27, r5 -/* 80366AB4 41 82 00 28 */ beq lbl_80366ADC -/* 80366AB8 7F EC FB 78 */ mr r12, r31 -/* 80366ABC 7F C3 F3 78 */ mr r3, r30 -/* 80366AC0 7F 44 D3 78 */ mr r4, r26 -/* 80366AC4 7D 89 03 A6 */ mtctr r12 -/* 80366AC8 4E 80 04 21 */ bctrl -/* 80366ACC 28 03 00 00 */ cmplwi r3, 0 -/* 80366AD0 40 82 00 0C */ bne lbl_80366ADC -/* 80366AD4 38 60 FF FF */ li r3, -1 -/* 80366AD8 48 00 06 B0 */ b lbl_80367188 -lbl_80366ADC: -/* 80366ADC 7F 23 CB 78 */ mr r3, r25 -/* 80366AE0 7F A4 EB 78 */ mr r4, r29 -/* 80366AE4 38 A1 00 6C */ addi r5, r1, 0x6c -/* 80366AE8 48 00 17 A1 */ bl parse_format -/* 80366AEC 88 01 00 71 */ lbz r0, 0x71(r1) -/* 80366AF0 7C 7A 1B 78 */ mr r26, r3 -/* 80366AF4 2C 00 00 68 */ cmpwi r0, 0x68 -/* 80366AF8 41 82 05 00 */ beq lbl_80366FF8 -/* 80366AFC 40 80 00 60 */ bge lbl_80366B5C -/* 80366B00 2C 00 00 58 */ cmpwi r0, 0x58 -/* 80366B04 41 82 01 B0 */ beq lbl_80366CB4 -/* 80366B08 40 80 00 30 */ bge lbl_80366B38 -/* 80366B0C 2C 00 00 41 */ cmpwi r0, 0x41 -/* 80366B10 41 82 03 0C */ beq lbl_80366E1C -/* 80366B14 40 80 00 10 */ bge lbl_80366B24 -/* 80366B18 2C 00 00 25 */ cmpwi r0, 0x25 -/* 80366B1C 41 82 04 C8 */ beq lbl_80366FE4 -/* 80366B20 48 00 04 D8 */ b lbl_80366FF8 -lbl_80366B24: -/* 80366B24 2C 00 00 48 */ cmpwi r0, 0x48 -/* 80366B28 40 80 04 D0 */ bge lbl_80366FF8 -/* 80366B2C 2C 00 00 45 */ cmpwi r0, 0x45 -/* 80366B30 40 80 02 80 */ bge lbl_80366DB0 -/* 80366B34 48 00 04 C4 */ b lbl_80366FF8 -lbl_80366B38: -/* 80366B38 2C 00 00 63 */ cmpwi r0, 0x63 -/* 80366B3C 41 82 04 88 */ beq lbl_80366FC4 -/* 80366B40 40 80 00 10 */ bge lbl_80366B50 -/* 80366B44 2C 00 00 61 */ cmpwi r0, 0x61 -/* 80366B48 41 82 02 D4 */ beq lbl_80366E1C -/* 80366B4C 48 00 04 AC */ b lbl_80366FF8 -lbl_80366B50: -/* 80366B50 2C 00 00 65 */ cmpwi r0, 0x65 -/* 80366B54 40 80 02 5C */ bge lbl_80366DB0 -/* 80366B58 48 00 00 60 */ b lbl_80366BB8 -lbl_80366B5C: -/* 80366B5C 2C 00 00 74 */ cmpwi r0, 0x74 -/* 80366B60 41 82 04 98 */ beq lbl_80366FF8 -/* 80366B64 40 80 00 30 */ bge lbl_80366B94 -/* 80366B68 2C 00 00 6F */ cmpwi r0, 0x6f -/* 80366B6C 41 82 01 48 */ beq lbl_80366CB4 -/* 80366B70 40 80 00 18 */ bge lbl_80366B88 -/* 80366B74 2C 00 00 6E */ cmpwi r0, 0x6e -/* 80366B78 40 80 03 E8 */ bge lbl_80366F60 -/* 80366B7C 2C 00 00 6A */ cmpwi r0, 0x6a -/* 80366B80 40 80 04 78 */ bge lbl_80366FF8 -/* 80366B84 48 00 00 34 */ b lbl_80366BB8 -lbl_80366B88: -/* 80366B88 2C 00 00 73 */ cmpwi r0, 0x73 -/* 80366B8C 40 80 02 FC */ bge lbl_80366E88 -/* 80366B90 48 00 04 68 */ b lbl_80366FF8 -lbl_80366B94: -/* 80366B94 2C 00 00 78 */ cmpwi r0, 0x78 -/* 80366B98 41 82 01 1C */ beq lbl_80366CB4 -/* 80366B9C 40 80 00 10 */ bge lbl_80366BAC -/* 80366BA0 2C 00 00 76 */ cmpwi r0, 0x76 -/* 80366BA4 40 80 04 54 */ bge lbl_80366FF8 -/* 80366BA8 48 00 01 0C */ b lbl_80366CB4 -lbl_80366BAC: -/* 80366BAC 2C 00 00 FF */ cmpwi r0, 0xff -/* 80366BB0 41 82 04 48 */ beq lbl_80366FF8 -/* 80366BB4 48 00 04 44 */ b lbl_80366FF8 -lbl_80366BB8: -/* 80366BB8 88 01 00 70 */ lbz r0, 0x70(r1) -/* 80366BBC 28 00 00 03 */ cmplwi r0, 3 -/* 80366BC0 40 82 00 18 */ bne lbl_80366BD8 -/* 80366BC4 7F A3 EB 78 */ mr r3, r29 -/* 80366BC8 38 80 00 01 */ li r4, 1 -/* 80366BCC 4B FF AF 49 */ bl __va_arg -/* 80366BD0 83 83 00 00 */ lwz r28, 0(r3) -/* 80366BD4 48 00 00 34 */ b lbl_80366C08 -lbl_80366BD8: -/* 80366BD8 28 00 00 04 */ cmplwi r0, 4 -/* 80366BDC 40 82 00 1C */ bne lbl_80366BF8 -/* 80366BE0 7F A3 EB 78 */ mr r3, r29 -/* 80366BE4 38 80 00 02 */ li r4, 2 -/* 80366BE8 4B FF AF 2D */ bl __va_arg -/* 80366BEC 82 C3 00 00 */ lwz r22, 0(r3) -/* 80366BF0 82 E3 00 04 */ lwz r23, 4(r3) -/* 80366BF4 48 00 00 14 */ b lbl_80366C08 -lbl_80366BF8: -/* 80366BF8 7F A3 EB 78 */ mr r3, r29 -/* 80366BFC 38 80 00 01 */ li r4, 1 -/* 80366C00 4B FF AF 15 */ bl __va_arg -/* 80366C04 83 83 00 00 */ lwz r28, 0(r3) -lbl_80366C08: -/* 80366C08 88 61 00 70 */ lbz r3, 0x70(r1) -/* 80366C0C 28 03 00 02 */ cmplwi r3, 2 -/* 80366C10 40 82 00 0C */ bne lbl_80366C1C -/* 80366C14 7F 80 07 34 */ extsh r0, r28 -/* 80366C18 7C 1C 03 78 */ mr r28, r0 -lbl_80366C1C: -/* 80366C1C 28 03 00 01 */ cmplwi r3, 1 -/* 80366C20 40 82 00 0C */ bne lbl_80366C2C -/* 80366C24 7F 80 07 74 */ extsb r0, r28 -/* 80366C28 7C 1C 03 78 */ mr r28, r0 -lbl_80366C2C: -/* 80366C2C 28 03 00 04 */ cmplwi r3, 4 -/* 80366C30 40 82 00 44 */ bne lbl_80366C74 -/* 80366C34 81 21 00 6C */ lwz r9, 0x6c(r1) -/* 80366C38 7E E4 BB 78 */ mr r4, r23 -/* 80366C3C 81 01 00 70 */ lwz r8, 0x70(r1) -/* 80366C40 7E C3 B3 78 */ mr r3, r22 -/* 80366C44 80 E1 00 74 */ lwz r7, 0x74(r1) -/* 80366C48 7F 05 C3 78 */ mr r5, r24 -/* 80366C4C 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366C50 38 C1 00 5C */ addi r6, r1, 0x5c -/* 80366C54 91 21 00 5C */ stw r9, 0x5c(r1) -/* 80366C58 91 01 00 60 */ stw r8, 0x60(r1) -/* 80366C5C 90 E1 00 64 */ stw r7, 0x64(r1) -/* 80366C60 90 01 00 68 */ stw r0, 0x68(r1) -/* 80366C64 48 00 10 B9 */ bl longlong2str -/* 80366C68 7C 74 1B 79 */ or. r20, r3, r3 -/* 80366C6C 41 82 03 8C */ beq lbl_80366FF8 -/* 80366C70 48 00 00 3C */ b lbl_80366CAC -lbl_80366C74: -/* 80366C74 81 01 00 6C */ lwz r8, 0x6c(r1) -/* 80366C78 7F 83 E3 78 */ mr r3, r28 -/* 80366C7C 80 E1 00 70 */ lwz r7, 0x70(r1) -/* 80366C80 7F 04 C3 78 */ mr r4, r24 -/* 80366C84 80 C1 00 74 */ lwz r6, 0x74(r1) -/* 80366C88 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80366C8C 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366C90 91 01 00 4C */ stw r8, 0x4c(r1) -/* 80366C94 90 E1 00 50 */ stw r7, 0x50(r1) -/* 80366C98 90 C1 00 54 */ stw r6, 0x54(r1) -/* 80366C9C 90 01 00 58 */ stw r0, 0x58(r1) -/* 80366CA0 48 00 13 91 */ bl long2str -/* 80366CA4 7C 74 1B 79 */ or. r20, r3, r3 -/* 80366CA8 41 82 03 50 */ beq lbl_80366FF8 -lbl_80366CAC: -/* 80366CAC 7F 34 A8 50 */ subf r25, r20, r21 -/* 80366CB0 48 00 03 88 */ b lbl_80367038 -lbl_80366CB4: -/* 80366CB4 88 01 00 70 */ lbz r0, 0x70(r1) -/* 80366CB8 28 00 00 03 */ cmplwi r0, 3 -/* 80366CBC 40 82 00 18 */ bne lbl_80366CD4 -/* 80366CC0 7F A3 EB 78 */ mr r3, r29 -/* 80366CC4 38 80 00 01 */ li r4, 1 -/* 80366CC8 4B FF AE 4D */ bl __va_arg -/* 80366CCC 83 83 00 00 */ lwz r28, 0(r3) -/* 80366CD0 48 00 00 34 */ b lbl_80366D04 -lbl_80366CD4: -/* 80366CD4 28 00 00 04 */ cmplwi r0, 4 -/* 80366CD8 40 82 00 1C */ bne lbl_80366CF4 -/* 80366CDC 7F A3 EB 78 */ mr r3, r29 -/* 80366CE0 38 80 00 02 */ li r4, 2 -/* 80366CE4 4B FF AE 31 */ bl __va_arg -/* 80366CE8 82 C3 00 00 */ lwz r22, 0(r3) -/* 80366CEC 82 E3 00 04 */ lwz r23, 4(r3) -/* 80366CF0 48 00 00 14 */ b lbl_80366D04 -lbl_80366CF4: -/* 80366CF4 7F A3 EB 78 */ mr r3, r29 -/* 80366CF8 38 80 00 01 */ li r4, 1 -/* 80366CFC 4B FF AE 19 */ bl __va_arg -/* 80366D00 83 83 00 00 */ lwz r28, 0(r3) -lbl_80366D04: -/* 80366D04 88 61 00 70 */ lbz r3, 0x70(r1) -/* 80366D08 28 03 00 02 */ cmplwi r3, 2 -/* 80366D0C 40 82 00 0C */ bne lbl_80366D18 -/* 80366D10 57 80 04 3E */ clrlwi r0, r28, 0x10 -/* 80366D14 7C 1C 03 78 */ mr r28, r0 -lbl_80366D18: -/* 80366D18 28 03 00 01 */ cmplwi r3, 1 -/* 80366D1C 40 82 00 0C */ bne lbl_80366D28 -/* 80366D20 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80366D24 7C 1C 03 78 */ mr r28, r0 -lbl_80366D28: -/* 80366D28 28 03 00 04 */ cmplwi r3, 4 -/* 80366D2C 40 82 00 44 */ bne lbl_80366D70 -/* 80366D30 81 21 00 6C */ lwz r9, 0x6c(r1) -/* 80366D34 7E E4 BB 78 */ mr r4, r23 -/* 80366D38 81 01 00 70 */ lwz r8, 0x70(r1) -/* 80366D3C 7E C3 B3 78 */ mr r3, r22 -/* 80366D40 80 E1 00 74 */ lwz r7, 0x74(r1) -/* 80366D44 7F 05 C3 78 */ mr r5, r24 -/* 80366D48 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366D4C 38 C1 00 3C */ addi r6, r1, 0x3c -/* 80366D50 91 21 00 3C */ stw r9, 0x3c(r1) -/* 80366D54 91 01 00 40 */ stw r8, 0x40(r1) -/* 80366D58 90 E1 00 44 */ stw r7, 0x44(r1) -/* 80366D5C 90 01 00 48 */ stw r0, 0x48(r1) -/* 80366D60 48 00 0F BD */ bl longlong2str -/* 80366D64 7C 74 1B 79 */ or. r20, r3, r3 -/* 80366D68 41 82 02 90 */ beq lbl_80366FF8 -/* 80366D6C 48 00 00 3C */ b lbl_80366DA8 -lbl_80366D70: -/* 80366D70 81 01 00 6C */ lwz r8, 0x6c(r1) -/* 80366D74 7F 83 E3 78 */ mr r3, r28 -/* 80366D78 80 E1 00 70 */ lwz r7, 0x70(r1) -/* 80366D7C 7F 04 C3 78 */ mr r4, r24 -/* 80366D80 80 C1 00 74 */ lwz r6, 0x74(r1) -/* 80366D84 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80366D88 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366D8C 91 01 00 2C */ stw r8, 0x2c(r1) -/* 80366D90 90 E1 00 30 */ stw r7, 0x30(r1) -/* 80366D94 90 C1 00 34 */ stw r6, 0x34(r1) -/* 80366D98 90 01 00 38 */ stw r0, 0x38(r1) -/* 80366D9C 48 00 12 95 */ bl long2str -/* 80366DA0 7C 74 1B 79 */ or. r20, r3, r3 -/* 80366DA4 41 82 02 54 */ beq lbl_80366FF8 -lbl_80366DA8: -/* 80366DA8 7F 34 A8 50 */ subf r25, r20, r21 -/* 80366DAC 48 00 02 8C */ b lbl_80367038 -lbl_80366DB0: -/* 80366DB0 88 01 00 70 */ lbz r0, 0x70(r1) -/* 80366DB4 28 00 00 05 */ cmplwi r0, 5 -/* 80366DB8 40 82 00 18 */ bne lbl_80366DD0 -/* 80366DBC 7F A3 EB 78 */ mr r3, r29 -/* 80366DC0 38 80 00 03 */ li r4, 3 -/* 80366DC4 4B FF AD 51 */ bl __va_arg -/* 80366DC8 C8 23 00 00 */ lfd f1, 0(r3) -/* 80366DCC 48 00 00 14 */ b lbl_80366DE0 -lbl_80366DD0: -/* 80366DD0 7F A3 EB 78 */ mr r3, r29 -/* 80366DD4 38 80 00 03 */ li r4, 3 -/* 80366DD8 4B FF AD 3D */ bl __va_arg -/* 80366DDC C8 23 00 00 */ lfd f1, 0(r3) -lbl_80366DE0: -/* 80366DE0 80 E1 00 6C */ lwz r7, 0x6c(r1) -/* 80366DE4 7F 03 C3 78 */ mr r3, r24 -/* 80366DE8 80 C1 00 70 */ lwz r6, 0x70(r1) -/* 80366DEC 38 81 00 1C */ addi r4, r1, 0x1c -/* 80366DF0 80 A1 00 74 */ lwz r5, 0x74(r1) -/* 80366DF4 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366DF8 90 E1 00 1C */ stw r7, 0x1c(r1) -/* 80366DFC 90 C1 00 20 */ stw r6, 0x20(r1) -/* 80366E00 90 A1 00 24 */ stw r5, 0x24(r1) -/* 80366E04 90 01 00 28 */ stw r0, 0x28(r1) -/* 80366E08 48 00 03 95 */ bl float2str -/* 80366E0C 7C 74 1B 79 */ or. r20, r3, r3 -/* 80366E10 41 82 01 E8 */ beq lbl_80366FF8 -/* 80366E14 7F 34 A8 50 */ subf r25, r20, r21 -/* 80366E18 48 00 02 20 */ b lbl_80367038 -lbl_80366E1C: -/* 80366E1C 88 01 00 70 */ lbz r0, 0x70(r1) -/* 80366E20 28 00 00 05 */ cmplwi r0, 5 -/* 80366E24 40 82 00 18 */ bne lbl_80366E3C -/* 80366E28 7F A3 EB 78 */ mr r3, r29 -/* 80366E2C 38 80 00 03 */ li r4, 3 -/* 80366E30 4B FF AC E5 */ bl __va_arg -/* 80366E34 C8 23 00 00 */ lfd f1, 0(r3) -/* 80366E38 48 00 00 14 */ b lbl_80366E4C -lbl_80366E3C: -/* 80366E3C 7F A3 EB 78 */ mr r3, r29 -/* 80366E40 38 80 00 03 */ li r4, 3 -/* 80366E44 4B FF AC D1 */ bl __va_arg -/* 80366E48 C8 23 00 00 */ lfd f1, 0(r3) -lbl_80366E4C: -/* 80366E4C 80 E1 00 6C */ lwz r7, 0x6c(r1) -/* 80366E50 7F 03 C3 78 */ mr r3, r24 -/* 80366E54 80 C1 00 70 */ lwz r6, 0x70(r1) -/* 80366E58 38 81 00 0C */ addi r4, r1, 0xc -/* 80366E5C 80 A1 00 74 */ lwz r5, 0x74(r1) -/* 80366E60 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366E64 90 E1 00 0C */ stw r7, 0xc(r1) -/* 80366E68 90 C1 00 10 */ stw r6, 0x10(r1) -/* 80366E6C 90 A1 00 14 */ stw r5, 0x14(r1) -/* 80366E70 90 01 00 18 */ stw r0, 0x18(r1) -/* 80366E74 48 00 0B 71 */ bl double2hex -/* 80366E78 7C 74 1B 79 */ or. r20, r3, r3 -/* 80366E7C 41 82 01 7C */ beq lbl_80366FF8 -/* 80366E80 7F 34 A8 50 */ subf r25, r20, r21 -/* 80366E84 48 00 01 B4 */ b lbl_80367038 -lbl_80366E88: -/* 80366E88 88 01 00 70 */ lbz r0, 0x70(r1) -/* 80366E8C 28 00 00 06 */ cmplwi r0, 6 -/* 80366E90 40 82 00 3C */ bne lbl_80366ECC -/* 80366E94 7F A3 EB 78 */ mr r3, r29 -/* 80366E98 38 80 00 01 */ li r4, 1 -/* 80366E9C 4B FF AC 79 */ bl __va_arg -/* 80366EA0 80 83 00 00 */ lwz r4, 0(r3) -/* 80366EA4 28 04 00 00 */ cmplwi r4, 0 -/* 80366EA8 40 82 00 08 */ bne lbl_80366EB0 -/* 80366EAC 38 8D 85 58 */ la r4, data_80450AD8(r13) /* 80450AD8-_SDA_BASE_ */ -lbl_80366EB0: -/* 80366EB0 38 61 00 7C */ addi r3, r1, 0x7c -/* 80366EB4 38 A0 02 00 */ li r5, 0x200 -/* 80366EB8 4B FF F0 BD */ bl wcstombs -/* 80366EBC 2C 03 00 00 */ cmpwi r3, 0 -/* 80366EC0 41 80 01 38 */ blt lbl_80366FF8 -/* 80366EC4 3A 81 00 7C */ addi r20, r1, 0x7c -/* 80366EC8 48 00 00 14 */ b lbl_80366EDC -lbl_80366ECC: -/* 80366ECC 7F A3 EB 78 */ mr r3, r29 -/* 80366ED0 38 80 00 01 */ li r4, 1 -/* 80366ED4 4B FF AC 41 */ bl __va_arg -/* 80366ED8 82 83 00 00 */ lwz r20, 0(r3) -lbl_80366EDC: -/* 80366EDC 28 14 00 00 */ cmplwi r20, 0 -/* 80366EE0 40 82 00 0C */ bne lbl_80366EEC -/* 80366EE4 3C 60 80 3A */ lis r3, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80366EE8 3A 83 23 18 */ addi r20, r3, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -lbl_80366EEC: -/* 80366EEC 88 01 00 6F */ lbz r0, 0x6f(r1) -/* 80366EF0 28 00 00 00 */ cmplwi r0, 0 -/* 80366EF4 41 82 00 2C */ beq lbl_80366F20 -/* 80366EF8 88 01 00 6E */ lbz r0, 0x6e(r1) -/* 80366EFC 8B 34 00 00 */ lbz r25, 0(r20) -/* 80366F00 3A 94 00 01 */ addi r20, r20, 1 -/* 80366F04 28 00 00 00 */ cmplwi r0, 0 -/* 80366F08 41 82 01 30 */ beq lbl_80367038 -/* 80366F0C 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80366F10 7C 19 00 00 */ cmpw r25, r0 -/* 80366F14 40 81 01 24 */ ble lbl_80367038 -/* 80366F18 7C 19 03 78 */ mr r25, r0 -/* 80366F1C 48 00 01 1C */ b lbl_80367038 -lbl_80366F20: -/* 80366F20 88 01 00 6E */ lbz r0, 0x6e(r1) -/* 80366F24 28 00 00 00 */ cmplwi r0, 0 -/* 80366F28 41 82 00 28 */ beq lbl_80366F50 -/* 80366F2C 83 21 00 78 */ lwz r25, 0x78(r1) -/* 80366F30 7E 83 A3 78 */ mr r3, r20 -/* 80366F34 38 80 00 00 */ li r4, 0 -/* 80366F38 7F 25 CB 78 */ mr r5, r25 -/* 80366F3C 4B FF F1 C9 */ bl memchr -/* 80366F40 28 03 00 00 */ cmplwi r3, 0 -/* 80366F44 41 82 00 F4 */ beq lbl_80367038 -/* 80366F48 7F 34 18 50 */ subf r25, r20, r3 -/* 80366F4C 48 00 00 EC */ b lbl_80367038 -lbl_80366F50: -/* 80366F50 7E 83 A3 78 */ mr r3, r20 -/* 80366F54 48 00 1C 91 */ bl strlen -/* 80366F58 7C 79 1B 78 */ mr r25, r3 -/* 80366F5C 48 00 00 DC */ b lbl_80367038 -lbl_80366F60: -/* 80366F60 7F A3 EB 78 */ mr r3, r29 -/* 80366F64 38 80 00 01 */ li r4, 1 -/* 80366F68 4B FF AB AD */ bl __va_arg -/* 80366F6C 88 01 00 70 */ lbz r0, 0x70(r1) -/* 80366F70 80 63 00 00 */ lwz r3, 0(r3) -/* 80366F74 2C 00 00 02 */ cmpwi r0, 2 -/* 80366F78 41 82 00 2C */ beq lbl_80366FA4 -/* 80366F7C 40 80 00 10 */ bge lbl_80366F8C -/* 80366F80 2C 00 00 00 */ cmpwi r0, 0 -/* 80366F84 41 82 00 18 */ beq lbl_80366F9C -/* 80366F88 48 00 01 F0 */ b lbl_80367178 -lbl_80366F8C: -/* 80366F8C 2C 00 00 04 */ cmpwi r0, 4 -/* 80366F90 41 82 00 24 */ beq lbl_80366FB4 -/* 80366F94 40 80 01 E4 */ bge lbl_80367178 -/* 80366F98 48 00 00 14 */ b lbl_80366FAC -lbl_80366F9C: -/* 80366F9C 93 63 00 00 */ stw r27, 0(r3) -/* 80366FA0 48 00 01 D8 */ b lbl_80367178 -lbl_80366FA4: -/* 80366FA4 B3 63 00 00 */ sth r27, 0(r3) -/* 80366FA8 48 00 01 D0 */ b lbl_80367178 -lbl_80366FAC: -/* 80366FAC 93 63 00 00 */ stw r27, 0(r3) -/* 80366FB0 48 00 01 C8 */ b lbl_80367178 -lbl_80366FB4: -/* 80366FB4 93 63 00 04 */ stw r27, 4(r3) -/* 80366FB8 7F 60 FE 70 */ srawi r0, r27, 0x1f -/* 80366FBC 90 03 00 00 */ stw r0, 0(r3) -/* 80366FC0 48 00 01 B8 */ b lbl_80367178 -lbl_80366FC4: -/* 80366FC4 7F A3 EB 78 */ mr r3, r29 -/* 80366FC8 3A 81 00 7C */ addi r20, r1, 0x7c -/* 80366FCC 38 80 00 01 */ li r4, 1 -/* 80366FD0 4B FF AB 45 */ bl __va_arg -/* 80366FD4 80 03 00 00 */ lwz r0, 0(r3) -/* 80366FD8 3B 20 00 01 */ li r25, 1 -/* 80366FDC 98 01 00 7C */ stb r0, 0x7c(r1) -/* 80366FE0 48 00 00 58 */ b lbl_80367038 -lbl_80366FE4: -/* 80366FE4 38 00 00 25 */ li r0, 0x25 -/* 80366FE8 3A 81 00 7C */ addi r20, r1, 0x7c -/* 80366FEC 98 01 00 7C */ stb r0, 0x7c(r1) -/* 80366FF0 3B 20 00 01 */ li r25, 1 -/* 80366FF4 48 00 00 44 */ b lbl_80367038 -lbl_80366FF8: -/* 80366FF8 7F 23 CB 78 */ mr r3, r25 -/* 80366FFC 48 00 1B E9 */ bl strlen -/* 80367000 7C 65 1B 79 */ or. r5, r3, r3 -/* 80367004 7F 7B 2A 14 */ add r27, r27, r5 -/* 80367008 41 82 00 28 */ beq lbl_80367030 -/* 8036700C 7F EC FB 78 */ mr r12, r31 -/* 80367010 7F C3 F3 78 */ mr r3, r30 -/* 80367014 7F 24 CB 78 */ mr r4, r25 -/* 80367018 7D 89 03 A6 */ mtctr r12 -/* 8036701C 4E 80 04 21 */ bctrl -/* 80367020 28 03 00 00 */ cmplwi r3, 0 -/* 80367024 40 82 00 0C */ bne lbl_80367030 -/* 80367028 38 60 FF FF */ li r3, -1 -/* 8036702C 48 00 01 5C */ b lbl_80367188 -lbl_80367030: -/* 80367030 7F 63 DB 78 */ mr r3, r27 -/* 80367034 48 00 01 54 */ b lbl_80367188 -lbl_80367038: -/* 80367038 88 01 00 6C */ lbz r0, 0x6c(r1) -/* 8036703C 7F 33 CB 78 */ mr r19, r25 -/* 80367040 28 00 00 00 */ cmplwi r0, 0 -/* 80367044 41 82 00 B0 */ beq lbl_803670F4 -/* 80367048 28 00 00 02 */ cmplwi r0, 2 -/* 8036704C 38 00 00 20 */ li r0, 0x20 -/* 80367050 40 82 00 08 */ bne lbl_80367058 -/* 80367054 38 00 00 30 */ li r0, 0x30 -lbl_80367058: -/* 80367058 98 01 00 09 */ stb r0, 9(r1) -/* 8036705C 88 14 00 00 */ lbz r0, 0(r20) -/* 80367060 7C 00 07 74 */ extsb r0, r0 -/* 80367064 2C 00 00 2B */ cmpwi r0, 0x2b -/* 80367068 41 82 00 14 */ beq lbl_8036707C -/* 8036706C 2C 00 00 2D */ cmpwi r0, 0x2d -/* 80367070 41 82 00 0C */ beq lbl_8036707C -/* 80367074 2C 00 00 20 */ cmpwi r0, 0x20 -/* 80367078 40 82 00 70 */ bne lbl_803670E8 -lbl_8036707C: -/* 8036707C 88 01 00 09 */ lbz r0, 9(r1) -/* 80367080 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80367084 40 82 00 64 */ bne lbl_803670E8 -/* 80367088 7F EC FB 78 */ mr r12, r31 -/* 8036708C 7F C3 F3 78 */ mr r3, r30 -/* 80367090 7E 84 A3 78 */ mr r4, r20 -/* 80367094 38 A0 00 01 */ li r5, 1 -/* 80367098 7D 89 03 A6 */ mtctr r12 -/* 8036709C 4E 80 04 21 */ bctrl -/* 803670A0 28 03 00 00 */ cmplwi r3, 0 -/* 803670A4 40 82 00 0C */ bne lbl_803670B0 -/* 803670A8 38 60 FF FF */ li r3, -1 -/* 803670AC 48 00 00 DC */ b lbl_80367188 -lbl_803670B0: -/* 803670B0 3A 94 00 01 */ addi r20, r20, 1 -/* 803670B4 3B 39 FF FF */ addi r25, r25, -1 -/* 803670B8 48 00 00 30 */ b lbl_803670E8 -lbl_803670BC: -/* 803670BC 7F EC FB 78 */ mr r12, r31 -/* 803670C0 7F C3 F3 78 */ mr r3, r30 -/* 803670C4 38 81 00 09 */ addi r4, r1, 9 -/* 803670C8 38 A0 00 01 */ li r5, 1 -/* 803670CC 7D 89 03 A6 */ mtctr r12 -/* 803670D0 4E 80 04 21 */ bctrl -/* 803670D4 28 03 00 00 */ cmplwi r3, 0 -/* 803670D8 40 82 00 0C */ bne lbl_803670E4 -/* 803670DC 38 60 FF FF */ li r3, -1 -/* 803670E0 48 00 00 A8 */ b lbl_80367188 -lbl_803670E4: -/* 803670E4 3A 73 00 01 */ addi r19, r19, 1 -lbl_803670E8: -/* 803670E8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 803670EC 7C 13 00 00 */ cmpw r19, r0 -/* 803670F0 41 80 FF CC */ blt lbl_803670BC -lbl_803670F4: -/* 803670F4 2C 19 00 00 */ cmpwi r25, 0 -/* 803670F8 41 82 00 2C */ beq lbl_80367124 -/* 803670FC 7F EC FB 78 */ mr r12, r31 -/* 80367100 7F C3 F3 78 */ mr r3, r30 -/* 80367104 7E 84 A3 78 */ mr r4, r20 -/* 80367108 7F 25 CB 78 */ mr r5, r25 -/* 8036710C 7D 89 03 A6 */ mtctr r12 -/* 80367110 4E 80 04 21 */ bctrl -/* 80367114 28 03 00 00 */ cmplwi r3, 0 -/* 80367118 40 82 00 0C */ bne lbl_80367124 -/* 8036711C 38 60 FF FF */ li r3, -1 -/* 80367120 48 00 00 68 */ b lbl_80367188 -lbl_80367124: -/* 80367124 88 01 00 6C */ lbz r0, 0x6c(r1) -/* 80367128 28 00 00 00 */ cmplwi r0, 0 -/* 8036712C 40 82 00 48 */ bne lbl_80367174 -/* 80367130 3A 80 00 20 */ li r20, 0x20 -/* 80367134 48 00 00 34 */ b lbl_80367168 -lbl_80367138: -/* 80367138 7F EC FB 78 */ mr r12, r31 -/* 8036713C 7F C3 F3 78 */ mr r3, r30 -/* 80367140 9A 81 00 08 */ stb r20, 8(r1) -/* 80367144 38 81 00 08 */ addi r4, r1, 8 -/* 80367148 38 A0 00 01 */ li r5, 1 -/* 8036714C 7D 89 03 A6 */ mtctr r12 -/* 80367150 4E 80 04 21 */ bctrl -/* 80367154 28 03 00 00 */ cmplwi r3, 0 -/* 80367158 40 82 00 0C */ bne lbl_80367164 -/* 8036715C 38 60 FF FF */ li r3, -1 -/* 80367160 48 00 00 28 */ b lbl_80367188 -lbl_80367164: -/* 80367164 3A 73 00 01 */ addi r19, r19, 1 -lbl_80367168: -/* 80367168 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8036716C 7C 13 00 00 */ cmpw r19, r0 -/* 80367170 41 80 FF C8 */ blt lbl_80367138 -lbl_80367174: -/* 80367174 7F 7B 9A 14 */ add r27, r27, r19 -lbl_80367178: -/* 80367178 88 1A 00 00 */ lbz r0, 0(r26) -/* 8036717C 7C 00 07 75 */ extsb. r0, r0 -/* 80367180 40 82 F8 E0 */ bne lbl_80366A60 -lbl_80367184: -/* 80367184 7F 63 DB 78 */ mr r3, r27 -lbl_80367188: -/* 80367188 BA 61 02 8C */ lmw r19, 0x28c(r1) -/* 8036718C 80 01 02 C4 */ lwz r0, 0x2c4(r1) -/* 80367190 7C 08 03 A6 */ mtlr r0 -/* 80367194 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 80367198 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/double2hex.s b/asm/MSL_C/MSL_Common/Src/printf/double2hex.s deleted file mode 100644 index 7314ea0cf2..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/double2hex.s +++ /dev/null @@ -1,234 +0,0 @@ -lbl_803679E4: -/* 803679E4 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 803679E8 7C 08 02 A6 */ mflr r0 -/* 803679EC 90 01 00 84 */ stw r0, 0x84(r1) -/* 803679F0 80 04 00 0C */ lwz r0, 0xc(r4) -/* 803679F4 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 803679F8 7C 9F 23 78 */ mr r31, r4 -/* 803679FC 2C 00 01 FD */ cmpwi r0, 0x1fd -/* 80367A00 93 C1 00 78 */ stw r30, 0x78(r1) -/* 80367A04 7C 7E 1B 78 */ mr r30, r3 -/* 80367A08 D8 21 00 08 */ stfd f1, 8(r1) -/* 80367A0C D8 21 00 18 */ stfd f1, 0x18(r1) -/* 80367A10 40 81 00 0C */ ble lbl_80367A1C -/* 80367A14 38 60 00 00 */ li r3, 0 -/* 80367A18 48 00 02 EC */ b lbl_80367D04 -lbl_80367A1C: -/* 80367A1C 38 60 00 00 */ li r3, 0 -/* 80367A20 38 00 00 20 */ li r0, 0x20 -/* 80367A24 98 61 00 10 */ stb r3, 0x10(r1) -/* 80367A28 38 61 00 10 */ addi r3, r1, 0x10 -/* 80367A2C 38 81 00 40 */ addi r4, r1, 0x40 -/* 80367A30 B0 01 00 12 */ sth r0, 0x12(r1) -/* 80367A34 4B FF B6 F1 */ bl __num2dec -/* 80367A38 88 01 00 45 */ lbz r0, 0x45(r1) -/* 80367A3C 28 00 00 49 */ cmplwi r0, 0x49 -/* 80367A40 40 82 00 94 */ bne lbl_80367AD4 -/* 80367A44 A8 01 00 18 */ lha r0, 0x18(r1) -/* 80367A48 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 -/* 80367A4C 41 82 00 44 */ beq lbl_80367A90 -/* 80367A50 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367A54 3B DE FF FB */ addi r30, r30, -5 -/* 80367A58 28 00 00 41 */ cmplwi r0, 0x41 -/* 80367A5C 40 82 00 1C */ bne lbl_80367A78 -/* 80367A60 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367A64 7F C3 F3 78 */ mr r3, r30 -/* 80367A68 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367A6C 38 84 00 01 */ addi r4, r4, 1 -/* 80367A70 48 00 10 BD */ bl strcpy -/* 80367A74 48 00 00 58 */ b lbl_80367ACC -lbl_80367A78: -/* 80367A78 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367A7C 7F C3 F3 78 */ mr r3, r30 -/* 80367A80 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367A84 38 84 00 06 */ addi r4, r4, 6 -/* 80367A88 48 00 10 A5 */ bl strcpy -/* 80367A8C 48 00 00 40 */ b lbl_80367ACC -lbl_80367A90: -/* 80367A90 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367A94 3B DE FF FC */ addi r30, r30, -4 -/* 80367A98 28 00 00 41 */ cmplwi r0, 0x41 -/* 80367A9C 40 82 00 1C */ bne lbl_80367AB8 -/* 80367AA0 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367AA4 7F C3 F3 78 */ mr r3, r30 -/* 80367AA8 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367AAC 38 84 00 0B */ addi r4, r4, 0xb -/* 80367AB0 48 00 10 7D */ bl strcpy -/* 80367AB4 48 00 00 18 */ b lbl_80367ACC -lbl_80367AB8: -/* 80367AB8 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367ABC 7F C3 F3 78 */ mr r3, r30 -/* 80367AC0 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367AC4 38 84 00 0F */ addi r4, r4, 0xf -/* 80367AC8 48 00 10 65 */ bl strcpy -lbl_80367ACC: -/* 80367ACC 7F C3 F3 78 */ mr r3, r30 -/* 80367AD0 48 00 02 34 */ b lbl_80367D04 -lbl_80367AD4: -/* 80367AD4 28 00 00 4E */ cmplwi r0, 0x4e -/* 80367AD8 40 82 00 94 */ bne lbl_80367B6C -/* 80367ADC 88 01 00 08 */ lbz r0, 8(r1) -/* 80367AE0 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 80367AE4 41 82 00 44 */ beq lbl_80367B28 -/* 80367AE8 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367AEC 3B DE FF FB */ addi r30, r30, -5 -/* 80367AF0 28 00 00 41 */ cmplwi r0, 0x41 -/* 80367AF4 40 82 00 1C */ bne lbl_80367B10 -/* 80367AF8 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367AFC 7F C3 F3 78 */ mr r3, r30 -/* 80367B00 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367B04 38 84 00 13 */ addi r4, r4, 0x13 -/* 80367B08 48 00 10 25 */ bl strcpy -/* 80367B0C 48 00 00 58 */ b lbl_80367B64 -lbl_80367B10: -/* 80367B10 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367B14 7F C3 F3 78 */ mr r3, r30 -/* 80367B18 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367B1C 38 84 00 18 */ addi r4, r4, 0x18 -/* 80367B20 48 00 10 0D */ bl strcpy -/* 80367B24 48 00 00 40 */ b lbl_80367B64 -lbl_80367B28: -/* 80367B28 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367B2C 3B DE FF FC */ addi r30, r30, -4 -/* 80367B30 28 00 00 41 */ cmplwi r0, 0x41 -/* 80367B34 40 82 00 1C */ bne lbl_80367B50 -/* 80367B38 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367B3C 7F C3 F3 78 */ mr r3, r30 -/* 80367B40 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367B44 38 84 00 1D */ addi r4, r4, 0x1d -/* 80367B48 48 00 0F E5 */ bl strcpy -/* 80367B4C 48 00 00 18 */ b lbl_80367B64 -lbl_80367B50: -/* 80367B50 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367B54 7F C3 F3 78 */ mr r3, r30 -/* 80367B58 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367B5C 38 84 00 21 */ addi r4, r4, 0x21 -/* 80367B60 48 00 0F CD */ bl strcpy -lbl_80367B64: -/* 80367B64 7F C3 F3 78 */ mr r3, r30 -/* 80367B68 48 00 01 9C */ b lbl_80367D04 -lbl_80367B6C: -/* 80367B6C 39 00 00 00 */ li r8, 0 -/* 80367B70 39 20 00 01 */ li r9, 1 -/* 80367B74 A8 01 00 18 */ lha r0, 0x18(r1) -/* 80367B78 38 E0 00 64 */ li r7, 0x64 -/* 80367B7C 99 21 00 30 */ stb r9, 0x30(r1) -/* 80367B80 7F C4 F3 78 */ mr r4, r30 -/* 80367B84 54 00 E5 7E */ rlwinm r0, r0, 0x1c, 0x15, 0x1f -/* 80367B88 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80367B8C 7C 03 07 34 */ extsh r3, r0 -/* 80367B90 99 21 00 31 */ stb r9, 0x31(r1) -/* 80367B94 38 63 FC 01 */ addi r3, r3, -1023 -/* 80367B98 99 01 00 32 */ stb r8, 0x32(r1) -/* 80367B9C 99 01 00 33 */ stb r8, 0x33(r1) -/* 80367BA0 80 C1 00 30 */ lwz r6, 0x30(r1) -/* 80367BA4 99 01 00 34 */ stb r8, 0x34(r1) -/* 80367BA8 98 E1 00 35 */ stb r7, 0x35(r1) -/* 80367BAC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80367BB0 91 01 00 38 */ stw r8, 0x38(r1) -/* 80367BB4 91 21 00 3C */ stw r9, 0x3c(r1) -/* 80367BB8 90 C1 00 20 */ stw r6, 0x20(r1) -/* 80367BBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80367BC0 91 01 00 28 */ stw r8, 0x28(r1) -/* 80367BC4 91 21 00 2C */ stw r9, 0x2c(r1) -/* 80367BC8 48 00 04 69 */ bl long2str -/* 80367BCC 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367BD0 28 00 00 61 */ cmplwi r0, 0x61 -/* 80367BD4 40 82 00 14 */ bne lbl_80367BE8 -/* 80367BD8 38 00 00 70 */ li r0, 0x70 -/* 80367BDC 38 83 FF FF */ addi r4, r3, -1 -/* 80367BE0 98 03 FF FF */ stb r0, -1(r3) -/* 80367BE4 48 00 00 10 */ b lbl_80367BF4 -lbl_80367BE8: -/* 80367BE8 38 00 00 50 */ li r0, 0x50 -/* 80367BEC 38 83 FF FF */ addi r4, r3, -1 -/* 80367BF0 98 03 FF FF */ stb r0, -1(r3) -lbl_80367BF4: -/* 80367BF4 81 1F 00 0C */ lwz r8, 0xc(r31) -/* 80367BF8 38 C1 00 08 */ addi r6, r1, 8 -/* 80367BFC 7D 09 03 A6 */ mtctr r8 -/* 80367C00 2C 08 00 01 */ cmpwi r8, 1 -/* 80367C04 41 80 00 6C */ blt lbl_80367C70 -lbl_80367C08: -/* 80367C08 55 05 0F FE */ srwi r5, r8, 0x1f -/* 80367C0C 55 00 07 FE */ clrlwi r0, r8, 0x1f -/* 80367C10 7C 65 42 14 */ add r3, r5, r8 -/* 80367C14 7C 63 0E 70 */ srawi r3, r3, 1 -/* 80367C18 7C 00 2A 78 */ xor r0, r0, r5 -/* 80367C1C 38 63 00 01 */ addi r3, r3, 1 -/* 80367C20 7C E6 18 AE */ lbzx r7, r6, r3 -/* 80367C24 7C 05 00 51 */ subf. r0, r5, r0 -/* 80367C28 54 E0 E7 3E */ rlwinm r0, r7, 0x1c, 0x1c, 0x1f -/* 80367C2C 7C 03 07 74 */ extsb r3, r0 -/* 80367C30 41 82 00 08 */ beq lbl_80367C38 -/* 80367C34 54 E3 07 3E */ clrlwi r3, r7, 0x1c -lbl_80367C38: -/* 80367C38 7C 60 07 74 */ extsb r0, r3 -/* 80367C3C 2C 00 00 0A */ cmpwi r0, 0xa -/* 80367C40 40 80 00 0C */ bge lbl_80367C4C -/* 80367C44 38 03 00 30 */ addi r0, r3, 0x30 -/* 80367C48 48 00 00 1C */ b lbl_80367C64 -lbl_80367C4C: -/* 80367C4C 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367C50 28 00 00 61 */ cmplwi r0, 0x61 -/* 80367C54 40 82 00 0C */ bne lbl_80367C60 -/* 80367C58 38 03 00 57 */ addi r0, r3, 0x57 -/* 80367C5C 48 00 00 08 */ b lbl_80367C64 -lbl_80367C60: -/* 80367C60 38 03 00 37 */ addi r0, r3, 0x37 -lbl_80367C64: -/* 80367C64 9C 04 FF FF */ stbu r0, -1(r4) -/* 80367C68 39 08 FF FF */ addi r8, r8, -1 -/* 80367C6C 42 00 FF 9C */ bdnz lbl_80367C08 -lbl_80367C70: -/* 80367C70 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 80367C74 2C 00 00 00 */ cmpwi r0, 0 -/* 80367C78 40 82 00 10 */ bne lbl_80367C88 -/* 80367C7C 88 1F 00 03 */ lbz r0, 3(r31) -/* 80367C80 28 00 00 00 */ cmplwi r0, 0 -/* 80367C84 41 82 00 0C */ beq lbl_80367C90 -lbl_80367C88: -/* 80367C88 38 00 00 2E */ li r0, 0x2e -/* 80367C8C 9C 04 FF FF */ stbu r0, -1(r4) -lbl_80367C90: -/* 80367C90 88 1F 00 05 */ lbz r0, 5(r31) -/* 80367C94 38 60 00 31 */ li r3, 0x31 -/* 80367C98 98 64 FF FF */ stb r3, -1(r4) -/* 80367C9C 28 00 00 61 */ cmplwi r0, 0x61 -/* 80367CA0 40 82 00 10 */ bne lbl_80367CB0 -/* 80367CA4 38 00 00 78 */ li r0, 0x78 -/* 80367CA8 9C 04 FF FE */ stbu r0, -2(r4) -/* 80367CAC 48 00 00 0C */ b lbl_80367CB8 -lbl_80367CB0: -/* 80367CB0 38 00 00 58 */ li r0, 0x58 -/* 80367CB4 9C 04 FF FE */ stbu r0, -2(r4) -lbl_80367CB8: -/* 80367CB8 A8 01 00 18 */ lha r0, 0x18(r1) -/* 80367CBC 38 60 00 30 */ li r3, 0x30 -/* 80367CC0 9C 64 FF FF */ stbu r3, -1(r4) -/* 80367CC4 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 -/* 80367CC8 41 82 00 10 */ beq lbl_80367CD8 -/* 80367CCC 38 00 00 2D */ li r0, 0x2d -/* 80367CD0 9C 04 FF FF */ stbu r0, -1(r4) -/* 80367CD4 48 00 00 2C */ b lbl_80367D00 -lbl_80367CD8: -/* 80367CD8 88 1F 00 01 */ lbz r0, 1(r31) -/* 80367CDC 28 00 00 01 */ cmplwi r0, 1 -/* 80367CE0 40 82 00 10 */ bne lbl_80367CF0 -/* 80367CE4 38 00 00 2B */ li r0, 0x2b -/* 80367CE8 9C 04 FF FF */ stbu r0, -1(r4) -/* 80367CEC 48 00 00 14 */ b lbl_80367D00 -lbl_80367CF0: -/* 80367CF0 28 00 00 02 */ cmplwi r0, 2 -/* 80367CF4 40 82 00 0C */ bne lbl_80367D00 -/* 80367CF8 38 00 00 20 */ li r0, 0x20 -/* 80367CFC 9C 04 FF FF */ stbu r0, -1(r4) -lbl_80367D00: -/* 80367D00 7C 83 23 78 */ mr r3, r4 -lbl_80367D04: -/* 80367D04 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80367D08 83 E1 00 7C */ lwz r31, 0x7c(r1) -/* 80367D0C 83 C1 00 78 */ lwz r30, 0x78(r1) -/* 80367D10 7C 08 03 A6 */ mtlr r0 -/* 80367D14 38 21 00 80 */ addi r1, r1, 0x80 -/* 80367D18 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/float2str.s b/asm/MSL_C/MSL_Common/Src/printf/float2str.s deleted file mode 100644 index 6cdacd9957..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/float2str.s +++ /dev/null @@ -1,527 +0,0 @@ -lbl_8036719C: -/* 8036719C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 803671A0 7C 08 02 A6 */ mflr r0 -/* 803671A4 90 01 00 54 */ stw r0, 0x54(r1) -/* 803671A8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 803671AC DB E1 00 48 */ stfd f31, 0x48(r1) -/* 803671B0 FF E0 08 90 */ fmr f31, f1 -/* 803671B4 2C 00 01 FD */ cmpwi r0, 0x1fd -/* 803671B8 93 E1 00 44 */ stw r31, 0x44(r1) -/* 803671BC 93 C1 00 40 */ stw r30, 0x40(r1) -/* 803671C0 93 A1 00 3C */ stw r29, 0x3c(r1) -/* 803671C4 7C 9D 23 78 */ mr r29, r4 -/* 803671C8 93 81 00 38 */ stw r28, 0x38(r1) -/* 803671CC 7C 7C 1B 78 */ mr r28, r3 -/* 803671D0 40 81 00 0C */ ble lbl_803671DC -/* 803671D4 38 60 00 00 */ li r3, 0 -/* 803671D8 48 00 06 BC */ b lbl_80367894 -lbl_803671DC: -/* 803671DC 38 60 00 00 */ li r3, 0 -/* 803671E0 38 00 00 20 */ li r0, 0x20 -/* 803671E4 98 61 00 08 */ stb r3, 8(r1) -/* 803671E8 38 61 00 08 */ addi r3, r1, 8 -/* 803671EC 38 81 00 0C */ addi r4, r1, 0xc -/* 803671F0 B0 01 00 0A */ sth r0, 0xa(r1) -/* 803671F4 4B FF BF 31 */ bl __num2dec -/* 803671F8 88 01 00 10 */ lbz r0, 0x10(r1) -/* 803671FC 3B E1 00 11 */ addi r31, r1, 0x11 -/* 80367200 7C BF 02 14 */ add r5, r31, r0 -/* 80367204 48 00 00 1C */ b lbl_80367220 -lbl_80367208: -/* 80367208 88 81 00 10 */ lbz r4, 0x10(r1) -/* 8036720C A8 61 00 0E */ lha r3, 0xe(r1) -/* 80367210 38 84 FF FF */ addi r4, r4, -1 -/* 80367214 38 03 00 01 */ addi r0, r3, 1 -/* 80367218 98 81 00 10 */ stb r4, 0x10(r1) -/* 8036721C B0 01 00 0E */ sth r0, 0xe(r1) -lbl_80367220: -/* 80367220 88 01 00 10 */ lbz r0, 0x10(r1) -/* 80367224 28 00 00 01 */ cmplwi r0, 1 -/* 80367228 40 81 00 10 */ ble lbl_80367238 -/* 8036722C 8C 05 FF FF */ lbzu r0, -1(r5) -/* 80367230 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80367234 41 82 FF D4 */ beq lbl_80367208 -lbl_80367238: -/* 80367238 88 01 00 11 */ lbz r0, 0x11(r1) -/* 8036723C 2C 00 00 49 */ cmpwi r0, 0x49 -/* 80367240 41 82 00 2C */ beq lbl_8036726C -/* 80367244 40 80 00 10 */ bge lbl_80367254 -/* 80367248 2C 00 00 30 */ cmpwi r0, 0x30 -/* 8036724C 41 82 00 14 */ beq lbl_80367260 -/* 80367250 48 00 01 6C */ b lbl_803673BC -lbl_80367254: -/* 80367254 2C 00 00 4E */ cmpwi r0, 0x4e -/* 80367258 41 82 00 BC */ beq lbl_80367314 -/* 8036725C 48 00 01 60 */ b lbl_803673BC -lbl_80367260: -/* 80367260 38 00 00 00 */ li r0, 0 -/* 80367264 B0 01 00 0E */ sth r0, 0xe(r1) -/* 80367268 48 00 01 54 */ b lbl_803673BC -lbl_8036726C: -/* 8036726C C8 02 CC 70 */ lfd f0, lit_1089(r2) -/* 80367270 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80367274 40 80 00 50 */ bge lbl_803672C4 -/* 80367278 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 8036727C 88 1D 00 05 */ lbz r0, 5(r29) -/* 80367280 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 80367284 3B 9C FF FB */ addi r28, r28, -5 -/* 80367288 7C 03 00 AE */ lbzx r0, r3, r0 -/* 8036728C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 80367290 41 82 00 1C */ beq lbl_803672AC -/* 80367294 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367298 7F 83 E3 78 */ mr r3, r28 -/* 8036729C 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 803672A0 38 84 00 01 */ addi r4, r4, 1 -/* 803672A4 48 00 18 89 */ bl strcpy -/* 803672A8 48 00 00 64 */ b lbl_8036730C -lbl_803672AC: -/* 803672AC 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 803672B0 7F 83 E3 78 */ mr r3, r28 -/* 803672B4 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 803672B8 38 84 00 06 */ addi r4, r4, 6 -/* 803672BC 48 00 18 71 */ bl strcpy -/* 803672C0 48 00 00 4C */ b lbl_8036730C -lbl_803672C4: -/* 803672C4 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 803672C8 88 1D 00 05 */ lbz r0, 5(r29) -/* 803672CC 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 803672D0 3B 9C FF FC */ addi r28, r28, -4 -/* 803672D4 7C 03 00 AE */ lbzx r0, r3, r0 -/* 803672D8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 803672DC 41 82 00 1C */ beq lbl_803672F8 -/* 803672E0 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 803672E4 7F 83 E3 78 */ mr r3, r28 -/* 803672E8 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 803672EC 38 84 00 0B */ addi r4, r4, 0xb -/* 803672F0 48 00 18 3D */ bl strcpy -/* 803672F4 48 00 00 18 */ b lbl_8036730C -lbl_803672F8: -/* 803672F8 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 803672FC 7F 83 E3 78 */ mr r3, r28 -/* 80367300 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367304 38 84 00 0F */ addi r4, r4, 0xf -/* 80367308 48 00 18 25 */ bl strcpy -lbl_8036730C: -/* 8036730C 7F 83 E3 78 */ mr r3, r28 -/* 80367310 48 00 05 84 */ b lbl_80367894 -lbl_80367314: -/* 80367314 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80367318 7C 00 07 75 */ extsb. r0, r0 -/* 8036731C 41 82 00 50 */ beq lbl_8036736C -/* 80367320 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 80367324 88 1D 00 05 */ lbz r0, 5(r29) -/* 80367328 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 8036732C 3B 9C FF FB */ addi r28, r28, -5 -/* 80367330 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80367334 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 80367338 41 82 00 1C */ beq lbl_80367354 -/* 8036733C 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367340 7F 83 E3 78 */ mr r3, r28 -/* 80367344 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367348 38 84 00 13 */ addi r4, r4, 0x13 -/* 8036734C 48 00 17 E1 */ bl strcpy -/* 80367350 48 00 00 64 */ b lbl_803673B4 -lbl_80367354: -/* 80367354 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 80367358 7F 83 E3 78 */ mr r3, r28 -/* 8036735C 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367360 38 84 00 18 */ addi r4, r4, 0x18 -/* 80367364 48 00 17 C9 */ bl strcpy -/* 80367368 48 00 00 4C */ b lbl_803673B4 -lbl_8036736C: -/* 8036736C 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 80367370 88 1D 00 05 */ lbz r0, 5(r29) -/* 80367374 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 80367378 3B 9C FF FC */ addi r28, r28, -4 -/* 8036737C 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80367380 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 80367384 41 82 00 1C */ beq lbl_803673A0 -/* 80367388 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 8036738C 7F 83 E3 78 */ mr r3, r28 -/* 80367390 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 80367394 38 84 00 1D */ addi r4, r4, 0x1d -/* 80367398 48 00 17 95 */ bl strcpy -/* 8036739C 48 00 00 18 */ b lbl_803673B4 -lbl_803673A0: -/* 803673A0 3C 80 80 3A */ lis r4, MSL_Common_Src_printf__stringBase0@ha /* 0x803A2318@ha */ -/* 803673A4 7F 83 E3 78 */ mr r3, r28 -/* 803673A8 38 84 23 18 */ addi r4, r4, MSL_Common_Src_printf__stringBase0@l /* 0x803A2318@l */ -/* 803673AC 38 84 00 21 */ addi r4, r4, 0x21 -/* 803673B0 48 00 17 7D */ bl strcpy -lbl_803673B4: -/* 803673B4 7F 83 E3 78 */ mr r3, r28 -/* 803673B8 48 00 04 DC */ b lbl_80367894 -lbl_803673BC: -/* 803673BC A8 A1 00 0E */ lha r5, 0xe(r1) -/* 803673C0 38 60 00 00 */ li r3, 0 -/* 803673C4 88 81 00 10 */ lbz r4, 0x10(r1) -/* 803673C8 3B DC FF FF */ addi r30, r28, -1 -/* 803673CC 88 1D 00 05 */ lbz r0, 5(r29) -/* 803673D0 7C 84 2A 14 */ add r4, r4, r5 -/* 803673D4 38 84 FF FF */ addi r4, r4, -1 -/* 803673D8 2C 00 00 65 */ cmpwi r0, 0x65 -/* 803673DC B0 81 00 0E */ sth r4, 0xe(r1) -/* 803673E0 98 7C FF FF */ stb r3, -1(r28) -/* 803673E4 41 82 00 F4 */ beq lbl_803674D8 -/* 803673E8 40 80 00 28 */ bge lbl_80367410 -/* 803673EC 2C 00 00 46 */ cmpwi r0, 0x46 -/* 803673F0 41 82 02 4C */ beq lbl_8036763C -/* 803673F4 40 80 00 10 */ bge lbl_80367404 -/* 803673F8 2C 00 00 45 */ cmpwi r0, 0x45 -/* 803673FC 40 80 00 DC */ bge lbl_803674D8 -/* 80367400 48 00 04 90 */ b lbl_80367890 -lbl_80367404: -/* 80367404 2C 00 00 48 */ cmpwi r0, 0x48 -/* 80367408 40 80 04 88 */ bge lbl_80367890 -/* 8036740C 48 00 00 14 */ b lbl_80367420 -lbl_80367410: -/* 80367410 2C 00 00 67 */ cmpwi r0, 0x67 -/* 80367414 41 82 00 0C */ beq lbl_80367420 -/* 80367418 40 80 04 78 */ bge lbl_80367890 -/* 8036741C 48 00 02 20 */ b lbl_8036763C -lbl_80367420: -/* 80367420 88 01 00 10 */ lbz r0, 0x10(r1) -/* 80367424 80 9D 00 0C */ lwz r4, 0xc(r29) -/* 80367428 7C 00 20 00 */ cmpw r0, r4 -/* 8036742C 40 81 00 0C */ ble lbl_80367438 -/* 80367430 38 61 00 0C */ addi r3, r1, 0xc -/* 80367434 48 00 04 85 */ bl round_decimal -lbl_80367438: -/* 80367438 A8 81 00 0E */ lha r4, 0xe(r1) -/* 8036743C 2C 04 FF FC */ cmpwi r4, -4 -/* 80367440 41 80 00 10 */ blt lbl_80367450 -/* 80367444 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 80367448 7C 04 18 00 */ cmpw r4, r3 -/* 8036744C 41 80 00 50 */ blt lbl_8036749C -lbl_80367450: -/* 80367450 88 1D 00 03 */ lbz r0, 3(r29) -/* 80367454 28 00 00 00 */ cmplwi r0, 0 -/* 80367458 41 82 00 14 */ beq lbl_8036746C -/* 8036745C 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 80367460 38 03 FF FF */ addi r0, r3, -1 -/* 80367464 90 1D 00 0C */ stw r0, 0xc(r29) -/* 80367468 48 00 00 10 */ b lbl_80367478 -lbl_8036746C: -/* 8036746C 88 61 00 10 */ lbz r3, 0x10(r1) -/* 80367470 38 03 FF FF */ addi r0, r3, -1 -/* 80367474 90 1D 00 0C */ stw r0, 0xc(r29) -lbl_80367478: -/* 80367478 88 1D 00 05 */ lbz r0, 5(r29) -/* 8036747C 28 00 00 67 */ cmplwi r0, 0x67 -/* 80367480 40 82 00 10 */ bne lbl_80367490 -/* 80367484 38 00 00 65 */ li r0, 0x65 -/* 80367488 98 1D 00 05 */ stb r0, 5(r29) -/* 8036748C 48 00 00 4C */ b lbl_803674D8 -lbl_80367490: -/* 80367490 38 00 00 45 */ li r0, 0x45 -/* 80367494 98 1D 00 05 */ stb r0, 5(r29) -/* 80367498 48 00 00 40 */ b lbl_803674D8 -lbl_8036749C: -/* 8036749C 88 1D 00 03 */ lbz r0, 3(r29) -/* 803674A0 28 00 00 00 */ cmplwi r0, 0 -/* 803674A4 41 82 00 14 */ beq lbl_803674B8 -/* 803674A8 38 04 00 01 */ addi r0, r4, 1 -/* 803674AC 7C 00 18 50 */ subf r0, r0, r3 -/* 803674B0 90 1D 00 0C */ stw r0, 0xc(r29) -/* 803674B4 48 00 01 88 */ b lbl_8036763C -lbl_803674B8: -/* 803674B8 88 01 00 10 */ lbz r0, 0x10(r1) -/* 803674BC 38 64 00 01 */ addi r3, r4, 1 -/* 803674C0 7C 03 00 51 */ subf. r0, r3, r0 -/* 803674C4 90 1D 00 0C */ stw r0, 0xc(r29) -/* 803674C8 40 80 01 74 */ bge lbl_8036763C -/* 803674CC 38 00 00 00 */ li r0, 0 -/* 803674D0 90 1D 00 0C */ stw r0, 0xc(r29) -/* 803674D4 48 00 01 68 */ b lbl_8036763C -lbl_803674D8: -/* 803674D8 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 803674DC 88 01 00 10 */ lbz r0, 0x10(r1) -/* 803674E0 38 83 00 01 */ addi r4, r3, 1 -/* 803674E4 7C 00 20 00 */ cmpw r0, r4 -/* 803674E8 40 81 00 0C */ ble lbl_803674F4 -/* 803674EC 38 61 00 0C */ addi r3, r1, 0xc -/* 803674F0 48 00 03 C9 */ bl round_decimal -lbl_803674F4: -/* 803674F4 A8 C1 00 0E */ lha r6, 0xe(r1) -/* 803674F8 39 00 00 2B */ li r8, 0x2b -/* 803674FC 2C 06 00 00 */ cmpwi r6, 0 -/* 80367500 40 80 00 0C */ bge lbl_8036750C -/* 80367504 7C C6 00 D0 */ neg r6, r6 -/* 80367508 39 00 00 2D */ li r8, 0x2d -lbl_8036750C: -/* 8036750C 3C 60 66 66 */ lis r3, 0x6666 /* 0x66666667@ha */ -/* 80367510 38 E0 00 00 */ li r7, 0 -/* 80367514 38 A3 66 67 */ addi r5, r3, 0x6667 /* 0x66666667@l */ -/* 80367518 48 00 00 38 */ b lbl_80367550 -lbl_8036751C: -/* 8036751C 7C 05 30 96 */ mulhw r0, r5, r6 -/* 80367520 38 E7 00 01 */ addi r7, r7, 1 -/* 80367524 7C 03 16 70 */ srawi r3, r0, 2 -/* 80367528 54 64 0F FE */ srwi r4, r3, 0x1f -/* 8036752C 7C 00 16 70 */ srawi r0, r0, 2 -/* 80367530 7C 63 22 14 */ add r3, r3, r4 -/* 80367534 1C 83 00 0A */ mulli r4, r3, 0xa -/* 80367538 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8036753C 7C 84 30 50 */ subf r4, r4, r6 -/* 80367540 7C C0 1A 14 */ add r6, r0, r3 -/* 80367544 38 04 00 30 */ addi r0, r4, 0x30 -/* 80367548 98 1E FF FF */ stb r0, -1(r30) -/* 8036754C 3B DE FF FF */ addi r30, r30, -1 -lbl_80367550: -/* 80367550 2C 06 00 00 */ cmpwi r6, 0 -/* 80367554 40 82 FF C8 */ bne lbl_8036751C -/* 80367558 2C 07 00 02 */ cmpwi r7, 2 -/* 8036755C 41 80 FF C0 */ blt lbl_8036751C -/* 80367560 88 1D 00 05 */ lbz r0, 5(r29) -/* 80367564 99 1E FF FF */ stb r8, -1(r30) -/* 80367568 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 8036756C 9C 1E FF FE */ stbu r0, -2(r30) -/* 80367570 7C 1E E0 50 */ subf r0, r30, r28 -/* 80367574 7C 03 02 14 */ add r0, r3, r0 -/* 80367578 2C 00 01 FD */ cmpwi r0, 0x1fd -/* 8036757C 40 81 00 0C */ ble lbl_80367588 -/* 80367580 38 60 00 00 */ li r3, 0 -/* 80367584 48 00 03 10 */ b lbl_80367894 -lbl_80367588: -/* 80367588 88 81 00 10 */ lbz r4, 0x10(r1) -/* 8036758C 38 03 00 01 */ addi r0, r3, 1 -/* 80367590 7C 04 00 00 */ cmpw r4, r0 -/* 80367594 40 80 00 20 */ bge lbl_803675B4 -/* 80367598 38 63 00 02 */ addi r3, r3, 2 -/* 8036759C 38 00 00 30 */ li r0, 0x30 -/* 803675A0 7C 64 18 50 */ subf r3, r4, r3 -/* 803675A4 48 00 00 08 */ b lbl_803675AC -lbl_803675A8: -/* 803675A8 9C 1E FF FF */ stbu r0, -1(r30) -lbl_803675AC: -/* 803675AC 34 63 FF FF */ addic. r3, r3, -1 -/* 803675B0 40 82 FF F8 */ bne lbl_803675A8 -lbl_803675B4: -/* 803675B4 88 61 00 10 */ lbz r3, 0x10(r1) -/* 803675B8 7C 9F 1A 14 */ add r4, r31, r3 -/* 803675BC 48 00 00 0C */ b lbl_803675C8 -lbl_803675C0: -/* 803675C0 8C 04 FF FF */ lbzu r0, -1(r4) -/* 803675C4 9C 1E FF FF */ stbu r0, -1(r30) -lbl_803675C8: -/* 803675C8 34 63 FF FF */ addic. r3, r3, -1 -/* 803675CC 40 82 FF F4 */ bne lbl_803675C0 -/* 803675D0 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 803675D4 2C 00 00 00 */ cmpwi r0, 0 -/* 803675D8 40 82 00 10 */ bne lbl_803675E8 -/* 803675DC 88 1D 00 03 */ lbz r0, 3(r29) -/* 803675E0 28 00 00 00 */ cmplwi r0, 0 -/* 803675E4 41 82 00 0C */ beq lbl_803675F0 -lbl_803675E8: -/* 803675E8 38 00 00 2E */ li r0, 0x2e -/* 803675EC 9C 1E FF FF */ stbu r0, -1(r30) -lbl_803675F0: -/* 803675F0 88 01 00 11 */ lbz r0, 0x11(r1) -/* 803675F4 9C 1E FF FF */ stbu r0, -1(r30) -/* 803675F8 88 01 00 0C */ lbz r0, 0xc(r1) -/* 803675FC 7C 00 07 75 */ extsb. r0, r0 -/* 80367600 41 82 00 10 */ beq lbl_80367610 -/* 80367604 38 00 00 2D */ li r0, 0x2d -/* 80367608 9C 1E FF FF */ stbu r0, -1(r30) -/* 8036760C 48 00 02 84 */ b lbl_80367890 -lbl_80367610: -/* 80367610 88 1D 00 01 */ lbz r0, 1(r29) -/* 80367614 28 00 00 01 */ cmplwi r0, 1 -/* 80367618 40 82 00 10 */ bne lbl_80367628 -/* 8036761C 38 00 00 2B */ li r0, 0x2b -/* 80367620 9C 1E FF FF */ stbu r0, -1(r30) -/* 80367624 48 00 02 6C */ b lbl_80367890 -lbl_80367628: -/* 80367628 28 00 00 02 */ cmplwi r0, 2 -/* 8036762C 40 82 02 64 */ bne lbl_80367890 -/* 80367630 38 00 00 20 */ li r0, 0x20 -/* 80367634 9C 1E FF FF */ stbu r0, -1(r30) -/* 80367638 48 00 02 58 */ b lbl_80367890 -lbl_8036763C: -/* 8036763C A8 01 00 0E */ lha r0, 0xe(r1) -/* 80367640 88 81 00 10 */ lbz r4, 0x10(r1) -/* 80367644 7C 60 20 50 */ subf r3, r0, r4 -/* 80367648 34 E3 FF FF */ addic. r7, r3, -1 -/* 8036764C 40 80 00 08 */ bge lbl_80367654 -/* 80367650 38 E0 00 00 */ li r7, 0 -lbl_80367654: -/* 80367654 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 80367658 7C 07 00 00 */ cmpw r7, r0 -/* 8036765C 40 81 00 2C */ ble lbl_80367688 -/* 80367660 7C 00 38 50 */ subf r0, r0, r7 -/* 80367664 38 61 00 0C */ addi r3, r1, 0xc -/* 80367668 7C 80 20 50 */ subf r4, r0, r4 -/* 8036766C 48 00 02 4D */ bl round_decimal -/* 80367670 A8 61 00 0E */ lha r3, 0xe(r1) -/* 80367674 88 01 00 10 */ lbz r0, 0x10(r1) -/* 80367678 7C 63 00 50 */ subf r3, r3, r0 -/* 8036767C 34 E3 FF FF */ addic. r7, r3, -1 -/* 80367680 40 80 00 08 */ bge lbl_80367688 -/* 80367684 38 E0 00 00 */ li r7, 0 -lbl_80367688: -/* 80367688 A8 61 00 0E */ lha r3, 0xe(r1) -/* 8036768C 34 C3 00 01 */ addic. r6, r3, 1 -/* 80367690 40 80 00 08 */ bge lbl_80367698 -/* 80367694 38 C0 00 00 */ li r6, 0 -lbl_80367698: -/* 80367698 7C 06 3A 14 */ add r0, r6, r7 -/* 8036769C 2C 00 01 FD */ cmpwi r0, 0x1fd -/* 803676A0 40 81 00 0C */ ble lbl_803676AC -/* 803676A4 38 60 00 00 */ li r3, 0 -/* 803676A8 48 00 01 EC */ b lbl_80367894 -lbl_803676AC: -/* 803676AC 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 803676B0 38 80 00 30 */ li r4, 0x30 -/* 803676B4 88 A1 00 10 */ lbz r5, 0x10(r1) -/* 803676B8 7C 67 00 51 */ subf. r3, r7, r0 -/* 803676BC 7C BF 2A 14 */ add r5, r31, r5 -/* 803676C0 40 81 00 48 */ ble lbl_80367708 -/* 803676C4 54 60 E8 FF */ rlwinm. r0, r3, 0x1d, 3, 0x1f -/* 803676C8 7C 09 03 A6 */ mtctr r0 -/* 803676CC 41 82 00 30 */ beq lbl_803676FC -lbl_803676D0: -/* 803676D0 98 9E FF FF */ stb r4, -1(r30) -/* 803676D4 98 9E FF FE */ stb r4, -2(r30) -/* 803676D8 98 9E FF FD */ stb r4, -3(r30) -/* 803676DC 98 9E FF FC */ stb r4, -4(r30) -/* 803676E0 98 9E FF FB */ stb r4, -5(r30) -/* 803676E4 98 9E FF FA */ stb r4, -6(r30) -/* 803676E8 98 9E FF F9 */ stb r4, -7(r30) -/* 803676EC 9C 9E FF F8 */ stbu r4, -8(r30) -/* 803676F0 42 00 FF E0 */ bdnz lbl_803676D0 -/* 803676F4 70 63 00 07 */ andi. r3, r3, 7 -/* 803676F8 41 82 00 10 */ beq lbl_80367708 -lbl_803676FC: -/* 803676FC 7C 69 03 A6 */ mtctr r3 -lbl_80367700: -/* 80367700 9C 9E FF FF */ stbu r4, -1(r30) -/* 80367704 42 00 FF FC */ bdnz lbl_80367700 -lbl_80367708: -/* 80367708 38 60 00 00 */ li r3, 0 -/* 8036770C 48 00 00 10 */ b lbl_8036771C -lbl_80367710: -/* 80367710 8C 05 FF FF */ lbzu r0, -1(r5) -/* 80367714 38 63 00 01 */ addi r3, r3, 1 -/* 80367718 9C 1E FF FF */ stbu r0, -1(r30) -lbl_8036771C: -/* 8036771C 7C 03 38 00 */ cmpw r3, r7 -/* 80367720 40 80 00 10 */ bge lbl_80367730 -/* 80367724 88 01 00 10 */ lbz r0, 0x10(r1) -/* 80367728 7C 03 00 00 */ cmpw r3, r0 -/* 8036772C 41 80 FF E4 */ blt lbl_80367710 -lbl_80367730: -/* 80367730 7C 03 38 00 */ cmpw r3, r7 -/* 80367734 7C 63 38 50 */ subf r3, r3, r7 -/* 80367738 38 80 00 30 */ li r4, 0x30 -/* 8036773C 40 80 00 48 */ bge lbl_80367784 -/* 80367740 54 60 E8 FF */ rlwinm. r0, r3, 0x1d, 3, 0x1f -/* 80367744 7C 09 03 A6 */ mtctr r0 -/* 80367748 41 82 00 30 */ beq lbl_80367778 -lbl_8036774C: -/* 8036774C 98 9E FF FF */ stb r4, -1(r30) -/* 80367750 98 9E FF FE */ stb r4, -2(r30) -/* 80367754 98 9E FF FD */ stb r4, -3(r30) -/* 80367758 98 9E FF FC */ stb r4, -4(r30) -/* 8036775C 98 9E FF FB */ stb r4, -5(r30) -/* 80367760 98 9E FF FA */ stb r4, -6(r30) -/* 80367764 98 9E FF F9 */ stb r4, -7(r30) -/* 80367768 9C 9E FF F8 */ stbu r4, -8(r30) -/* 8036776C 42 00 FF E0 */ bdnz lbl_8036774C -/* 80367770 70 63 00 07 */ andi. r3, r3, 7 -/* 80367774 41 82 00 10 */ beq lbl_80367784 -lbl_80367778: -/* 80367778 7C 69 03 A6 */ mtctr r3 -lbl_8036777C: -/* 8036777C 9C 9E FF FF */ stbu r4, -1(r30) -/* 80367780 42 00 FF FC */ bdnz lbl_8036777C -lbl_80367784: -/* 80367784 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 80367788 2C 00 00 00 */ cmpwi r0, 0 -/* 8036778C 40 82 00 10 */ bne lbl_8036779C -/* 80367790 88 1D 00 03 */ lbz r0, 3(r29) -/* 80367794 28 00 00 00 */ cmplwi r0, 0 -/* 80367798 41 82 00 0C */ beq lbl_803677A4 -lbl_8036779C: -/* 8036779C 38 00 00 2E */ li r0, 0x2e -/* 803677A0 9C 1E FF FF */ stbu r0, -1(r30) -lbl_803677A4: -/* 803677A4 2C 06 00 00 */ cmpwi r6, 0 -/* 803677A8 41 82 00 A0 */ beq lbl_80367848 -/* 803677AC 38 80 00 00 */ li r4, 0 -/* 803677B0 38 60 00 30 */ li r3, 0x30 -/* 803677B4 48 00 00 0C */ b lbl_803677C0 -lbl_803677B8: -/* 803677B8 9C 7E FF FF */ stbu r3, -1(r30) -/* 803677BC 38 84 00 01 */ addi r4, r4, 1 -lbl_803677C0: -/* 803677C0 88 01 00 10 */ lbz r0, 0x10(r1) -/* 803677C4 7C 00 30 50 */ subf r0, r0, r6 -/* 803677C8 7C 04 00 00 */ cmpw r4, r0 -/* 803677CC 41 80 FF EC */ blt lbl_803677B8 -/* 803677D0 7C 04 30 00 */ cmpw r4, r6 -/* 803677D4 7C 64 30 50 */ subf r3, r4, r6 -/* 803677D8 40 80 00 78 */ bge lbl_80367850 -/* 803677DC 54 60 E8 FF */ rlwinm. r0, r3, 0x1d, 3, 0x1f -/* 803677E0 7C 09 03 A6 */ mtctr r0 -/* 803677E4 41 82 00 50 */ beq lbl_80367834 -lbl_803677E8: -/* 803677E8 88 05 FF FF */ lbz r0, -1(r5) -/* 803677EC 98 1E FF FF */ stb r0, -1(r30) -/* 803677F0 88 05 FF FE */ lbz r0, -2(r5) -/* 803677F4 98 1E FF FE */ stb r0, -2(r30) -/* 803677F8 88 05 FF FD */ lbz r0, -3(r5) -/* 803677FC 98 1E FF FD */ stb r0, -3(r30) -/* 80367800 88 05 FF FC */ lbz r0, -4(r5) -/* 80367804 98 1E FF FC */ stb r0, -4(r30) -/* 80367808 88 05 FF FB */ lbz r0, -5(r5) -/* 8036780C 98 1E FF FB */ stb r0, -5(r30) -/* 80367810 88 05 FF FA */ lbz r0, -6(r5) -/* 80367814 98 1E FF FA */ stb r0, -6(r30) -/* 80367818 88 05 FF F9 */ lbz r0, -7(r5) -/* 8036781C 98 1E FF F9 */ stb r0, -7(r30) -/* 80367820 8C 05 FF F8 */ lbzu r0, -8(r5) -/* 80367824 9C 1E FF F8 */ stbu r0, -8(r30) -/* 80367828 42 00 FF C0 */ bdnz lbl_803677E8 -/* 8036782C 70 63 00 07 */ andi. r3, r3, 7 -/* 80367830 41 82 00 20 */ beq lbl_80367850 -lbl_80367834: -/* 80367834 7C 69 03 A6 */ mtctr r3 -lbl_80367838: -/* 80367838 8C 05 FF FF */ lbzu r0, -1(r5) -/* 8036783C 9C 1E FF FF */ stbu r0, -1(r30) -/* 80367840 42 00 FF F8 */ bdnz lbl_80367838 -/* 80367844 48 00 00 0C */ b lbl_80367850 -lbl_80367848: -/* 80367848 38 00 00 30 */ li r0, 0x30 -/* 8036784C 9C 1E FF FF */ stbu r0, -1(r30) -lbl_80367850: -/* 80367850 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80367854 7C 00 07 75 */ extsb. r0, r0 -/* 80367858 41 82 00 10 */ beq lbl_80367868 -/* 8036785C 38 00 00 2D */ li r0, 0x2d -/* 80367860 9C 1E FF FF */ stbu r0, -1(r30) -/* 80367864 48 00 00 2C */ b lbl_80367890 -lbl_80367868: -/* 80367868 88 1D 00 01 */ lbz r0, 1(r29) -/* 8036786C 28 00 00 01 */ cmplwi r0, 1 -/* 80367870 40 82 00 10 */ bne lbl_80367880 -/* 80367874 38 00 00 2B */ li r0, 0x2b -/* 80367878 9C 1E FF FF */ stbu r0, -1(r30) -/* 8036787C 48 00 00 14 */ b lbl_80367890 -lbl_80367880: -/* 80367880 28 00 00 02 */ cmplwi r0, 2 -/* 80367884 40 82 00 0C */ bne lbl_80367890 -/* 80367888 38 00 00 20 */ li r0, 0x20 -/* 8036788C 9C 1E FF FF */ stbu r0, -1(r30) -lbl_80367890: -/* 80367890 7F C3 F3 78 */ mr r3, r30 -lbl_80367894: -/* 80367894 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80367898 CB E1 00 48 */ lfd f31, 0x48(r1) -/* 8036789C 83 E1 00 44 */ lwz r31, 0x44(r1) -/* 803678A0 83 C1 00 40 */ lwz r30, 0x40(r1) -/* 803678A4 83 A1 00 3C */ lwz r29, 0x3c(r1) -/* 803678A8 83 81 00 38 */ lwz r28, 0x38(r1) -/* 803678AC 7C 08 03 A6 */ mtlr r0 -/* 803678B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 803678B4 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/fprintf.s b/asm/MSL_C/MSL_Common/Src/printf/fprintf.s deleted file mode 100644 index a8b686e26f..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/fprintf.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8036679C: -/* 8036679C 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 803667A0 7C 08 02 A6 */ mflr r0 -/* 803667A4 90 01 00 84 */ stw r0, 0x84(r1) -/* 803667A8 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 803667AC 7C 9F 23 78 */ mr r31, r4 -/* 803667B0 93 C1 00 78 */ stw r30, 0x78(r1) -/* 803667B4 7C 7E 1B 78 */ mr r30, r3 -/* 803667B8 40 86 00 24 */ bne cr1, lbl_803667DC -/* 803667BC D8 21 00 28 */ stfd f1, 0x28(r1) -/* 803667C0 D8 41 00 30 */ stfd f2, 0x30(r1) -/* 803667C4 D8 61 00 38 */ stfd f3, 0x38(r1) -/* 803667C8 D8 81 00 40 */ stfd f4, 0x40(r1) -/* 803667CC D8 A1 00 48 */ stfd f5, 0x48(r1) -/* 803667D0 D8 C1 00 50 */ stfd f6, 0x50(r1) -/* 803667D4 D8 E1 00 58 */ stfd f7, 0x58(r1) -/* 803667D8 D9 01 00 60 */ stfd f8, 0x60(r1) -lbl_803667DC: -/* 803667DC 90 61 00 08 */ stw r3, 8(r1) -/* 803667E0 7F C3 F3 78 */ mr r3, r30 -/* 803667E4 90 81 00 0C */ stw r4, 0xc(r1) -/* 803667E8 38 80 FF FF */ li r4, -1 -/* 803667EC 90 A1 00 10 */ stw r5, 0x10(r1) -/* 803667F0 90 C1 00 14 */ stw r6, 0x14(r1) -/* 803667F4 90 E1 00 18 */ stw r7, 0x18(r1) -/* 803667F8 91 01 00 1C */ stw r8, 0x1c(r1) -/* 803667FC 91 21 00 20 */ stw r9, 0x20(r1) -/* 80366800 91 41 00 24 */ stw r10, 0x24(r1) -/* 80366804 48 00 29 11 */ bl fwide -/* 80366808 2C 03 00 00 */ cmpwi r3, 0 -/* 8036680C 41 80 00 0C */ blt lbl_80366818 -/* 80366810 38 60 FF FF */ li r3, -1 -/* 80366814 48 00 00 50 */ b lbl_80366864 -lbl_80366818: -/* 80366818 38 60 00 02 */ li r3, 2 -/* 8036681C 4B FF EC 4D */ bl __begin_critical_region -/* 80366820 38 A1 00 88 */ addi r5, r1, 0x88 -/* 80366824 38 01 00 08 */ addi r0, r1, 8 -/* 80366828 3C 80 02 00 */ lis r4, 0x200 -/* 8036682C 3C 60 80 36 */ lis r3, __FileWrite@ha /* 0x803669D0@ha */ -/* 80366830 90 81 00 68 */ stw r4, 0x68(r1) -/* 80366834 38 C1 00 68 */ addi r6, r1, 0x68 -/* 80366838 38 63 69 D0 */ addi r3, r3, __FileWrite@l /* 0x803669D0@l */ -/* 8036683C 7F C4 F3 78 */ mr r4, r30 -/* 80366840 90 A1 00 6C */ stw r5, 0x6c(r1) -/* 80366844 7F E5 FB 78 */ mr r5, r31 -/* 80366848 90 01 00 70 */ stw r0, 0x70(r1) -/* 8036684C 48 00 01 DD */ bl __pformatter -/* 80366850 7C 60 1B 78 */ mr r0, r3 -/* 80366854 38 60 00 02 */ li r3, 2 -/* 80366858 7C 1F 03 78 */ mr r31, r0 -/* 8036685C 4B FF EC 09 */ bl __end_critical_region -/* 80366860 7F E3 FB 78 */ mr r3, r31 -lbl_80366864: -/* 80366864 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80366868 83 E1 00 7C */ lwz r31, 0x7c(r1) -/* 8036686C 83 C1 00 78 */ lwz r30, 0x78(r1) -/* 80366870 7C 08 03 A6 */ mtlr r0 -/* 80366874 38 21 00 80 */ addi r1, r1, 0x80 -/* 80366878 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/long2str.s b/asm/MSL_C/MSL_Common/Src/printf/long2str.s deleted file mode 100644 index 5fb5f0ff6f..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/long2str.s +++ /dev/null @@ -1,171 +0,0 @@ -lbl_80368030: -/* 80368030 38 C0 00 00 */ li r6, 0 -/* 80368034 2C 03 00 00 */ cmpwi r3, 0 -/* 80368038 98 C4 FF FF */ stb r6, -1(r4) -/* 8036803C 38 C4 FF FF */ addi r6, r4, -1 -/* 80368040 39 00 00 00 */ li r8, 0 -/* 80368044 38 E0 00 00 */ li r7, 0 -/* 80368048 40 82 00 30 */ bne lbl_80368078 -/* 8036804C 81 25 00 0C */ lwz r9, 0xc(r5) -/* 80368050 2C 09 00 00 */ cmpwi r9, 0 -/* 80368054 40 82 00 24 */ bne lbl_80368078 -/* 80368058 89 25 00 03 */ lbz r9, 3(r5) -/* 8036805C 28 09 00 00 */ cmplwi r9, 0 -/* 80368060 41 82 00 10 */ beq lbl_80368070 -/* 80368064 89 25 00 05 */ lbz r9, 5(r5) -/* 80368068 28 09 00 6F */ cmplwi r9, 0x6f -/* 8036806C 41 82 00 0C */ beq lbl_80368078 -lbl_80368070: -/* 80368070 7C C3 33 78 */ mr r3, r6 -/* 80368074 4E 80 00 20 */ blr -lbl_80368078: -/* 80368078 89 25 00 05 */ lbz r9, 5(r5) -/* 8036807C 39 49 FF A8 */ addi r10, r9, -88 -/* 80368080 28 0A 00 20 */ cmplwi r10, 0x20 -/* 80368084 41 81 00 60 */ bgt lbl_803680E4 -/* 80368088 3D 20 80 3D */ lis r9, lit_1307@ha /* 0x803D2F9C@ha */ -/* 8036808C 55 4A 10 3A */ slwi r10, r10, 2 -/* 80368090 39 29 2F 9C */ addi r9, r9, lit_1307@l /* 0x803D2F9C@l */ -/* 80368094 7D 29 50 2E */ lwzx r9, r9, r10 -/* 80368098 7D 29 03 A6 */ mtctr r9 -/* 8036809C 4E 80 04 20 */ bctr -/* 803680A0 2C 03 00 00 */ cmpwi r3, 0 -/* 803680A4 38 00 00 0A */ li r0, 0xa -/* 803680A8 40 80 00 3C */ bge lbl_803680E4 -/* 803680AC 7C 63 00 D0 */ neg r3, r3 -/* 803680B0 39 00 00 01 */ li r8, 1 -/* 803680B4 48 00 00 30 */ b lbl_803680E4 -/* 803680B8 39 20 00 00 */ li r9, 0 -/* 803680BC 38 00 00 08 */ li r0, 8 -/* 803680C0 99 25 00 01 */ stb r9, 1(r5) -/* 803680C4 48 00 00 20 */ b lbl_803680E4 -/* 803680C8 39 20 00 00 */ li r9, 0 -/* 803680CC 38 00 00 0A */ li r0, 0xa -/* 803680D0 99 25 00 01 */ stb r9, 1(r5) -/* 803680D4 48 00 00 10 */ b lbl_803680E4 -/* 803680D8 39 20 00 00 */ li r9, 0 -/* 803680DC 38 00 00 10 */ li r0, 0x10 -/* 803680E0 99 25 00 01 */ stb r9, 1(r5) -lbl_803680E4: -/* 803680E4 89 25 00 05 */ lbz r9, 5(r5) -lbl_803680E8: -/* 803680E8 7D 43 03 96 */ divwu r10, r3, r0 -/* 803680EC 7D 4A 01 D6 */ mullw r10, r10, r0 -/* 803680F0 7D 4A 18 50 */ subf r10, r10, r3 -/* 803680F4 7C 63 03 96 */ divwu r3, r3, r0 -/* 803680F8 2C 0A 00 0A */ cmpwi r10, 0xa -/* 803680FC 40 80 00 0C */ bge lbl_80368108 -/* 80368100 39 4A 00 30 */ addi r10, r10, 0x30 -/* 80368104 48 00 00 18 */ b lbl_8036811C -lbl_80368108: -/* 80368108 28 09 00 78 */ cmplwi r9, 0x78 -/* 8036810C 40 82 00 0C */ bne lbl_80368118 -/* 80368110 39 4A 00 57 */ addi r10, r10, 0x57 -/* 80368114 48 00 00 08 */ b lbl_8036811C -lbl_80368118: -/* 80368118 39 4A 00 37 */ addi r10, r10, 0x37 -lbl_8036811C: -/* 8036811C 28 03 00 00 */ cmplwi r3, 0 -/* 80368120 99 46 FF FF */ stb r10, -1(r6) -/* 80368124 38 C6 FF FF */ addi r6, r6, -1 -/* 80368128 38 E7 00 01 */ addi r7, r7, 1 -/* 8036812C 40 82 FF BC */ bne lbl_803680E8 -/* 80368130 28 00 00 08 */ cmplwi r0, 8 -/* 80368134 40 82 00 28 */ bne lbl_8036815C -/* 80368138 88 65 00 03 */ lbz r3, 3(r5) -/* 8036813C 28 03 00 00 */ cmplwi r3, 0 -/* 80368140 41 82 00 1C */ beq lbl_8036815C -/* 80368144 88 66 00 00 */ lbz r3, 0(r6) -/* 80368148 2C 03 00 30 */ cmpwi r3, 0x30 -/* 8036814C 41 82 00 10 */ beq lbl_8036815C -/* 80368150 38 60 00 30 */ li r3, 0x30 -/* 80368154 38 E7 00 01 */ addi r7, r7, 1 -/* 80368158 9C 66 FF FF */ stbu r3, -1(r6) -lbl_8036815C: -/* 8036815C 88 65 00 00 */ lbz r3, 0(r5) -/* 80368160 28 03 00 02 */ cmplwi r3, 2 -/* 80368164 40 82 00 4C */ bne lbl_803681B0 -/* 80368168 80 65 00 08 */ lwz r3, 8(r5) -/* 8036816C 2C 08 00 00 */ cmpwi r8, 0 -/* 80368170 90 65 00 0C */ stw r3, 0xc(r5) -/* 80368174 40 82 00 10 */ bne lbl_80368184 -/* 80368178 88 65 00 01 */ lbz r3, 1(r5) -/* 8036817C 28 03 00 00 */ cmplwi r3, 0 -/* 80368180 41 82 00 10 */ beq lbl_80368190 -lbl_80368184: -/* 80368184 80 65 00 0C */ lwz r3, 0xc(r5) -/* 80368188 38 63 FF FF */ addi r3, r3, -1 -/* 8036818C 90 65 00 0C */ stw r3, 0xc(r5) -lbl_80368190: -/* 80368190 28 00 00 10 */ cmplwi r0, 0x10 -/* 80368194 40 82 00 1C */ bne lbl_803681B0 -/* 80368198 88 65 00 03 */ lbz r3, 3(r5) -/* 8036819C 28 03 00 00 */ cmplwi r3, 0 -/* 803681A0 41 82 00 10 */ beq lbl_803681B0 -/* 803681A4 80 65 00 0C */ lwz r3, 0xc(r5) -/* 803681A8 38 63 FF FE */ addi r3, r3, -2 -/* 803681AC 90 65 00 0C */ stw r3, 0xc(r5) -lbl_803681B0: -/* 803681B0 81 25 00 0C */ lwz r9, 0xc(r5) -/* 803681B4 7C 66 20 50 */ subf r3, r6, r4 -/* 803681B8 7C 69 1A 14 */ add r3, r9, r3 -/* 803681BC 2C 03 01 FD */ cmpwi r3, 0x1fd -/* 803681C0 40 81 00 0C */ ble lbl_803681CC -/* 803681C4 38 60 00 00 */ li r3, 0 -/* 803681C8 4E 80 00 20 */ blr -lbl_803681CC: -/* 803681CC 7C 07 48 00 */ cmpw r7, r9 -/* 803681D0 7C 87 48 50 */ subf r4, r7, r9 -/* 803681D4 38 E0 00 30 */ li r7, 0x30 -/* 803681D8 40 80 00 48 */ bge lbl_80368220 -/* 803681DC 54 83 E8 FF */ rlwinm. r3, r4, 0x1d, 3, 0x1f -/* 803681E0 7C 69 03 A6 */ mtctr r3 -/* 803681E4 41 82 00 30 */ beq lbl_80368214 -lbl_803681E8: -/* 803681E8 98 E6 FF FF */ stb r7, -1(r6) -/* 803681EC 98 E6 FF FE */ stb r7, -2(r6) -/* 803681F0 98 E6 FF FD */ stb r7, -3(r6) -/* 803681F4 98 E6 FF FC */ stb r7, -4(r6) -/* 803681F8 98 E6 FF FB */ stb r7, -5(r6) -/* 803681FC 98 E6 FF FA */ stb r7, -6(r6) -/* 80368200 98 E6 FF F9 */ stb r7, -7(r6) -/* 80368204 9C E6 FF F8 */ stbu r7, -8(r6) -/* 80368208 42 00 FF E0 */ bdnz lbl_803681E8 -/* 8036820C 70 84 00 07 */ andi. r4, r4, 7 -/* 80368210 41 82 00 10 */ beq lbl_80368220 -lbl_80368214: -/* 80368214 7C 89 03 A6 */ mtctr r4 -lbl_80368218: -/* 80368218 9C E6 FF FF */ stbu r7, -1(r6) -/* 8036821C 42 00 FF FC */ bdnz lbl_80368218 -lbl_80368220: -/* 80368220 28 00 00 10 */ cmplwi r0, 0x10 -/* 80368224 40 82 00 20 */ bne lbl_80368244 -/* 80368228 88 05 00 03 */ lbz r0, 3(r5) -/* 8036822C 28 00 00 00 */ cmplwi r0, 0 -/* 80368230 41 82 00 14 */ beq lbl_80368244 -/* 80368234 88 65 00 05 */ lbz r3, 5(r5) -/* 80368238 38 00 00 30 */ li r0, 0x30 -/* 8036823C 98 66 FF FF */ stb r3, -1(r6) -/* 80368240 9C 06 FF FE */ stbu r0, -2(r6) -lbl_80368244: -/* 80368244 2C 08 00 00 */ cmpwi r8, 0 -/* 80368248 41 82 00 10 */ beq lbl_80368258 -/* 8036824C 38 00 00 2D */ li r0, 0x2d -/* 80368250 9C 06 FF FF */ stbu r0, -1(r6) -/* 80368254 48 00 00 2C */ b lbl_80368280 -lbl_80368258: -/* 80368258 88 05 00 01 */ lbz r0, 1(r5) -/* 8036825C 28 00 00 01 */ cmplwi r0, 1 -/* 80368260 40 82 00 10 */ bne lbl_80368270 -/* 80368264 38 00 00 2B */ li r0, 0x2b -/* 80368268 9C 06 FF FF */ stbu r0, -1(r6) -/* 8036826C 48 00 00 14 */ b lbl_80368280 -lbl_80368270: -/* 80368270 28 00 00 02 */ cmplwi r0, 2 -/* 80368274 40 82 00 0C */ bne lbl_80368280 -/* 80368278 38 00 00 20 */ li r0, 0x20 -/* 8036827C 9C 06 FF FF */ stbu r0, -1(r6) -lbl_80368280: -/* 80368280 7C C3 33 78 */ mr r3, r6 -/* 80368284 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/longlong2str.s b/asm/MSL_C/MSL_Common/Src/printf/longlong2str.s deleted file mode 100644 index df63c2786d..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/longlong2str.s +++ /dev/null @@ -1,218 +0,0 @@ -lbl_80367D1C: -/* 80367D1C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80367D20 7C 08 02 A6 */ mflr r0 -/* 80367D24 90 01 00 34 */ stw r0, 0x34(r1) -/* 80367D28 38 00 00 00 */ li r0, 0 -/* 80367D2C BE C1 00 08 */ stmw r22, 8(r1) -/* 80367D30 7C B7 2B 78 */ mr r23, r5 -/* 80367D34 7C 85 02 78 */ xor r5, r4, r0 -/* 80367D38 7C D8 33 78 */ mr r24, r6 -/* 80367D3C 7C 9E 23 78 */ mr r30, r4 -/* 80367D40 7C 7F 1B 78 */ mr r31, r3 -/* 80367D44 3B 77 FF FF */ addi r27, r23, -1 -/* 80367D48 3B 20 00 00 */ li r25, 0 -/* 80367D4C 3B 40 00 00 */ li r26, 0 -/* 80367D50 98 17 FF FF */ stb r0, -1(r23) -/* 80367D54 7C 60 02 78 */ xor r0, r3, r0 -/* 80367D58 7C A0 03 79 */ or. r0, r5, r0 -/* 80367D5C 40 82 00 30 */ bne lbl_80367D8C -/* 80367D60 80 18 00 0C */ lwz r0, 0xc(r24) -/* 80367D64 2C 00 00 00 */ cmpwi r0, 0 -/* 80367D68 40 82 00 24 */ bne lbl_80367D8C -/* 80367D6C 88 18 00 03 */ lbz r0, 3(r24) -/* 80367D70 28 00 00 00 */ cmplwi r0, 0 -/* 80367D74 41 82 00 10 */ beq lbl_80367D84 -/* 80367D78 88 18 00 05 */ lbz r0, 5(r24) -/* 80367D7C 28 00 00 6F */ cmplwi r0, 0x6f -/* 80367D80 41 82 00 0C */ beq lbl_80367D8C -lbl_80367D84: -/* 80367D84 7F 63 DB 78 */ mr r3, r27 -/* 80367D88 48 00 02 94 */ b lbl_8036801C -lbl_80367D8C: -/* 80367D8C 88 B8 00 05 */ lbz r5, 5(r24) -/* 80367D90 38 05 FF A8 */ addi r0, r5, -88 -/* 80367D94 28 00 00 20 */ cmplwi r0, 0x20 -/* 80367D98 41 81 00 8C */ bgt lbl_80367E24 -/* 80367D9C 3C A0 80 3D */ lis r5, lit_1248@ha /* 0x803D2F18@ha */ -/* 80367DA0 54 00 10 3A */ slwi r0, r0, 2 -/* 80367DA4 38 A5 2F 18 */ addi r5, r5, lit_1248@l /* 0x803D2F18@l */ -/* 80367DA8 7C 05 00 2E */ lwzx r0, r5, r0 -/* 80367DAC 7C 09 03 A6 */ mtctr r0 -/* 80367DB0 4E 80 04 20 */ bctr -/* 80367DB4 38 00 00 00 */ li r0, 0 -/* 80367DB8 6C 65 80 00 */ xoris r5, r3, 0x8000 -/* 80367DBC 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 80367DC0 3B 80 00 0A */ li r28, 0xa -/* 80367DC4 7C 00 20 10 */ subfc r0, r0, r4 -/* 80367DC8 3B A0 00 00 */ li r29, 0 -/* 80367DCC 7C 63 29 10 */ subfe r3, r3, r5 -/* 80367DD0 7C 65 29 10 */ subfe r3, r5, r5 -/* 80367DD4 7C 63 00 D1 */ neg. r3, r3 -/* 80367DD8 41 82 00 4C */ beq lbl_80367E24 -/* 80367DDC 23 DE 00 00 */ subfic r30, r30, 0 -/* 80367DE0 3B 20 00 01 */ li r25, 1 -/* 80367DE4 7F FF 01 90 */ subfze r31, r31 -/* 80367DE8 48 00 00 3C */ b lbl_80367E24 -/* 80367DEC 38 00 00 00 */ li r0, 0 -/* 80367DF0 3B 80 00 08 */ li r28, 8 -/* 80367DF4 98 18 00 01 */ stb r0, 1(r24) -/* 80367DF8 3B A0 00 00 */ li r29, 0 -/* 80367DFC 48 00 00 28 */ b lbl_80367E24 -/* 80367E00 38 00 00 00 */ li r0, 0 -/* 80367E04 3B 80 00 0A */ li r28, 0xa -/* 80367E08 98 18 00 01 */ stb r0, 1(r24) -/* 80367E0C 3B A0 00 00 */ li r29, 0 -/* 80367E10 48 00 00 14 */ b lbl_80367E24 -/* 80367E14 38 00 00 00 */ li r0, 0 -/* 80367E18 3B 80 00 10 */ li r28, 0x10 -/* 80367E1C 98 18 00 01 */ stb r0, 1(r24) -/* 80367E20 3B A0 00 00 */ li r29, 0 -lbl_80367E24: -/* 80367E24 7F E3 FB 78 */ mr r3, r31 -/* 80367E28 7F C4 F3 78 */ mr r4, r30 -/* 80367E2C 7F A5 EB 78 */ mr r5, r29 -/* 80367E30 7F 86 E3 78 */ mr r6, r28 -/* 80367E34 4B FF A6 29 */ bl __mod2u -/* 80367E38 7C 96 23 78 */ mr r22, r4 -/* 80367E3C 7F E3 FB 78 */ mr r3, r31 -/* 80367E40 7F C4 F3 78 */ mr r4, r30 -/* 80367E44 7F A5 EB 78 */ mr r5, r29 -/* 80367E48 7F 86 E3 78 */ mr r6, r28 -/* 80367E4C 4B FF A3 ED */ bl __div2u -/* 80367E50 2C 16 00 0A */ cmpwi r22, 0xa -/* 80367E54 7C 9E 23 78 */ mr r30, r4 -/* 80367E58 7C 7F 1B 78 */ mr r31, r3 -/* 80367E5C 40 80 00 0C */ bge lbl_80367E68 -/* 80367E60 38 16 00 30 */ addi r0, r22, 0x30 -/* 80367E64 48 00 00 1C */ b lbl_80367E80 -lbl_80367E68: -/* 80367E68 88 18 00 05 */ lbz r0, 5(r24) -/* 80367E6C 28 00 00 78 */ cmplwi r0, 0x78 -/* 80367E70 40 82 00 0C */ bne lbl_80367E7C -/* 80367E74 38 16 00 57 */ addi r0, r22, 0x57 -/* 80367E78 48 00 00 08 */ b lbl_80367E80 -lbl_80367E7C: -/* 80367E7C 38 16 00 37 */ addi r0, r22, 0x37 -lbl_80367E80: -/* 80367E80 38 80 00 00 */ li r4, 0 -/* 80367E84 9C 1B FF FF */ stbu r0, -1(r27) -/* 80367E88 7F C3 22 78 */ xor r3, r30, r4 -/* 80367E8C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80367E90 7F E0 22 78 */ xor r0, r31, r4 -/* 80367E94 7C 60 03 79 */ or. r0, r3, r0 -/* 80367E98 40 82 FF 8C */ bne lbl_80367E24 -/* 80367E9C 38 60 00 08 */ li r3, 8 -/* 80367EA0 7F A0 22 78 */ xor r0, r29, r4 -/* 80367EA4 7F 83 1A 78 */ xor r3, r28, r3 -/* 80367EA8 7C 60 03 79 */ or. r0, r3, r0 -/* 80367EAC 40 82 00 28 */ bne lbl_80367ED4 -/* 80367EB0 88 18 00 03 */ lbz r0, 3(r24) -/* 80367EB4 28 00 00 00 */ cmplwi r0, 0 -/* 80367EB8 41 82 00 1C */ beq lbl_80367ED4 -/* 80367EBC 88 1B 00 00 */ lbz r0, 0(r27) -/* 80367EC0 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80367EC4 41 82 00 10 */ beq lbl_80367ED4 -/* 80367EC8 38 00 00 30 */ li r0, 0x30 -/* 80367ECC 3B 5A 00 01 */ addi r26, r26, 1 -/* 80367ED0 9C 1B FF FF */ stbu r0, -1(r27) -lbl_80367ED4: -/* 80367ED4 88 18 00 00 */ lbz r0, 0(r24) -/* 80367ED8 28 00 00 02 */ cmplwi r0, 2 -/* 80367EDC 40 82 00 5C */ bne lbl_80367F38 -/* 80367EE0 80 18 00 08 */ lwz r0, 8(r24) -/* 80367EE4 2C 19 00 00 */ cmpwi r25, 0 -/* 80367EE8 90 18 00 0C */ stw r0, 0xc(r24) -/* 80367EEC 40 82 00 10 */ bne lbl_80367EFC -/* 80367EF0 88 18 00 01 */ lbz r0, 1(r24) -/* 80367EF4 28 00 00 00 */ cmplwi r0, 0 -/* 80367EF8 41 82 00 10 */ beq lbl_80367F08 -lbl_80367EFC: -/* 80367EFC 80 78 00 0C */ lwz r3, 0xc(r24) -/* 80367F00 38 03 FF FF */ addi r0, r3, -1 -/* 80367F04 90 18 00 0C */ stw r0, 0xc(r24) -lbl_80367F08: -/* 80367F08 38 60 00 10 */ li r3, 0x10 -/* 80367F0C 38 00 00 00 */ li r0, 0 -/* 80367F10 7F 83 1A 78 */ xor r3, r28, r3 -/* 80367F14 7F A0 02 78 */ xor r0, r29, r0 -/* 80367F18 7C 60 03 79 */ or. r0, r3, r0 -/* 80367F1C 40 82 00 1C */ bne lbl_80367F38 -/* 80367F20 88 18 00 03 */ lbz r0, 3(r24) -/* 80367F24 28 00 00 00 */ cmplwi r0, 0 -/* 80367F28 41 82 00 10 */ beq lbl_80367F38 -/* 80367F2C 80 78 00 0C */ lwz r3, 0xc(r24) -/* 80367F30 38 03 FF FE */ addi r0, r3, -2 -/* 80367F34 90 18 00 0C */ stw r0, 0xc(r24) -lbl_80367F38: -/* 80367F38 80 78 00 0C */ lwz r3, 0xc(r24) -/* 80367F3C 7C 1B B8 50 */ subf r0, r27, r23 -/* 80367F40 7C 03 02 14 */ add r0, r3, r0 -/* 80367F44 2C 00 01 FD */ cmpwi r0, 0x1fd -/* 80367F48 40 81 00 0C */ ble lbl_80367F54 -/* 80367F4C 38 60 00 00 */ li r3, 0 -/* 80367F50 48 00 00 CC */ b lbl_8036801C -lbl_80367F54: -/* 80367F54 7C 1A 18 00 */ cmpw r26, r3 -/* 80367F58 7C 7A 18 50 */ subf r3, r26, r3 -/* 80367F5C 38 80 00 30 */ li r4, 0x30 -/* 80367F60 40 80 00 48 */ bge lbl_80367FA8 -/* 80367F64 54 60 E8 FF */ rlwinm. r0, r3, 0x1d, 3, 0x1f -/* 80367F68 7C 09 03 A6 */ mtctr r0 -/* 80367F6C 41 82 00 30 */ beq lbl_80367F9C -lbl_80367F70: -/* 80367F70 98 9B FF FF */ stb r4, -1(r27) -/* 80367F74 98 9B FF FE */ stb r4, -2(r27) -/* 80367F78 98 9B FF FD */ stb r4, -3(r27) -/* 80367F7C 98 9B FF FC */ stb r4, -4(r27) -/* 80367F80 98 9B FF FB */ stb r4, -5(r27) -/* 80367F84 98 9B FF FA */ stb r4, -6(r27) -/* 80367F88 98 9B FF F9 */ stb r4, -7(r27) -/* 80367F8C 9C 9B FF F8 */ stbu r4, -8(r27) -/* 80367F90 42 00 FF E0 */ bdnz lbl_80367F70 -/* 80367F94 70 63 00 07 */ andi. r3, r3, 7 -/* 80367F98 41 82 00 10 */ beq lbl_80367FA8 -lbl_80367F9C: -/* 80367F9C 7C 69 03 A6 */ mtctr r3 -lbl_80367FA0: -/* 80367FA0 9C 9B FF FF */ stbu r4, -1(r27) -/* 80367FA4 42 00 FF FC */ bdnz lbl_80367FA0 -lbl_80367FA8: -/* 80367FA8 38 60 00 10 */ li r3, 0x10 -/* 80367FAC 38 00 00 00 */ li r0, 0 -/* 80367FB0 7F 83 1A 78 */ xor r3, r28, r3 -/* 80367FB4 7F A0 02 78 */ xor r0, r29, r0 -/* 80367FB8 7C 60 03 79 */ or. r0, r3, r0 -/* 80367FBC 40 82 00 20 */ bne lbl_80367FDC -/* 80367FC0 88 18 00 03 */ lbz r0, 3(r24) -/* 80367FC4 28 00 00 00 */ cmplwi r0, 0 -/* 80367FC8 41 82 00 14 */ beq lbl_80367FDC -/* 80367FCC 88 78 00 05 */ lbz r3, 5(r24) -/* 80367FD0 38 00 00 30 */ li r0, 0x30 -/* 80367FD4 98 7B FF FF */ stb r3, -1(r27) -/* 80367FD8 9C 1B FF FE */ stbu r0, -2(r27) -lbl_80367FDC: -/* 80367FDC 2C 19 00 00 */ cmpwi r25, 0 -/* 80367FE0 41 82 00 10 */ beq lbl_80367FF0 -/* 80367FE4 38 00 00 2D */ li r0, 0x2d -/* 80367FE8 9C 1B FF FF */ stbu r0, -1(r27) -/* 80367FEC 48 00 00 2C */ b lbl_80368018 -lbl_80367FF0: -/* 80367FF0 88 18 00 01 */ lbz r0, 1(r24) -/* 80367FF4 28 00 00 01 */ cmplwi r0, 1 -/* 80367FF8 40 82 00 10 */ bne lbl_80368008 -/* 80367FFC 38 00 00 2B */ li r0, 0x2b -/* 80368000 9C 1B FF FF */ stbu r0, -1(r27) -/* 80368004 48 00 00 14 */ b lbl_80368018 -lbl_80368008: -/* 80368008 28 00 00 02 */ cmplwi r0, 2 -/* 8036800C 40 82 00 0C */ bne lbl_80368018 -/* 80368010 38 00 00 20 */ li r0, 0x20 -/* 80368014 9C 1B FF FF */ stbu r0, -1(r27) -lbl_80368018: -/* 80368018 7F 63 DB 78 */ mr r3, r27 -lbl_8036801C: -/* 8036801C BA C1 00 08 */ lmw r22, 8(r1) -/* 80368020 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80368024 7C 08 03 A6 */ mtlr r0 -/* 80368028 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036802C 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/parse_format.s b/asm/MSL_C/MSL_Common/Src/printf/parse_format.s deleted file mode 100644 index b3cf6039d2..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/parse_format.s +++ /dev/null @@ -1,359 +0,0 @@ -lbl_80368288: -/* 80368288 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8036828C 7C 08 02 A6 */ mflr r0 -/* 80368290 38 E0 00 00 */ li r7, 0 -/* 80368294 88 C3 00 01 */ lbz r6, 1(r3) -/* 80368298 90 01 00 34 */ stw r0, 0x34(r1) -/* 8036829C 38 00 00 01 */ li r0, 1 -/* 803682A0 7C C6 07 74 */ extsb r6, r6 -/* 803682A4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 803682A8 2C 06 00 25 */ cmpwi r6, 0x25 -/* 803682AC 3B E3 00 01 */ addi r31, r3, 1 -/* 803682B0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 803682B4 7C BE 2B 78 */ mr r30, r5 -/* 803682B8 93 A1 00 24 */ stw r29, 0x24(r1) -/* 803682BC 7C 9D 23 78 */ mr r29, r4 -/* 803682C0 98 E1 00 09 */ stb r7, 9(r1) -/* 803682C4 98 01 00 08 */ stb r0, 8(r1) -/* 803682C8 98 E1 00 0A */ stb r7, 0xa(r1) -/* 803682CC 98 E1 00 0B */ stb r7, 0xb(r1) -/* 803682D0 98 E1 00 0C */ stb r7, 0xc(r1) -/* 803682D4 90 E1 00 10 */ stw r7, 0x10(r1) -/* 803682D8 90 E1 00 14 */ stw r7, 0x14(r1) -/* 803682DC 40 82 00 28 */ bne lbl_80368304 -/* 803682E0 98 C1 00 0D */ stb r6, 0xd(r1) -/* 803682E4 38 7F 00 01 */ addi r3, r31, 1 -/* 803682E8 80 81 00 08 */ lwz r4, 8(r1) -/* 803682EC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 803682F0 90 9E 00 00 */ stw r4, 0(r30) -/* 803682F4 90 1E 00 04 */ stw r0, 4(r30) -/* 803682F8 90 FE 00 08 */ stw r7, 8(r30) -/* 803682FC 90 FE 00 0C */ stw r7, 0xc(r30) -/* 80368300 48 00 04 70 */ b lbl_80368770 -lbl_80368304: -/* 80368304 38 06 FF E0 */ addi r0, r6, -32 -/* 80368308 38 80 00 01 */ li r4, 1 -/* 8036830C 28 00 00 10 */ cmplwi r0, 0x10 -/* 80368310 41 81 00 70 */ bgt lbl_80368380 -/* 80368314 3C 60 80 3D */ lis r3, lit_1442@ha /* 0x803D3100@ha */ -/* 80368318 54 00 10 3A */ slwi r0, r0, 2 -/* 8036831C 38 63 31 00 */ addi r3, r3, lit_1442@l /* 0x803D3100@l */ -/* 80368320 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80368324 7C 09 03 A6 */ mtctr r0 -/* 80368328 4E 80 04 20 */ bctr -/* 8036832C 38 00 00 00 */ li r0, 0 -/* 80368330 98 01 00 08 */ stb r0, 8(r1) -/* 80368334 48 00 00 50 */ b lbl_80368384 -/* 80368338 38 00 00 01 */ li r0, 1 -/* 8036833C 98 01 00 09 */ stb r0, 9(r1) -/* 80368340 48 00 00 44 */ b lbl_80368384 -/* 80368344 88 01 00 09 */ lbz r0, 9(r1) -/* 80368348 28 00 00 01 */ cmplwi r0, 1 -/* 8036834C 41 82 00 38 */ beq lbl_80368384 -/* 80368350 38 00 00 02 */ li r0, 2 -/* 80368354 98 01 00 09 */ stb r0, 9(r1) -/* 80368358 48 00 00 2C */ b lbl_80368384 -/* 8036835C 38 00 00 01 */ li r0, 1 -/* 80368360 98 01 00 0B */ stb r0, 0xb(r1) -/* 80368364 48 00 00 20 */ b lbl_80368384 -/* 80368368 88 01 00 08 */ lbz r0, 8(r1) -/* 8036836C 28 00 00 00 */ cmplwi r0, 0 -/* 80368370 41 82 00 14 */ beq lbl_80368384 -/* 80368374 38 00 00 02 */ li r0, 2 -/* 80368378 98 01 00 08 */ stb r0, 8(r1) -/* 8036837C 48 00 00 08 */ b lbl_80368384 -lbl_80368380: -/* 80368380 38 80 00 00 */ li r4, 0 -lbl_80368384: -/* 80368384 2C 04 00 00 */ cmpwi r4, 0 -/* 80368388 41 82 00 10 */ beq lbl_80368398 -/* 8036838C 8C DF 00 01 */ lbzu r6, 1(r31) -/* 80368390 7C C6 07 74 */ extsb r6, r6 -/* 80368394 4B FF FF 70 */ b lbl_80368304 -lbl_80368398: -/* 80368398 2C 06 00 2A */ cmpwi r6, 0x2a -/* 8036839C 40 82 00 3C */ bne lbl_803683D8 -/* 803683A0 7F A3 EB 78 */ mr r3, r29 -/* 803683A4 38 80 00 01 */ li r4, 1 -/* 803683A8 4B FF 97 6D */ bl __va_arg -/* 803683AC 80 03 00 00 */ lwz r0, 0(r3) -/* 803683B0 2C 00 00 00 */ cmpwi r0, 0 -/* 803683B4 90 01 00 10 */ stw r0, 0x10(r1) -/* 803683B8 40 80 00 14 */ bge lbl_803683CC -/* 803683BC 7C 00 00 D0 */ neg r0, r0 -/* 803683C0 38 60 00 00 */ li r3, 0 -/* 803683C4 98 61 00 08 */ stb r3, 8(r1) -/* 803683C8 90 01 00 10 */ stw r0, 0x10(r1) -lbl_803683CC: -/* 803683CC 8C DF 00 01 */ lbzu r6, 1(r31) -/* 803683D0 7C C6 07 74 */ extsb r6, r6 -/* 803683D4 48 00 00 3C */ b lbl_80368410 -lbl_803683D8: -/* 803683D8 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 803683DC 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 803683E0 48 00 00 20 */ b lbl_80368400 -lbl_803683E4: -/* 803683E4 80 01 00 10 */ lwz r0, 0x10(r1) -/* 803683E8 1C 00 00 0A */ mulli r0, r0, 0xa -/* 803683EC 7C 86 02 14 */ add r4, r6, r0 -/* 803683F0 8C DF 00 01 */ lbzu r6, 1(r31) -/* 803683F4 38 04 FF D0 */ addi r0, r4, -48 -/* 803683F8 90 01 00 10 */ stw r0, 0x10(r1) -/* 803683FC 7C C6 07 74 */ extsb r6, r6 -lbl_80368400: -/* 80368400 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 80368404 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80368408 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8036840C 40 82 FF D8 */ bne lbl_803683E4 -lbl_80368410: -/* 80368410 80 A1 00 10 */ lwz r5, 0x10(r1) -/* 80368414 2C 05 01 FD */ cmpwi r5, 0x1fd -/* 80368418 40 81 00 30 */ ble lbl_80368448 -/* 8036841C 38 00 00 FF */ li r0, 0xff -/* 80368420 80 81 00 08 */ lwz r4, 8(r1) -/* 80368424 98 01 00 0D */ stb r0, 0xd(r1) -/* 80368428 38 7F 00 01 */ addi r3, r31, 1 -/* 8036842C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80368430 90 9E 00 00 */ stw r4, 0(r30) -/* 80368434 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80368438 90 9E 00 04 */ stw r4, 4(r30) -/* 8036843C 90 BE 00 08 */ stw r5, 8(r30) -/* 80368440 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80368444 48 00 03 2C */ b lbl_80368770 -lbl_80368448: -/* 80368448 2C 06 00 2E */ cmpwi r6, 0x2e -/* 8036844C 40 82 00 84 */ bne lbl_803684D0 -/* 80368450 8C DF 00 01 */ lbzu r6, 1(r31) -/* 80368454 38 00 00 01 */ li r0, 1 -/* 80368458 98 01 00 0A */ stb r0, 0xa(r1) -/* 8036845C 7C C6 07 74 */ extsb r6, r6 -/* 80368460 2C 06 00 2A */ cmpwi r6, 0x2a -/* 80368464 40 82 00 34 */ bne lbl_80368498 -/* 80368468 7F A3 EB 78 */ mr r3, r29 -/* 8036846C 38 80 00 01 */ li r4, 1 -/* 80368470 4B FF 96 A5 */ bl __va_arg -/* 80368474 80 03 00 00 */ lwz r0, 0(r3) -/* 80368478 2C 00 00 00 */ cmpwi r0, 0 -/* 8036847C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80368480 40 80 00 0C */ bge lbl_8036848C -/* 80368484 38 00 00 00 */ li r0, 0 -/* 80368488 98 01 00 0A */ stb r0, 0xa(r1) -lbl_8036848C: -/* 8036848C 8C DF 00 01 */ lbzu r6, 1(r31) -/* 80368490 7C C6 07 74 */ extsb r6, r6 -/* 80368494 48 00 00 3C */ b lbl_803684D0 -lbl_80368498: -/* 80368498 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 8036849C 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 803684A0 48 00 00 20 */ b lbl_803684C0 -lbl_803684A4: -/* 803684A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803684A8 1C 00 00 0A */ mulli r0, r0, 0xa -/* 803684AC 7C 86 02 14 */ add r4, r6, r0 -/* 803684B0 8C DF 00 01 */ lbzu r6, 1(r31) -/* 803684B4 38 04 FF D0 */ addi r0, r4, -48 -/* 803684B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803684BC 7C C6 07 74 */ extsb r6, r6 -lbl_803684C0: -/* 803684C0 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 803684C4 7C 03 00 AE */ lbzx r0, r3, r0 -/* 803684C8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 803684CC 40 82 FF D8 */ bne lbl_803684A4 -lbl_803684D0: -/* 803684D0 2C 06 00 68 */ cmpwi r6, 0x68 -/* 803684D4 38 80 00 01 */ li r4, 1 -/* 803684D8 41 82 00 20 */ beq lbl_803684F8 -/* 803684DC 40 80 00 10 */ bge lbl_803684EC -/* 803684E0 2C 06 00 4C */ cmpwi r6, 0x4c -/* 803684E4 41 82 00 68 */ beq lbl_8036854C -/* 803684E8 48 00 00 70 */ b lbl_80368558 -lbl_803684EC: -/* 803684EC 2C 06 00 6C */ cmpwi r6, 0x6c -/* 803684F0 41 82 00 30 */ beq lbl_80368520 -/* 803684F4 48 00 00 64 */ b lbl_80368558 -lbl_803684F8: -/* 803684F8 88 1F 00 01 */ lbz r0, 1(r31) -/* 803684FC 38 60 00 02 */ li r3, 2 -/* 80368500 98 61 00 0C */ stb r3, 0xc(r1) -/* 80368504 7C 00 07 74 */ extsb r0, r0 -/* 80368508 2C 00 00 68 */ cmpwi r0, 0x68 -/* 8036850C 40 82 00 50 */ bne lbl_8036855C -/* 80368510 98 81 00 0C */ stb r4, 0xc(r1) -/* 80368514 7C 06 03 78 */ mr r6, r0 -/* 80368518 3B FF 00 01 */ addi r31, r31, 1 -/* 8036851C 48 00 00 40 */ b lbl_8036855C -lbl_80368520: -/* 80368520 88 1F 00 01 */ lbz r0, 1(r31) -/* 80368524 38 60 00 03 */ li r3, 3 -/* 80368528 98 61 00 0C */ stb r3, 0xc(r1) -/* 8036852C 7C 03 07 74 */ extsb r3, r0 -/* 80368530 2C 03 00 6C */ cmpwi r3, 0x6c -/* 80368534 40 82 00 28 */ bne lbl_8036855C -/* 80368538 38 00 00 04 */ li r0, 4 -/* 8036853C 7C 66 1B 78 */ mr r6, r3 -/* 80368540 98 01 00 0C */ stb r0, 0xc(r1) -/* 80368544 3B FF 00 01 */ addi r31, r31, 1 -/* 80368548 48 00 00 14 */ b lbl_8036855C -lbl_8036854C: -/* 8036854C 38 00 00 05 */ li r0, 5 -/* 80368550 98 01 00 0C */ stb r0, 0xc(r1) -/* 80368554 48 00 00 08 */ b lbl_8036855C -lbl_80368558: -/* 80368558 38 80 00 00 */ li r4, 0 -lbl_8036855C: -/* 8036855C 2C 04 00 00 */ cmpwi r4, 0 -/* 80368560 41 82 00 0C */ beq lbl_8036856C -/* 80368564 8C DF 00 01 */ lbzu r6, 1(r31) -/* 80368568 7C C6 07 74 */ extsb r6, r6 -lbl_8036856C: -/* 8036856C 38 06 FF BF */ addi r0, r6, -65 -/* 80368570 98 C1 00 0D */ stb r6, 0xd(r1) -/* 80368574 28 00 00 37 */ cmplwi r0, 0x37 -/* 80368578 41 81 01 CC */ bgt lbl_80368744 -/* 8036857C 3C 60 80 3D */ lis r3, lit_1443@ha /* 0x803D3020@ha */ -/* 80368580 54 00 10 3A */ slwi r0, r0, 2 -/* 80368584 38 63 30 20 */ addi r3, r3, lit_1443@l /* 0x803D3020@l */ -/* 80368588 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8036858C 7C 09 03 A6 */ mtctr r0 -/* 80368590 4E 80 04 20 */ bctr -/* 80368594 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80368598 28 00 00 05 */ cmplwi r0, 5 -/* 8036859C 40 82 00 10 */ bne lbl_803685AC -/* 803685A0 38 00 00 FF */ li r0, 0xff -/* 803685A4 98 01 00 0D */ stb r0, 0xd(r1) -/* 803685A8 48 00 01 A4 */ b lbl_8036874C -lbl_803685AC: -/* 803685AC 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803685B0 28 00 00 00 */ cmplwi r0, 0 -/* 803685B4 40 82 00 10 */ bne lbl_803685C4 -/* 803685B8 38 00 00 01 */ li r0, 1 -/* 803685BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803685C0 48 00 01 8C */ b lbl_8036874C -lbl_803685C4: -/* 803685C4 88 01 00 08 */ lbz r0, 8(r1) -/* 803685C8 28 00 00 02 */ cmplwi r0, 2 -/* 803685CC 40 82 01 80 */ bne lbl_8036874C -/* 803685D0 38 00 00 01 */ li r0, 1 -/* 803685D4 98 01 00 08 */ stb r0, 8(r1) -/* 803685D8 48 00 01 74 */ b lbl_8036874C -/* 803685DC 88 01 00 0C */ lbz r0, 0xc(r1) -/* 803685E0 28 00 00 02 */ cmplwi r0, 2 -/* 803685E4 41 82 00 0C */ beq lbl_803685F0 -/* 803685E8 28 00 00 04 */ cmplwi r0, 4 -/* 803685EC 40 82 00 10 */ bne lbl_803685FC -lbl_803685F0: -/* 803685F0 38 00 00 FF */ li r0, 0xff -/* 803685F4 98 01 00 0D */ stb r0, 0xd(r1) -/* 803685F8 48 00 01 54 */ b lbl_8036874C -lbl_803685FC: -/* 803685FC 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80368600 28 00 00 00 */ cmplwi r0, 0 -/* 80368604 40 82 01 48 */ bne lbl_8036874C -/* 80368608 38 00 00 06 */ li r0, 6 -/* 8036860C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80368610 48 00 01 3C */ b lbl_8036874C -/* 80368614 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80368618 28 00 00 00 */ cmplwi r0, 0 -/* 8036861C 40 82 00 0C */ bne lbl_80368628 -/* 80368620 38 00 00 0D */ li r0, 0xd -/* 80368624 90 01 00 14 */ stw r0, 0x14(r1) -lbl_80368628: -/* 80368628 88 01 00 0C */ lbz r0, 0xc(r1) -/* 8036862C 28 00 00 02 */ cmplwi r0, 2 -/* 80368630 41 82 00 14 */ beq lbl_80368644 -/* 80368634 28 00 00 04 */ cmplwi r0, 4 -/* 80368638 41 82 00 0C */ beq lbl_80368644 -/* 8036863C 28 00 00 01 */ cmplwi r0, 1 -/* 80368640 40 82 01 0C */ bne lbl_8036874C -lbl_80368644: -/* 80368644 38 00 00 FF */ li r0, 0xff -/* 80368648 98 01 00 0D */ stb r0, 0xd(r1) -/* 8036864C 48 00 01 00 */ b lbl_8036874C -/* 80368650 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80368654 2C 00 00 00 */ cmpwi r0, 0 -/* 80368658 40 82 00 0C */ bne lbl_80368664 -/* 8036865C 38 00 00 01 */ li r0, 1 -/* 80368660 90 01 00 14 */ stw r0, 0x14(r1) -lbl_80368664: -/* 80368664 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80368668 28 00 00 02 */ cmplwi r0, 2 -/* 8036866C 41 82 00 14 */ beq lbl_80368680 -/* 80368670 28 00 00 04 */ cmplwi r0, 4 -/* 80368674 41 82 00 0C */ beq lbl_80368680 -/* 80368678 28 00 00 01 */ cmplwi r0, 1 -/* 8036867C 40 82 00 10 */ bne lbl_8036868C -lbl_80368680: -/* 80368680 38 00 00 FF */ li r0, 0xff -/* 80368684 98 01 00 0D */ stb r0, 0xd(r1) -/* 80368688 48 00 00 C4 */ b lbl_8036874C -lbl_8036868C: -/* 8036868C 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80368690 28 00 00 00 */ cmplwi r0, 0 -/* 80368694 40 82 00 B8 */ bne lbl_8036874C -/* 80368698 38 00 00 06 */ li r0, 6 -/* 8036869C 90 01 00 14 */ stw r0, 0x14(r1) -/* 803686A0 48 00 00 AC */ b lbl_8036874C -/* 803686A4 38 A0 00 78 */ li r5, 0x78 -/* 803686A8 38 80 00 01 */ li r4, 1 -/* 803686AC 38 60 00 03 */ li r3, 3 -/* 803686B0 38 00 00 08 */ li r0, 8 -/* 803686B4 98 A1 00 0D */ stb r5, 0xd(r1) -/* 803686B8 98 81 00 0B */ stb r4, 0xb(r1) -/* 803686BC 98 61 00 0C */ stb r3, 0xc(r1) -/* 803686C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 803686C4 48 00 00 88 */ b lbl_8036874C -/* 803686C8 88 61 00 0C */ lbz r3, 0xc(r1) -/* 803686CC 28 03 00 03 */ cmplwi r3, 3 -/* 803686D0 40 82 00 10 */ bne lbl_803686E0 -/* 803686D4 38 00 00 06 */ li r0, 6 -/* 803686D8 98 01 00 0C */ stb r0, 0xc(r1) -/* 803686DC 48 00 00 70 */ b lbl_8036874C -lbl_803686E0: -/* 803686E0 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803686E4 28 00 00 00 */ cmplwi r0, 0 -/* 803686E8 40 82 00 0C */ bne lbl_803686F4 -/* 803686EC 28 03 00 00 */ cmplwi r3, 0 -/* 803686F0 41 82 00 5C */ beq lbl_8036874C -lbl_803686F4: -/* 803686F4 38 00 00 FF */ li r0, 0xff -/* 803686F8 98 01 00 0D */ stb r0, 0xd(r1) -/* 803686FC 48 00 00 50 */ b lbl_8036874C -/* 80368700 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80368704 28 00 00 03 */ cmplwi r0, 3 -/* 80368708 40 82 00 10 */ bne lbl_80368718 -/* 8036870C 38 00 00 06 */ li r0, 6 -/* 80368710 98 01 00 0C */ stb r0, 0xc(r1) -/* 80368714 48 00 00 38 */ b lbl_8036874C -lbl_80368718: -/* 80368718 28 00 00 00 */ cmplwi r0, 0 -/* 8036871C 41 82 00 30 */ beq lbl_8036874C -/* 80368720 38 00 00 FF */ li r0, 0xff -/* 80368724 98 01 00 0D */ stb r0, 0xd(r1) -/* 80368728 48 00 00 24 */ b lbl_8036874C -/* 8036872C 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80368730 28 00 00 05 */ cmplwi r0, 5 -/* 80368734 40 82 00 18 */ bne lbl_8036874C -/* 80368738 38 00 00 FF */ li r0, 0xff -/* 8036873C 98 01 00 0D */ stb r0, 0xd(r1) -/* 80368740 48 00 00 0C */ b lbl_8036874C -lbl_80368744: -/* 80368744 38 00 00 FF */ li r0, 0xff -/* 80368748 98 01 00 0D */ stb r0, 0xd(r1) -lbl_8036874C: -/* 8036874C 80 81 00 08 */ lwz r4, 8(r1) -/* 80368750 38 7F 00 01 */ addi r3, r31, 1 -/* 80368754 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80368758 90 9E 00 00 */ stw r4, 0(r30) -/* 8036875C 80 81 00 10 */ lwz r4, 0x10(r1) -/* 80368760 90 1E 00 04 */ stw r0, 4(r30) -/* 80368764 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80368768 90 9E 00 08 */ stw r4, 8(r30) -/* 8036876C 90 1E 00 0C */ stw r0, 0xc(r30) -lbl_80368770: -/* 80368770 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80368774 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80368778 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8036877C 83 A1 00 24 */ lwz r29, 0x24(r1) -/* 80368780 7C 08 03 A6 */ mtlr r0 -/* 80368784 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368788 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/printf.s b/asm/MSL_C/MSL_Common/Src/printf/printf.s deleted file mode 100644 index 82d0fd901e..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/printf.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8036687C: -/* 8036687C 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80366880 7C 08 02 A6 */ mflr r0 -/* 80366884 90 01 00 84 */ stw r0, 0x84(r1) -/* 80366888 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 8036688C 93 C1 00 78 */ stw r30, 0x78(r1) -/* 80366890 7C 7E 1B 78 */ mr r30, r3 -/* 80366894 40 86 00 24 */ bne cr1, lbl_803668B8 -/* 80366898 D8 21 00 28 */ stfd f1, 0x28(r1) -/* 8036689C D8 41 00 30 */ stfd f2, 0x30(r1) -/* 803668A0 D8 61 00 38 */ stfd f3, 0x38(r1) -/* 803668A4 D8 81 00 40 */ stfd f4, 0x40(r1) -/* 803668A8 D8 A1 00 48 */ stfd f5, 0x48(r1) -/* 803668AC D8 C1 00 50 */ stfd f6, 0x50(r1) -/* 803668B0 D8 E1 00 58 */ stfd f7, 0x58(r1) -/* 803668B4 D9 01 00 60 */ stfd f8, 0x60(r1) -lbl_803668B8: -/* 803668B8 3D 60 80 3D */ lis r11, __files@ha /* 0x803D29B0@ha */ -/* 803668BC 90 81 00 0C */ stw r4, 0xc(r1) -/* 803668C0 39 6B 29 B0 */ addi r11, r11, __files@l /* 0x803D29B0@l */ -/* 803668C4 38 80 FF FF */ li r4, -1 -/* 803668C8 90 61 00 08 */ stw r3, 8(r1) -/* 803668CC 3B EB 00 50 */ addi r31, r11, 0x50 -/* 803668D0 7F E3 FB 78 */ mr r3, r31 -/* 803668D4 90 A1 00 10 */ stw r5, 0x10(r1) -/* 803668D8 90 C1 00 14 */ stw r6, 0x14(r1) -/* 803668DC 90 E1 00 18 */ stw r7, 0x18(r1) -/* 803668E0 91 01 00 1C */ stw r8, 0x1c(r1) -/* 803668E4 91 21 00 20 */ stw r9, 0x20(r1) -/* 803668E8 91 41 00 24 */ stw r10, 0x24(r1) -/* 803668EC 48 00 28 29 */ bl fwide -/* 803668F0 2C 03 00 00 */ cmpwi r3, 0 -/* 803668F4 41 80 00 0C */ blt lbl_80366900 -/* 803668F8 38 60 FF FF */ li r3, -1 -/* 803668FC 48 00 00 50 */ b lbl_8036694C -lbl_80366900: -/* 80366900 38 60 00 02 */ li r3, 2 -/* 80366904 4B FF EB 65 */ bl __begin_critical_region -/* 80366908 38 A1 00 88 */ addi r5, r1, 0x88 -/* 8036690C 38 01 00 08 */ addi r0, r1, 8 -/* 80366910 3C 80 01 00 */ lis r4, 0x100 -/* 80366914 3C 60 80 36 */ lis r3, __FileWrite@ha /* 0x803669D0@ha */ -/* 80366918 90 81 00 68 */ stw r4, 0x68(r1) -/* 8036691C 38 C1 00 68 */ addi r6, r1, 0x68 -/* 80366920 38 63 69 D0 */ addi r3, r3, __FileWrite@l /* 0x803669D0@l */ -/* 80366924 7F E4 FB 78 */ mr r4, r31 -/* 80366928 90 A1 00 6C */ stw r5, 0x6c(r1) -/* 8036692C 7F C5 F3 78 */ mr r5, r30 -/* 80366930 90 01 00 70 */ stw r0, 0x70(r1) -/* 80366934 48 00 00 F5 */ bl __pformatter -/* 80366938 7C 60 1B 78 */ mr r0, r3 -/* 8036693C 38 60 00 02 */ li r3, 2 -/* 80366940 7C 1F 03 78 */ mr r31, r0 -/* 80366944 4B FF EB 21 */ bl __end_critical_region -/* 80366948 7F E3 FB 78 */ mr r3, r31 -lbl_8036694C: -/* 8036694C 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80366950 83 E1 00 7C */ lwz r31, 0x7c(r1) -/* 80366954 83 C1 00 78 */ lwz r30, 0x78(r1) -/* 80366958 7C 08 03 A6 */ mtlr r0 -/* 8036695C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80366960 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/round_decimal.s b/asm/MSL_C/MSL_Common/Src/printf/round_decimal.s deleted file mode 100644 index 5955e64b8a..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/round_decimal.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_803678B8: -/* 803678B8 2C 04 00 00 */ cmpwi r4, 0 -/* 803678BC 40 80 00 20 */ bge lbl_803678DC -lbl_803678C0: -/* 803678C0 38 00 00 00 */ li r0, 0 -/* 803678C4 38 80 00 01 */ li r4, 1 -/* 803678C8 B0 03 00 02 */ sth r0, 2(r3) -/* 803678CC 38 00 00 30 */ li r0, 0x30 -/* 803678D0 98 83 00 04 */ stb r4, 4(r3) -/* 803678D4 98 03 00 05 */ stb r0, 5(r3) -/* 803678D8 4E 80 00 20 */ blr -lbl_803678DC: -/* 803678DC 88 E3 00 04 */ lbz r7, 4(r3) -/* 803678E0 7C 04 38 00 */ cmpw r4, r7 -/* 803678E4 4C 80 00 20 */ bgelr -/* 803678E8 7C C3 22 14 */ add r6, r3, r4 -/* 803678EC 88 A6 00 05 */ lbz r5, 5(r6) -/* 803678F0 39 06 00 05 */ addi r8, r6, 5 -/* 803678F4 38 05 FF D0 */ addi r0, r5, -48 -/* 803678F8 7C 06 07 74 */ extsb r6, r0 -/* 803678FC 2C 06 00 05 */ cmpwi r6, 5 -/* 80367900 40 82 00 40 */ bne lbl_80367940 -/* 80367904 7C A3 3A 14 */ add r5, r3, r7 -/* 80367908 38 A5 00 05 */ addi r5, r5, 5 -lbl_8036790C: -/* 8036790C 38 A5 FF FF */ addi r5, r5, -1 -/* 80367910 7C 05 40 40 */ cmplw r5, r8 -/* 80367914 40 81 00 10 */ ble lbl_80367924 -/* 80367918 88 05 00 00 */ lbz r0, 0(r5) -/* 8036791C 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80367920 41 82 FF EC */ beq lbl_8036790C -lbl_80367924: -/* 80367924 7C 05 40 40 */ cmplw r5, r8 -/* 80367928 40 82 00 10 */ bne lbl_80367938 -/* 8036792C 88 08 FF FF */ lbz r0, -1(r8) -/* 80367930 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 80367934 48 00 00 6C */ b lbl_803679A0 -lbl_80367938: -/* 80367938 38 A0 00 01 */ li r5, 1 -/* 8036793C 48 00 00 64 */ b lbl_803679A0 -lbl_80367940: -/* 80367940 38 00 00 05 */ li r0, 5 -/* 80367944 7C C0 02 78 */ xor r0, r6, r0 -/* 80367948 7C 05 0E 70 */ srawi r5, r0, 1 -/* 8036794C 7C 00 30 38 */ and r0, r0, r6 -/* 80367950 7C 00 28 50 */ subf r0, r0, r5 -/* 80367954 54 05 0F FE */ srwi r5, r0, 0x1f -/* 80367958 48 00 00 48 */ b lbl_803679A0 -lbl_8036795C: -/* 8036795C 8C 08 FF FF */ lbzu r0, -1(r8) -/* 80367960 7C A0 2A 14 */ add r5, r0, r5 -/* 80367964 38 05 FF D0 */ addi r0, r5, -48 -/* 80367968 7C 07 07 74 */ extsb r7, r0 -/* 8036796C 7C E0 32 78 */ xor r0, r7, r6 -/* 80367970 7C 05 0E 70 */ srawi r5, r0, 1 -/* 80367974 7C 00 38 38 */ and r0, r0, r7 -/* 80367978 7C 00 28 50 */ subf r0, r0, r5 -/* 8036797C 54 05 0F FF */ rlwinm. r5, r0, 1, 0x1f, 0x1f -/* 80367980 40 82 00 0C */ bne lbl_8036798C -/* 80367984 7C E0 07 75 */ extsb. r0, r7 -/* 80367988 40 82 00 0C */ bne lbl_80367994 -lbl_8036798C: -/* 8036798C 38 84 FF FF */ addi r4, r4, -1 -/* 80367990 48 00 00 14 */ b lbl_803679A4 -lbl_80367994: -/* 80367994 38 07 00 30 */ addi r0, r7, 0x30 -/* 80367998 98 08 00 00 */ stb r0, 0(r8) -/* 8036799C 48 00 00 10 */ b lbl_803679AC -lbl_803679A0: -/* 803679A0 38 C0 00 09 */ li r6, 9 -lbl_803679A4: -/* 803679A4 2C 04 00 00 */ cmpwi r4, 0 -/* 803679A8 40 82 FF B4 */ bne lbl_8036795C -lbl_803679AC: -/* 803679AC 2C 05 00 00 */ cmpwi r5, 0 -/* 803679B0 41 82 00 24 */ beq lbl_803679D4 -/* 803679B4 A8 A3 00 02 */ lha r5, 2(r3) -/* 803679B8 38 80 00 01 */ li r4, 1 -/* 803679BC 38 00 00 31 */ li r0, 0x31 -/* 803679C0 38 A5 00 01 */ addi r5, r5, 1 -/* 803679C4 B0 A3 00 02 */ sth r5, 2(r3) -/* 803679C8 98 83 00 04 */ stb r4, 4(r3) -/* 803679CC 98 03 00 05 */ stb r0, 5(r3) -/* 803679D0 4E 80 00 20 */ blr -lbl_803679D4: -/* 803679D4 2C 04 00 00 */ cmpwi r4, 0 -/* 803679D8 41 82 FE E8 */ beq lbl_803678C0 -/* 803679DC 98 83 00 04 */ stb r4, 4(r3) -/* 803679E0 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/snprintf.s b/asm/MSL_C/MSL_Common/Src/printf/snprintf.s deleted file mode 100644 index b330193d78..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/snprintf.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_803665BC: -/* 803665BC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 803665C0 7C 08 02 A6 */ mflr r0 -/* 803665C4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 803665C8 BF 41 00 88 */ stmw r26, 0x88(r1) -/* 803665CC 7C 7A 1B 78 */ mr r26, r3 -/* 803665D0 7C 9B 23 78 */ mr r27, r4 -/* 803665D4 40 86 00 24 */ bne cr1, lbl_803665F8 -/* 803665D8 D8 21 00 28 */ stfd f1, 0x28(r1) -/* 803665DC D8 41 00 30 */ stfd f2, 0x30(r1) -/* 803665E0 D8 61 00 38 */ stfd f3, 0x38(r1) -/* 803665E4 D8 81 00 40 */ stfd f4, 0x40(r1) -/* 803665E8 D8 A1 00 48 */ stfd f5, 0x48(r1) -/* 803665EC D8 C1 00 50 */ stfd f6, 0x50(r1) -/* 803665F0 D8 E1 00 58 */ stfd f7, 0x58(r1) -/* 803665F4 D9 01 00 60 */ stfd f8, 0x60(r1) -lbl_803665F8: -/* 803665F8 3B C1 00 A8 */ addi r30, r1, 0xa8 -/* 803665FC 3B E1 00 08 */ addi r31, r1, 8 -/* 80366600 3F A0 03 00 */ lis r29, 0x300 -/* 80366604 39 80 00 00 */ li r12, 0 -/* 80366608 3D 60 80 36 */ lis r11, __StringWrite@ha /* 0x80366964@ha */ -/* 8036660C 90 81 00 0C */ stw r4, 0xc(r1) -/* 80366610 3B 81 00 74 */ addi r28, r1, 0x74 -/* 80366614 38 81 00 68 */ addi r4, r1, 0x68 -/* 80366618 90 C1 00 14 */ stw r6, 0x14(r1) -/* 8036661C 38 0B 69 64 */ addi r0, r11, __StringWrite@l /* 0x80366964@l */ -/* 80366620 7F 86 E3 78 */ mr r6, r28 -/* 80366624 90 61 00 08 */ stw r3, 8(r1) -/* 80366628 7C 03 03 78 */ mr r3, r0 -/* 8036662C 90 A1 00 10 */ stw r5, 0x10(r1) -/* 80366630 90 E1 00 18 */ stw r7, 0x18(r1) -/* 80366634 91 01 00 1C */ stw r8, 0x1c(r1) -/* 80366638 91 21 00 20 */ stw r9, 0x20(r1) -/* 8036663C 91 41 00 24 */ stw r10, 0x24(r1) -/* 80366640 93 A1 00 74 */ stw r29, 0x74(r1) -/* 80366644 93 C1 00 78 */ stw r30, 0x78(r1) -/* 80366648 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 8036664C 93 41 00 68 */ stw r26, 0x68(r1) -/* 80366650 93 61 00 6C */ stw r27, 0x6c(r1) -/* 80366654 91 81 00 70 */ stw r12, 0x70(r1) -/* 80366658 48 00 03 D1 */ bl __pformatter -/* 8036665C 28 1A 00 00 */ cmplwi r26, 0 -/* 80366660 41 82 00 1C */ beq lbl_8036667C -/* 80366664 7C 03 D8 40 */ cmplw r3, r27 -/* 80366668 38 9B FF FF */ addi r4, r27, -1 -/* 8036666C 40 80 00 08 */ bge lbl_80366674 -/* 80366670 7C 64 1B 78 */ mr r4, r3 -lbl_80366674: -/* 80366674 38 00 00 00 */ li r0, 0 -/* 80366678 7C 1A 21 AE */ stbx r0, r26, r4 -lbl_8036667C: -/* 8036667C BB 41 00 88 */ lmw r26, 0x88(r1) -/* 80366680 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80366684 7C 08 03 A6 */ mtlr r0 -/* 80366688 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8036668C 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/sprintf.s b/asm/MSL_C/MSL_Common/Src/printf/sprintf.s deleted file mode 100644 index c133c3f50e..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/sprintf.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_803664DC: -/* 803664DC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 803664E0 7C 08 02 A6 */ mflr r0 -/* 803664E4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 803664E8 BF 21 00 84 */ stmw r25, 0x84(r1) -/* 803664EC 7C 79 1B 78 */ mr r25, r3 -/* 803664F0 7C 9A 23 78 */ mr r26, r4 -/* 803664F4 40 86 00 24 */ bne cr1, lbl_80366518 -/* 803664F8 D8 21 00 28 */ stfd f1, 0x28(r1) -/* 803664FC D8 41 00 30 */ stfd f2, 0x30(r1) -/* 80366500 D8 61 00 38 */ stfd f3, 0x38(r1) -/* 80366504 D8 81 00 40 */ stfd f4, 0x40(r1) -/* 80366508 D8 A1 00 48 */ stfd f5, 0x48(r1) -/* 8036650C D8 C1 00 50 */ stfd f6, 0x50(r1) -/* 80366510 D8 E1 00 58 */ stfd f7, 0x58(r1) -/* 80366514 D9 01 00 60 */ stfd f8, 0x60(r1) -lbl_80366518: -/* 80366518 3B A1 00 A8 */ addi r29, r1, 0xa8 -/* 8036651C 3B C1 00 08 */ addi r30, r1, 8 -/* 80366520 3F 80 02 00 */ lis r28, 0x200 -/* 80366524 3B E0 FF FF */ li r31, -1 -/* 80366528 39 80 00 00 */ li r12, 0 -/* 8036652C 3D 60 80 36 */ lis r11, __StringWrite@ha /* 0x80366964@ha */ -/* 80366530 90 81 00 0C */ stw r4, 0xc(r1) -/* 80366534 3B 61 00 74 */ addi r27, r1, 0x74 -/* 80366538 38 0B 69 64 */ addi r0, r11, __StringWrite@l /* 0x80366964@l */ -/* 8036653C 38 81 00 68 */ addi r4, r1, 0x68 -/* 80366540 90 61 00 08 */ stw r3, 8(r1) -/* 80366544 7C 03 03 78 */ mr r3, r0 -/* 80366548 90 A1 00 10 */ stw r5, 0x10(r1) -/* 8036654C 7F 45 D3 78 */ mr r5, r26 -/* 80366550 90 C1 00 14 */ stw r6, 0x14(r1) -/* 80366554 7F 66 DB 78 */ mr r6, r27 -/* 80366558 90 E1 00 18 */ stw r7, 0x18(r1) -/* 8036655C 91 01 00 1C */ stw r8, 0x1c(r1) -/* 80366560 91 21 00 20 */ stw r9, 0x20(r1) -/* 80366564 91 41 00 24 */ stw r10, 0x24(r1) -/* 80366568 93 81 00 74 */ stw r28, 0x74(r1) -/* 8036656C 93 A1 00 78 */ stw r29, 0x78(r1) -/* 80366570 93 C1 00 7C */ stw r30, 0x7c(r1) -/* 80366574 93 21 00 68 */ stw r25, 0x68(r1) -/* 80366578 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8036657C 91 81 00 70 */ stw r12, 0x70(r1) -/* 80366580 48 00 04 A9 */ bl __pformatter -/* 80366584 28 19 00 00 */ cmplwi r25, 0 -/* 80366588 41 82 00 20 */ beq lbl_803665A8 -/* 8036658C 38 00 FF FF */ li r0, -1 -/* 80366590 38 80 FF FE */ li r4, -2 -/* 80366594 7C 03 00 40 */ cmplw r3, r0 -/* 80366598 40 80 00 08 */ bge lbl_803665A0 -/* 8036659C 7C 64 1B 78 */ mr r4, r3 -lbl_803665A0: -/* 803665A0 38 00 00 00 */ li r0, 0 -/* 803665A4 7C 19 21 AE */ stbx r0, r25, r4 -lbl_803665A8: -/* 803665A8 BB 21 00 84 */ lmw r25, 0x84(r1) -/* 803665AC 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 803665B0 7C 08 03 A6 */ mtlr r0 -/* 803665B4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 803665B8 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/vprintf.s b/asm/MSL_C/MSL_Common/Src/printf/vprintf.s deleted file mode 100644 index e85938ee2d..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/vprintf.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80366704: -/* 80366704 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80366708 7C 08 02 A6 */ mflr r0 -/* 8036670C 3C A0 80 3D */ lis r5, __files@ha /* 0x803D29B0@ha */ -/* 80366710 90 01 00 24 */ stw r0, 0x24(r1) -/* 80366714 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80366718 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8036671C 7C 9E 23 78 */ mr r30, r4 -/* 80366720 38 85 29 B0 */ addi r4, r5, __files@l /* 0x803D29B0@l */ -/* 80366724 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80366728 3B E4 00 50 */ addi r31, r4, 0x50 -/* 8036672C 7C 7D 1B 78 */ mr r29, r3 -/* 80366730 38 80 FF FF */ li r4, -1 -/* 80366734 7F E3 FB 78 */ mr r3, r31 -/* 80366738 48 00 29 DD */ bl fwide -/* 8036673C 2C 03 00 00 */ cmpwi r3, 0 -/* 80366740 41 80 00 0C */ blt lbl_8036674C -/* 80366744 38 60 FF FF */ li r3, -1 -/* 80366748 48 00 00 38 */ b lbl_80366780 -lbl_8036674C: -/* 8036674C 38 60 00 02 */ li r3, 2 -/* 80366750 4B FF ED 19 */ bl __begin_critical_region -/* 80366754 3C 60 80 36 */ lis r3, __FileWrite@ha /* 0x803669D0@ha */ -/* 80366758 7F E4 FB 78 */ mr r4, r31 -/* 8036675C 38 63 69 D0 */ addi r3, r3, __FileWrite@l /* 0x803669D0@l */ -/* 80366760 7F A5 EB 78 */ mr r5, r29 -/* 80366764 7F C6 F3 78 */ mr r6, r30 -/* 80366768 48 00 02 C1 */ bl __pformatter -/* 8036676C 7C 60 1B 78 */ mr r0, r3 -/* 80366770 38 60 00 02 */ li r3, 2 -/* 80366774 7C 1F 03 78 */ mr r31, r0 -/* 80366778 4B FF EC ED */ bl __end_critical_region -/* 8036677C 7F E3 FB 78 */ mr r3, r31 -lbl_80366780: -/* 80366780 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80366784 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80366788 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8036678C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80366790 7C 08 03 A6 */ mtlr r0 -/* 80366794 38 21 00 20 */ addi r1, r1, 0x20 -/* 80366798 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s b/asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s deleted file mode 100644 index 75104b41ab..0000000000 --- a/asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80366690: -/* 80366690 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80366694 7C 08 02 A6 */ mflr r0 -/* 80366698 90 01 00 24 */ stw r0, 0x24(r1) -/* 8036669C 38 00 00 00 */ li r0, 0 -/* 803666A0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803666A4 7C 9F 23 78 */ mr r31, r4 -/* 803666A8 38 81 00 08 */ addi r4, r1, 8 -/* 803666AC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803666B0 7C 7E 1B 78 */ mr r30, r3 -/* 803666B4 3C 60 80 36 */ lis r3, __StringWrite@ha /* 0x80366964@ha */ -/* 803666B8 93 C1 00 08 */ stw r30, 8(r1) -/* 803666BC 38 63 69 64 */ addi r3, r3, __StringWrite@l /* 0x80366964@l */ -/* 803666C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803666C4 90 01 00 10 */ stw r0, 0x10(r1) -/* 803666C8 48 00 03 61 */ bl __pformatter -/* 803666CC 28 1E 00 00 */ cmplwi r30, 0 -/* 803666D0 41 82 00 1C */ beq lbl_803666EC -/* 803666D4 7C 03 F8 40 */ cmplw r3, r31 -/* 803666D8 38 9F FF FF */ addi r4, r31, -1 -/* 803666DC 40 80 00 08 */ bge lbl_803666E4 -/* 803666E0 7C 64 1B 78 */ mr r4, r3 -lbl_803666E4: -/* 803666E4 38 00 00 00 */ li r0, 0 -/* 803666E8 7C 1E 21 AE */ stbx r0, r30, r4 -lbl_803666EC: -/* 803666EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803666F0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 803666F4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 803666F8 7C 08 03 A6 */ mtlr r0 -/* 803666FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80366700 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s b/asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s deleted file mode 100644 index 3770602784..0000000000 --- a/asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8036878C: -/* 8036878C 2C 05 00 01 */ cmpwi r5, 1 -/* 80368790 7C 66 1B 78 */ mr r6, r3 -/* 80368794 41 82 00 4C */ beq lbl_803687E0 -/* 80368798 40 80 00 10 */ bge lbl_803687A8 -/* 8036879C 2C 05 00 00 */ cmpwi r5, 0 -/* 803687A0 40 80 00 14 */ bge lbl_803687B4 -/* 803687A4 48 00 00 70 */ b lbl_80368814 -lbl_803687A8: -/* 803687A8 2C 05 00 03 */ cmpwi r5, 3 -/* 803687AC 40 80 00 68 */ bge lbl_80368814 -/* 803687B0 48 00 00 5C */ b lbl_8036880C -lbl_803687B4: -/* 803687B4 80 86 00 00 */ lwz r4, 0(r6) -/* 803687B8 88 64 00 00 */ lbz r3, 0(r4) -/* 803687BC 7C 60 07 75 */ extsb. r0, r3 -/* 803687C0 40 82 00 14 */ bne lbl_803687D4 -/* 803687C4 38 00 00 01 */ li r0, 1 -/* 803687C8 38 60 FF FF */ li r3, -1 -/* 803687CC 90 06 00 04 */ stw r0, 4(r6) -/* 803687D0 4E 80 00 20 */ blr -lbl_803687D4: -/* 803687D4 38 04 00 01 */ addi r0, r4, 1 -/* 803687D8 90 06 00 00 */ stw r0, 0(r6) -/* 803687DC 4E 80 00 20 */ blr -lbl_803687E0: -/* 803687E0 80 06 00 04 */ lwz r0, 4(r6) -/* 803687E4 2C 00 00 00 */ cmpwi r0, 0 -/* 803687E8 40 82 00 14 */ bne lbl_803687FC -/* 803687EC 80 66 00 00 */ lwz r3, 0(r6) -/* 803687F0 38 03 FF FF */ addi r0, r3, -1 -/* 803687F4 90 06 00 00 */ stw r0, 0(r6) -/* 803687F8 48 00 00 0C */ b lbl_80368804 -lbl_803687FC: -/* 803687FC 38 00 00 00 */ li r0, 0 -/* 80368800 90 06 00 04 */ stw r0, 4(r6) -lbl_80368804: -/* 80368804 7C 83 23 78 */ mr r3, r4 -/* 80368808 4E 80 00 20 */ blr -lbl_8036880C: -/* 8036880C 80 66 00 04 */ lwz r3, 4(r6) -/* 80368810 4E 80 00 20 */ blr -lbl_80368814: -/* 80368814 38 60 00 00 */ li r3, 0 -/* 80368818 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/signal/raise.s b/asm/MSL_C/MSL_Common/Src/signal/raise.s deleted file mode 100644 index 9b4ad4d679..0000000000 --- a/asm/MSL_C/MSL_Common/Src/signal/raise.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8036881C: -/* 8036881C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80368820 7C 08 02 A6 */ mflr r0 -/* 80368824 90 01 00 14 */ stw r0, 0x14(r1) -/* 80368828 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8036882C 93 C1 00 08 */ stw r30, 8(r1) -/* 80368830 7C 7E 1B 78 */ mr r30, r3 -/* 80368834 2C 1E 00 01 */ cmpwi r30, 1 -/* 80368838 41 80 00 0C */ blt lbl_80368844 -/* 8036883C 2C 1E 00 06 */ cmpwi r30, 6 -/* 80368840 40 81 00 0C */ ble lbl_8036884C -lbl_80368844: -/* 80368844 38 60 FF FF */ li r3, -1 -/* 80368848 48 00 00 7C */ b lbl_803688C4 -lbl_8036884C: -/* 8036884C 38 60 00 04 */ li r3, 4 -/* 80368850 4B FF CC 19 */ bl __begin_critical_region -/* 80368854 3C 60 80 45 */ lis r3, signal_funcs@ha /* 0x8044D878@ha */ -/* 80368858 57 C0 10 3A */ slwi r0, r30, 2 -/* 8036885C 38 63 D8 78 */ addi r3, r3, signal_funcs@l /* 0x8044D878@l */ -/* 80368860 7C 63 02 14 */ add r3, r3, r0 -/* 80368864 87 E3 FF FC */ lwzu r31, -4(r3) -/* 80368868 28 1F 00 01 */ cmplwi r31, 1 -/* 8036886C 41 82 00 0C */ beq lbl_80368878 -/* 80368870 38 00 00 00 */ li r0, 0 -/* 80368874 90 03 00 00 */ stw r0, 0(r3) -lbl_80368878: -/* 80368878 38 60 00 04 */ li r3, 4 -/* 8036887C 4B FF CB E9 */ bl __end_critical_region -/* 80368880 28 1F 00 01 */ cmplwi r31, 1 -/* 80368884 41 82 00 14 */ beq lbl_80368898 -/* 80368888 28 1F 00 00 */ cmplwi r31, 0 -/* 8036888C 40 82 00 14 */ bne lbl_803688A0 -/* 80368890 2C 1E 00 01 */ cmpwi r30, 1 -/* 80368894 40 82 00 0C */ bne lbl_803688A0 -lbl_80368898: -/* 80368898 38 60 00 00 */ li r3, 0 -/* 8036889C 48 00 00 28 */ b lbl_803688C4 -lbl_803688A0: -/* 803688A0 28 1F 00 00 */ cmplwi r31, 0 -/* 803688A4 40 82 00 0C */ bne lbl_803688B0 -/* 803688A8 38 60 00 00 */ li r3, 0 -/* 803688AC 4B FF A1 21 */ bl exit -lbl_803688B0: -/* 803688B0 7F EC FB 78 */ mr r12, r31 -/* 803688B4 7F C3 F3 78 */ mr r3, r30 -/* 803688B8 7D 89 03 A6 */ mtctr r12 -/* 803688BC 4E 80 04 21 */ bctrl -/* 803688C0 38 60 00 00 */ li r3, 0 -lbl_803688C4: -/* 803688C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803688C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803688CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 803688D0 7C 08 03 A6 */ mtlr r0 -/* 803688D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803688D8 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s b/asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s deleted file mode 100644 index a030a67b35..0000000000 --- a/asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s +++ /dev/null @@ -1,253 +0,0 @@ -lbl_80368D9C: -/* 80368D9C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80368DA0 7C 08 02 A6 */ mflr r0 -/* 80368DA4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80368DA8 38 00 00 00 */ li r0, 0 -/* 80368DAC BE 81 00 10 */ stmw r20, 0x10(r1) -/* 80368DB0 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80368DB4 7D 38 4B 78 */ mr r24, r9 -/* 80368DB8 7D 15 43 78 */ mr r21, r8 -/* 80368DBC 7C 96 23 78 */ mr r22, r4 -/* 80368DC0 7C BE 2B 78 */ mr r30, r5 -/* 80368DC4 7C DC 33 78 */ mr r28, r6 -/* 80368DC8 7C F4 3B 78 */ mr r20, r7 -/* 80368DCC 3B 20 00 01 */ li r25, 1 -/* 80368DD0 3B E0 00 00 */ li r31, 0 -/* 80368DD4 3A E0 00 00 */ li r23, 0 -/* 80368DD8 3B 60 00 00 */ li r27, 0 -/* 80368DDC 3B 40 00 00 */ li r26, 0 -/* 80368DE0 90 09 00 00 */ stw r0, 0(r9) -/* 80368DE4 90 08 00 00 */ stw r0, 0(r8) -/* 80368DE8 41 80 00 1C */ blt lbl_80368E04 -/* 80368DEC 2C 1D 00 01 */ cmpwi r29, 1 -/* 80368DF0 41 82 00 14 */ beq lbl_80368E04 -/* 80368DF4 2C 1D 00 24 */ cmpwi r29, 0x24 -/* 80368DF8 41 81 00 0C */ bgt lbl_80368E04 -/* 80368DFC 2C 16 00 01 */ cmpwi r22, 1 -/* 80368E00 40 80 00 0C */ bge lbl_80368E0C -lbl_80368E04: -/* 80368E04 3B 20 00 40 */ li r25, 0x40 -/* 80368E08 48 00 00 24 */ b lbl_80368E2C -lbl_80368E0C: -/* 80368E0C 7F CC F3 78 */ mr r12, r30 -/* 80368E10 7F 83 E3 78 */ mr r3, r28 -/* 80368E14 38 80 00 00 */ li r4, 0 -/* 80368E18 38 A0 00 00 */ li r5, 0 -/* 80368E1C 7D 89 03 A6 */ mtctr r12 -/* 80368E20 3B E0 00 01 */ li r31, 1 -/* 80368E24 4E 80 04 21 */ bctrl -/* 80368E28 7C 64 1B 78 */ mr r4, r3 -lbl_80368E2C: -/* 80368E2C 2C 1D 00 00 */ cmpwi r29, 0 -/* 80368E30 41 82 02 7C */ beq lbl_803690AC -/* 80368E34 38 00 FF FF */ li r0, -1 -/* 80368E38 7F 40 EB 96 */ divwu r26, r0, r29 -/* 80368E3C 48 00 02 70 */ b lbl_803690AC -lbl_80368E40: -/* 80368E40 28 19 00 10 */ cmplwi r25, 0x10 -/* 80368E44 41 81 02 68 */ bgt lbl_803690AC -/* 80368E48 3C 60 80 3D */ lis r3, lit_431@ha /* 0x803D3148@ha */ -/* 80368E4C 57 20 10 3A */ slwi r0, r25, 2 -/* 80368E50 38 63 31 48 */ addi r3, r3, lit_431@l /* 0x803D3148@l */ -/* 80368E54 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80368E58 7C 09 03 A6 */ mtctr r0 -/* 80368E5C 4E 80 04 20 */ bctr -/* 80368E60 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 80368E64 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80368E68 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 80368E6C 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80368E70 54 00 07 7D */ rlwinm. r0, r0, 0, 0x1d, 0x1e -/* 80368E74 41 82 00 28 */ beq lbl_80368E9C -/* 80368E78 7F CC F3 78 */ mr r12, r30 -/* 80368E7C 7F 83 E3 78 */ mr r3, r28 -/* 80368E80 38 80 00 00 */ li r4, 0 -/* 80368E84 38 A0 00 00 */ li r5, 0 -/* 80368E88 7D 89 03 A6 */ mtctr r12 -/* 80368E8C 4E 80 04 21 */ bctrl -/* 80368E90 7C 64 1B 78 */ mr r4, r3 -/* 80368E94 3A F7 00 01 */ addi r23, r23, 1 -/* 80368E98 48 00 02 14 */ b lbl_803690AC -lbl_80368E9C: -/* 80368E9C 2C 04 00 2B */ cmpwi r4, 0x2b -/* 80368EA0 40 82 00 28 */ bne lbl_80368EC8 -/* 80368EA4 7F CC F3 78 */ mr r12, r30 -/* 80368EA8 7F 83 E3 78 */ mr r3, r28 -/* 80368EAC 38 80 00 00 */ li r4, 0 -/* 80368EB0 38 A0 00 00 */ li r5, 0 -/* 80368EB4 7D 89 03 A6 */ mtctr r12 -/* 80368EB8 3B FF 00 01 */ addi r31, r31, 1 -/* 80368EBC 4E 80 04 21 */ bctrl -/* 80368EC0 7C 64 1B 78 */ mr r4, r3 -/* 80368EC4 48 00 00 34 */ b lbl_80368EF8 -lbl_80368EC8: -/* 80368EC8 2C 04 00 2D */ cmpwi r4, 0x2d -/* 80368ECC 40 82 00 2C */ bne lbl_80368EF8 -/* 80368ED0 7F CC F3 78 */ mr r12, r30 -/* 80368ED4 7F 83 E3 78 */ mr r3, r28 -/* 80368ED8 38 80 00 00 */ li r4, 0 -/* 80368EDC 38 A0 00 00 */ li r5, 0 -/* 80368EE0 7D 89 03 A6 */ mtctr r12 -/* 80368EE4 3B FF 00 01 */ addi r31, r31, 1 -/* 80368EE8 4E 80 04 21 */ bctrl -/* 80368EEC 38 00 00 01 */ li r0, 1 -/* 80368EF0 7C 64 1B 78 */ mr r4, r3 -/* 80368EF4 90 15 00 00 */ stw r0, 0(r21) -lbl_80368EF8: -/* 80368EF8 3B 20 00 02 */ li r25, 2 -/* 80368EFC 48 00 01 B0 */ b lbl_803690AC -/* 80368F00 2C 1D 00 00 */ cmpwi r29, 0 -/* 80368F04 41 82 00 0C */ beq lbl_80368F10 -/* 80368F08 2C 1D 00 10 */ cmpwi r29, 0x10 -/* 80368F0C 40 82 00 34 */ bne lbl_80368F40 -lbl_80368F10: -/* 80368F10 2C 04 00 30 */ cmpwi r4, 0x30 -/* 80368F14 40 82 00 2C */ bne lbl_80368F40 -/* 80368F18 7F CC F3 78 */ mr r12, r30 -/* 80368F1C 7F 83 E3 78 */ mr r3, r28 -/* 80368F20 3B 20 00 04 */ li r25, 4 -/* 80368F24 38 80 00 00 */ li r4, 0 -/* 80368F28 38 A0 00 00 */ li r5, 0 -/* 80368F2C 7D 89 03 A6 */ mtctr r12 -/* 80368F30 3B FF 00 01 */ addi r31, r31, 1 -/* 80368F34 4E 80 04 21 */ bctrl -/* 80368F38 7C 64 1B 78 */ mr r4, r3 -/* 80368F3C 48 00 01 70 */ b lbl_803690AC -lbl_80368F40: -/* 80368F40 3B 20 00 08 */ li r25, 8 -/* 80368F44 48 00 01 68 */ b lbl_803690AC -/* 80368F48 2C 04 00 58 */ cmpwi r4, 0x58 -/* 80368F4C 41 82 00 0C */ beq lbl_80368F58 -/* 80368F50 2C 04 00 78 */ cmpwi r4, 0x78 -/* 80368F54 40 82 00 30 */ bne lbl_80368F84 -lbl_80368F58: -/* 80368F58 7F CC F3 78 */ mr r12, r30 -/* 80368F5C 7F 83 E3 78 */ mr r3, r28 -/* 80368F60 3B A0 00 10 */ li r29, 0x10 -/* 80368F64 3B 20 00 08 */ li r25, 8 -/* 80368F68 38 80 00 00 */ li r4, 0 -/* 80368F6C 38 A0 00 00 */ li r5, 0 -/* 80368F70 7D 89 03 A6 */ mtctr r12 -/* 80368F74 3B FF 00 01 */ addi r31, r31, 1 -/* 80368F78 4E 80 04 21 */ bctrl -/* 80368F7C 7C 64 1B 78 */ mr r4, r3 -/* 80368F80 48 00 01 2C */ b lbl_803690AC -lbl_80368F84: -/* 80368F84 2C 1D 00 00 */ cmpwi r29, 0 -/* 80368F88 40 82 00 08 */ bne lbl_80368F90 -/* 80368F8C 3B A0 00 08 */ li r29, 8 -lbl_80368F90: -/* 80368F90 3B 20 00 10 */ li r25, 0x10 -/* 80368F94 48 00 01 18 */ b lbl_803690AC -/* 80368F98 2C 1D 00 00 */ cmpwi r29, 0 -/* 80368F9C 40 82 00 08 */ bne lbl_80368FA4 -/* 80368FA0 3B A0 00 0A */ li r29, 0xa -lbl_80368FA4: -/* 80368FA4 28 1A 00 00 */ cmplwi r26, 0 -/* 80368FA8 40 82 00 0C */ bne lbl_80368FB4 -/* 80368FAC 38 00 FF FF */ li r0, -1 -/* 80368FB0 7F 40 EB 96 */ divwu r26, r0, r29 -lbl_80368FB4: -/* 80368FB4 3C 60 80 3D */ lis r3, __ctype_map@ha /* 0x803D2C18@ha */ -/* 80368FB8 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 80368FBC 38 63 2C 18 */ addi r3, r3, __ctype_map@l /* 0x803D2C18@l */ -/* 80368FC0 7C 63 28 AE */ lbzx r3, r3, r5 -/* 80368FC4 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 80368FC8 41 82 00 2C */ beq lbl_80368FF4 -/* 80368FCC 38 84 FF D0 */ addi r4, r4, -48 -/* 80368FD0 7C 04 E8 00 */ cmpw r4, r29 -/* 80368FD4 41 80 00 88 */ blt lbl_8036905C -/* 80368FD8 2C 19 00 10 */ cmpwi r25, 0x10 -/* 80368FDC 38 00 00 40 */ li r0, 0x40 -/* 80368FE0 40 82 00 08 */ bne lbl_80368FE8 -/* 80368FE4 38 00 00 20 */ li r0, 0x20 -lbl_80368FE8: -/* 80368FE8 7C 19 03 78 */ mr r25, r0 -/* 80368FEC 38 84 00 30 */ addi r4, r4, 0x30 -/* 80368FF0 48 00 00 BC */ b lbl_803690AC -lbl_80368FF4: -/* 80368FF4 54 60 06 33 */ rlwinm. r0, r3, 0, 0x18, 0x19 -/* 80368FF8 41 82 00 2C */ beq lbl_80369024 -/* 80368FFC 2C 04 FF FF */ cmpwi r4, -1 -/* 80369000 40 82 00 0C */ bne lbl_8036900C -/* 80369004 38 60 FF FF */ li r3, -1 -/* 80369008 48 00 00 10 */ b lbl_80369018 -lbl_8036900C: -/* 8036900C 3C 60 80 3D */ lis r3, __upper_map@ha /* 0x803D2E18@ha */ -/* 80369010 38 63 2E 18 */ addi r3, r3, __upper_map@l /* 0x803D2E18@l */ -/* 80369014 7C 63 28 AE */ lbzx r3, r3, r5 -lbl_80369018: -/* 80369018 38 03 FF C9 */ addi r0, r3, -55 -/* 8036901C 7C 00 E8 00 */ cmpw r0, r29 -/* 80369020 41 80 00 1C */ blt lbl_8036903C -lbl_80369024: -/* 80369024 2C 19 00 10 */ cmpwi r25, 0x10 -/* 80369028 40 82 00 0C */ bne lbl_80369034 -/* 8036902C 3B 20 00 20 */ li r25, 0x20 -/* 80369030 48 00 00 7C */ b lbl_803690AC -lbl_80369034: -/* 80369034 3B 20 00 40 */ li r25, 0x40 -/* 80369038 48 00 00 74 */ b lbl_803690AC -lbl_8036903C: -/* 8036903C 2C 04 FF FF */ cmpwi r4, -1 -/* 80369040 40 82 00 0C */ bne lbl_8036904C -/* 80369044 38 60 FF FF */ li r3, -1 -/* 80369048 48 00 00 10 */ b lbl_80369058 -lbl_8036904C: -/* 8036904C 3C 60 80 3D */ lis r3, __upper_map@ha /* 0x803D2E18@ha */ -/* 80369050 38 63 2E 18 */ addi r3, r3, __upper_map@l /* 0x803D2E18@l */ -/* 80369054 7C 63 28 AE */ lbzx r3, r3, r5 -lbl_80369058: -/* 80369058 38 83 FF C9 */ addi r4, r3, -55 -lbl_8036905C: -/* 8036905C 7C 1B D0 40 */ cmplw r27, r26 -/* 80369060 40 81 00 0C */ ble lbl_8036906C -/* 80369064 38 00 00 01 */ li r0, 1 -/* 80369068 90 18 00 00 */ stw r0, 0(r24) -lbl_8036906C: -/* 8036906C 7F 7B E9 D6 */ mullw r27, r27, r29 -/* 80369070 20 1B FF FF */ subfic r0, r27, -1 -/* 80369074 7C 04 00 40 */ cmplw r4, r0 -/* 80369078 40 81 00 0C */ ble lbl_80369084 -/* 8036907C 38 00 00 01 */ li r0, 1 -/* 80369080 90 18 00 00 */ stw r0, 0(r24) -lbl_80369084: -/* 80369084 7F CC F3 78 */ mr r12, r30 -/* 80369088 7F 83 E3 78 */ mr r3, r28 -/* 8036908C 7F 7B 22 14 */ add r27, r27, r4 -/* 80369090 3B 20 00 10 */ li r25, 0x10 -/* 80369094 38 80 00 00 */ li r4, 0 -/* 80369098 38 A0 00 00 */ li r5, 0 -/* 8036909C 7D 89 03 A6 */ mtctr r12 -/* 803690A0 3B FF 00 01 */ addi r31, r31, 1 -/* 803690A4 4E 80 04 21 */ bctrl -/* 803690A8 7C 64 1B 78 */ mr r4, r3 -lbl_803690AC: -/* 803690AC 7C 1F B0 00 */ cmpw r31, r22 -/* 803690B0 41 81 00 14 */ bgt lbl_803690C4 -/* 803690B4 2C 04 FF FF */ cmpwi r4, -1 -/* 803690B8 41 82 00 0C */ beq lbl_803690C4 -/* 803690BC 57 20 06 75 */ rlwinm. r0, r25, 0, 0x19, 0x1a -/* 803690C0 41 82 FD 80 */ beq lbl_80368E40 -lbl_803690C4: -/* 803690C4 73 20 00 34 */ andi. r0, r25, 0x34 -/* 803690C8 40 82 00 14 */ bne lbl_803690DC -/* 803690CC 38 00 00 00 */ li r0, 0 -/* 803690D0 3B 60 00 00 */ li r27, 0 -/* 803690D4 90 14 00 00 */ stw r0, 0(r20) -/* 803690D8 48 00 00 10 */ b lbl_803690E8 -lbl_803690DC: -/* 803690DC 7C 7F BA 14 */ add r3, r31, r23 -/* 803690E0 38 03 FF FF */ addi r0, r3, -1 -/* 803690E4 90 14 00 00 */ stw r0, 0(r20) -lbl_803690E8: -/* 803690E8 7F CC F3 78 */ mr r12, r30 -/* 803690EC 7F 83 E3 78 */ mr r3, r28 -/* 803690F0 38 A0 00 01 */ li r5, 1 -/* 803690F4 7D 89 03 A6 */ mtctr r12 -/* 803690F8 4E 80 04 21 */ bctrl -/* 803690FC 7F 63 DB 78 */ mr r3, r27 -/* 80369100 BA 81 00 10 */ lmw r20, 0x10(r1) -/* 80369104 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80369108 7C 08 03 A6 */ mtlr r0 -/* 8036910C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80369110 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/strtoul/strtol.s b/asm/MSL_C/MSL_Common/Src/strtoul/strtol.s deleted file mode 100644 index 4d51697d70..0000000000 --- a/asm/MSL_C/MSL_Common/Src/strtoul/strtol.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80368C00: -/* 80368C00 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80368C04 7C 08 02 A6 */ mflr r0 -/* 80368C08 38 E0 00 00 */ li r7, 0 -/* 80368C0C 3C C0 80 00 */ lis r6, 0x8000 /* 0x7FFFFFFF@ha */ -/* 80368C10 90 01 00 34 */ stw r0, 0x34(r1) -/* 80368C14 39 01 00 0C */ addi r8, r1, 0xc -/* 80368C18 39 21 00 08 */ addi r9, r1, 8 -/* 80368C1C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80368C20 7C 9F 23 78 */ mr r31, r4 -/* 80368C24 38 86 FF FF */ addi r4, r6, 0xFFFF /* 0x7FFFFFFF@l */ -/* 80368C28 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80368C2C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80368C30 7C 7E 1B 78 */ mr r30, r3 -/* 80368C34 3C 60 80 37 */ lis r3, __StringRead@ha /* 0x8036878C@ha */ -/* 80368C38 38 03 87 8C */ addi r0, r3, __StringRead@l /* 0x8036878C@l */ -/* 80368C3C 90 E1 00 18 */ stw r7, 0x18(r1) -/* 80368C40 7C A3 2B 78 */ mr r3, r5 -/* 80368C44 38 E1 00 10 */ addi r7, r1, 0x10 -/* 80368C48 93 C1 00 14 */ stw r30, 0x14(r1) -/* 80368C4C 7C 05 03 78 */ mr r5, r0 -/* 80368C50 48 00 01 4D */ bl __strtoul -/* 80368C54 28 1F 00 00 */ cmplwi r31, 0 -/* 80368C58 41 82 00 10 */ beq lbl_80368C68 -/* 80368C5C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80368C60 7C 1E 02 14 */ add r0, r30, r0 -/* 80368C64 90 1F 00 00 */ stw r0, 0(r31) -lbl_80368C68: -/* 80368C68 80 01 00 08 */ lwz r0, 8(r1) -/* 80368C6C 2C 00 00 00 */ cmpwi r0, 0 -/* 80368C70 40 82 00 34 */ bne lbl_80368CA4 -/* 80368C74 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 80368C78 2C 05 00 00 */ cmpwi r5, 0 -/* 80368C7C 40 82 00 14 */ bne lbl_80368C90 -/* 80368C80 3C 80 80 00 */ lis r4, 0x8000 /* 0x7FFFFFFF@ha */ -/* 80368C84 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x7FFFFFFF@l */ -/* 80368C88 7C 03 00 40 */ cmplw r3, r0 -/* 80368C8C 41 81 00 18 */ bgt lbl_80368CA4 -lbl_80368C90: -/* 80368C90 2C 05 00 00 */ cmpwi r5, 0 -/* 80368C94 41 82 00 38 */ beq lbl_80368CCC -/* 80368C98 3C 00 80 00 */ lis r0, 0x8000 -/* 80368C9C 7C 03 00 40 */ cmplw r3, r0 -/* 80368CA0 40 81 00 2C */ ble lbl_80368CCC -lbl_80368CA4: -/* 80368CA4 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 80368CA8 3C 60 80 00 */ lis r3, 0x8000 /* 0x7FFFFFFF@ha */ -/* 80368CAC 38 00 00 22 */ li r0, 0x22 -/* 80368CB0 7C 85 00 D0 */ neg r4, r5 -/* 80368CB4 38 63 FF FF */ addi r3, r3, 0xFFFF /* 0x7FFFFFFF@l */ -/* 80368CB8 7C 84 2B 78 */ or r4, r4, r5 -/* 80368CBC 90 0D 94 28 */ stw r0, errno(r13) -/* 80368CC0 54 80 0F FE */ srwi r0, r4, 0x1f -/* 80368CC4 7C 60 1A 14 */ add r3, r0, r3 -/* 80368CC8 48 00 00 10 */ b lbl_80368CD8 -lbl_80368CCC: -/* 80368CCC 2C 05 00 00 */ cmpwi r5, 0 -/* 80368CD0 41 82 00 08 */ beq lbl_80368CD8 -/* 80368CD4 7C 63 00 D0 */ neg r3, r3 -lbl_80368CD8: -/* 80368CD8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80368CDC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80368CE0 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80368CE4 7C 08 03 A6 */ mtlr r0 -/* 80368CE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368CEC 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s b/asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s deleted file mode 100644 index dd617d0de2..0000000000 --- a/asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80368CF0: -/* 80368CF0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80368CF4 7C 08 02 A6 */ mflr r0 -/* 80368CF8 38 E0 00 00 */ li r7, 0 -/* 80368CFC 3C C0 80 00 */ lis r6, 0x8000 /* 0x7FFFFFFF@ha */ -/* 80368D00 90 01 00 34 */ stw r0, 0x34(r1) -/* 80368D04 39 01 00 0C */ addi r8, r1, 0xc -/* 80368D08 39 21 00 08 */ addi r9, r1, 8 -/* 80368D0C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80368D10 7C 9F 23 78 */ mr r31, r4 -/* 80368D14 38 86 FF FF */ addi r4, r6, 0xFFFF /* 0x7FFFFFFF@l */ -/* 80368D18 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80368D1C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80368D20 7C 7E 1B 78 */ mr r30, r3 -/* 80368D24 3C 60 80 37 */ lis r3, __StringRead@ha /* 0x8036878C@ha */ -/* 80368D28 38 03 87 8C */ addi r0, r3, __StringRead@l /* 0x8036878C@l */ -/* 80368D2C 90 E1 00 18 */ stw r7, 0x18(r1) -/* 80368D30 7C A3 2B 78 */ mr r3, r5 -/* 80368D34 38 E1 00 10 */ addi r7, r1, 0x10 -/* 80368D38 93 C1 00 14 */ stw r30, 0x14(r1) -/* 80368D3C 7C 05 03 78 */ mr r5, r0 -/* 80368D40 48 00 00 5D */ bl __strtoul -/* 80368D44 28 1F 00 00 */ cmplwi r31, 0 -/* 80368D48 41 82 00 10 */ beq lbl_80368D58 -/* 80368D4C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80368D50 7C 1E 02 14 */ add r0, r30, r0 -/* 80368D54 90 1F 00 00 */ stw r0, 0(r31) -lbl_80368D58: -/* 80368D58 80 01 00 08 */ lwz r0, 8(r1) -/* 80368D5C 2C 00 00 00 */ cmpwi r0, 0 -/* 80368D60 41 82 00 14 */ beq lbl_80368D74 -/* 80368D64 38 00 00 22 */ li r0, 0x22 -/* 80368D68 38 60 FF FF */ li r3, -1 -/* 80368D6C 90 0D 94 28 */ stw r0, errno(r13) -/* 80368D70 48 00 00 14 */ b lbl_80368D84 -lbl_80368D74: -/* 80368D74 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80368D78 2C 00 00 00 */ cmpwi r0, 0 -/* 80368D7C 41 82 00 08 */ beq lbl_80368D84 -/* 80368D80 7C 63 00 D0 */ neg r3, r3 -lbl_80368D84: -/* 80368D84 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80368D88 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80368D8C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80368D90 7C 08 03 A6 */ mtlr r0 -/* 80368D94 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368D98 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s deleted file mode 100644 index 0036fde7e7..0000000000 --- a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_80363124: -/* 80363124 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80363128 7C 08 02 A6 */ mflr r0 -/* 8036312C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80363130 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80363134 7C 9F 23 78 */ mr r31, r4 -/* 80363138 93 C1 00 08 */ stw r30, 8(r1) -/* 8036313C AB C3 00 02 */ lha r30, 2(r3) -/* 80363140 7F E3 FB 78 */ mr r3, r31 -/* 80363144 48 00 01 85 */ bl __num2dec_internal -/* 80363148 88 1F 00 05 */ lbz r0, 5(r31) -/* 8036314C 28 00 00 09 */ cmplwi r0, 9 -/* 80363150 41 81 01 60 */ bgt lbl_803632B0 -/* 80363154 7F C0 07 34 */ extsh r0, r30 -/* 80363158 2C 00 00 24 */ cmpwi r0, 0x24 -/* 8036315C 40 81 00 08 */ ble lbl_80363164 -/* 80363160 3B C0 00 24 */ li r30, 0x24 -lbl_80363164: -/* 80363164 7F C6 07 35 */ extsh. r6, r30 -/* 80363168 40 81 00 E8 */ ble lbl_80363250 -/* 8036316C 88 1F 00 04 */ lbz r0, 4(r31) -/* 80363170 7C 06 00 00 */ cmpw r6, r0 -/* 80363174 40 80 00 DC */ bge lbl_80363250 -/* 80363178 7C BF 32 14 */ add r5, r31, r6 -/* 8036317C 88 05 00 05 */ lbz r0, 5(r5) -/* 80363180 28 00 00 05 */ cmplwi r0, 5 -/* 80363184 40 81 00 0C */ ble lbl_80363190 -/* 80363188 38 00 00 01 */ li r0, 1 -/* 8036318C 48 00 00 64 */ b lbl_803631F0 -lbl_80363190: -/* 80363190 40 80 00 0C */ bge lbl_8036319C -/* 80363194 38 00 FF FF */ li r0, -1 -/* 80363198 48 00 00 58 */ b lbl_803631F0 -lbl_8036319C: -/* 8036319C 88 7F 00 04 */ lbz r3, 4(r31) -/* 803631A0 38 85 00 06 */ addi r4, r5, 6 -/* 803631A4 38 63 00 05 */ addi r3, r3, 5 -/* 803631A8 7C 7F 1A 14 */ add r3, r31, r3 -/* 803631AC 7C 04 18 50 */ subf r0, r4, r3 -/* 803631B0 7C 09 03 A6 */ mtctr r0 -/* 803631B4 7C 04 18 40 */ cmplw r4, r3 -/* 803631B8 40 80 00 20 */ bge lbl_803631D8 -lbl_803631BC: -/* 803631BC 88 04 00 00 */ lbz r0, 0(r4) -/* 803631C0 28 00 00 00 */ cmplwi r0, 0 -/* 803631C4 41 82 00 0C */ beq lbl_803631D0 -/* 803631C8 38 00 00 01 */ li r0, 1 -/* 803631CC 48 00 00 24 */ b lbl_803631F0 -lbl_803631D0: -/* 803631D0 38 84 00 01 */ addi r4, r4, 1 -/* 803631D4 42 00 FF E8 */ bdnz lbl_803631BC -lbl_803631D8: -/* 803631D8 88 05 00 04 */ lbz r0, 4(r5) -/* 803631DC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 803631E0 41 82 00 0C */ beq lbl_803631EC -/* 803631E4 38 00 00 01 */ li r0, 1 -/* 803631E8 48 00 00 08 */ b lbl_803631F0 -lbl_803631EC: -/* 803631EC 38 00 FF FF */ li r0, -1 -lbl_803631F0: -/* 803631F0 2C 00 00 00 */ cmpwi r0, 0 -/* 803631F4 98 DF 00 04 */ stb r6, 4(r31) -/* 803631F8 41 80 00 58 */ blt lbl_80363250 -/* 803631FC 38 BF 00 05 */ addi r5, r31, 5 -/* 80363200 38 86 FF FF */ addi r4, r6, -1 -/* 80363204 7C 85 22 14 */ add r4, r5, r4 -/* 80363208 38 00 00 00 */ li r0, 0 -lbl_8036320C: -/* 8036320C 88 64 00 00 */ lbz r3, 0(r4) -/* 80363210 28 03 00 09 */ cmplwi r3, 9 -/* 80363214 40 80 00 10 */ bge lbl_80363224 -/* 80363218 38 03 00 01 */ addi r0, r3, 1 -/* 8036321C 98 04 00 00 */ stb r0, 0(r4) -/* 80363220 48 00 00 30 */ b lbl_80363250 -lbl_80363224: -/* 80363224 7C 04 28 40 */ cmplw r4, r5 -/* 80363228 40 82 00 1C */ bne lbl_80363244 -/* 8036322C 38 00 00 01 */ li r0, 1 -/* 80363230 98 04 00 00 */ stb r0, 0(r4) -/* 80363234 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363238 38 03 00 01 */ addi r0, r3, 1 -/* 8036323C B0 1F 00 02 */ sth r0, 2(r31) -/* 80363240 48 00 00 10 */ b lbl_80363250 -lbl_80363244: -/* 80363244 98 04 00 00 */ stb r0, 0(r4) -/* 80363248 38 84 FF FF */ addi r4, r4, -1 -/* 8036324C 4B FF FF C0 */ b lbl_8036320C -lbl_80363250: -/* 80363250 38 A0 00 00 */ li r5, 0 -/* 80363254 48 00 00 18 */ b lbl_8036326C -lbl_80363258: -/* 80363258 88 9F 00 04 */ lbz r4, 4(r31) -/* 8036325C 38 64 00 01 */ addi r3, r4, 1 -/* 80363260 38 04 00 05 */ addi r0, r4, 5 -/* 80363264 98 7F 00 04 */ stb r3, 4(r31) -/* 80363268 7C BF 01 AE */ stbx r5, r31, r0 -lbl_8036326C: -/* 8036326C 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363270 7C 03 30 00 */ cmpw r3, r6 -/* 80363274 41 80 FF E4 */ blt lbl_80363258 -/* 80363278 A8 1F 00 02 */ lha r0, 2(r31) -/* 8036327C 38 63 FF FF */ addi r3, r3, -1 -/* 80363280 38 A0 00 00 */ li r5, 0 -/* 80363284 7C 03 00 50 */ subf r0, r3, r0 -/* 80363288 B0 1F 00 02 */ sth r0, 2(r31) -/* 8036328C 48 00 00 18 */ b lbl_803632A4 -lbl_80363290: -/* 80363290 38 85 00 05 */ addi r4, r5, 5 -/* 80363294 38 A5 00 01 */ addi r5, r5, 1 -/* 80363298 7C 7F 20 AE */ lbzx r3, r31, r4 -/* 8036329C 38 03 00 30 */ addi r0, r3, 0x30 -/* 803632A0 7C 1F 21 AE */ stbx r0, r31, r4 -lbl_803632A4: -/* 803632A4 88 1F 00 04 */ lbz r0, 4(r31) -/* 803632A8 7C 05 00 00 */ cmpw r5, r0 -/* 803632AC 41 80 FF E4 */ blt lbl_80363290 -lbl_803632B0: -/* 803632B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803632B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803632B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 803632BC 7C 08 03 A6 */ mtlr r0 -/* 803632C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803632C4 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s deleted file mode 100644 index 3a24995f3f..0000000000 --- a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s +++ /dev/null @@ -1,278 +0,0 @@ -lbl_803632C8: -/* 803632C8 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 803632CC 7C 08 02 A6 */ mflr r0 -/* 803632D0 C8 02 CC 60 */ lfd f0, lit_824(r2) -/* 803632D4 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 803632D8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 803632DC DB E1 00 A8 */ stfd f31, 0xa8(r1) -/* 803632E0 BF 41 00 90 */ stmw r26, 0x90(r1) -/* 803632E4 7C 7E 1B 78 */ mr r30, r3 -/* 803632E8 D8 21 00 08 */ stfd f1, 8(r1) -/* 803632EC 80 01 00 08 */ lwz r0, 8(r1) -/* 803632F0 54 00 0F FE */ srwi r0, r0, 0x1f -/* 803632F4 7C 1F 07 74 */ extsb r31, r0 -/* 803632F8 40 82 00 20 */ bne lbl_80363318 -/* 803632FC 9B FE 00 00 */ stb r31, 0(r30) -/* 80363300 38 60 00 00 */ li r3, 0 -/* 80363304 38 00 00 01 */ li r0, 1 -/* 80363308 B0 7E 00 02 */ sth r3, 2(r30) -/* 8036330C 98 1E 00 04 */ stb r0, 4(r30) -/* 80363310 98 7E 00 05 */ stb r3, 5(r30) -/* 80363314 48 00 03 50 */ b lbl_80363664 -lbl_80363318: -/* 80363318 D8 21 00 28 */ stfd f1, 0x28(r1) -/* 8036331C 3C 00 7F F0 */ lis r0, 0x7ff0 -/* 80363320 80 81 00 28 */ lwz r4, 0x28(r1) -/* 80363324 54 83 00 56 */ rlwinm r3, r4, 0, 1, 0xb -/* 80363328 7C 03 00 00 */ cmpw r3, r0 -/* 8036332C 41 82 00 14 */ beq lbl_80363340 -/* 80363330 40 80 00 58 */ bge lbl_80363388 -/* 80363334 2C 03 00 00 */ cmpwi r3, 0 -/* 80363338 41 82 00 2C */ beq lbl_80363364 -/* 8036333C 48 00 00 4C */ b lbl_80363388 -lbl_80363340: -/* 80363340 54 80 03 3F */ clrlwi. r0, r4, 0xc -/* 80363344 40 82 00 10 */ bne lbl_80363354 -/* 80363348 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8036334C 2C 00 00 00 */ cmpwi r0, 0 -/* 80363350 41 82 00 0C */ beq lbl_8036335C -lbl_80363354: -/* 80363354 38 00 00 01 */ li r0, 1 -/* 80363358 48 00 00 34 */ b lbl_8036338C -lbl_8036335C: -/* 8036335C 38 00 00 02 */ li r0, 2 -/* 80363360 48 00 00 2C */ b lbl_8036338C -lbl_80363364: -/* 80363364 54 80 03 3F */ clrlwi. r0, r4, 0xc -/* 80363368 40 82 00 10 */ bne lbl_80363378 -/* 8036336C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80363370 2C 00 00 00 */ cmpwi r0, 0 -/* 80363374 41 82 00 0C */ beq lbl_80363380 -lbl_80363378: -/* 80363378 38 00 00 05 */ li r0, 5 -/* 8036337C 48 00 00 10 */ b lbl_8036338C -lbl_80363380: -/* 80363380 38 00 00 03 */ li r0, 3 -/* 80363384 48 00 00 08 */ b lbl_8036338C -lbl_80363388: -/* 80363388 38 00 00 04 */ li r0, 4 -lbl_8036338C: -/* 8036338C 2C 00 00 02 */ cmpwi r0, 2 -/* 80363390 41 81 00 A8 */ bgt lbl_80363438 -/* 80363394 C8 01 00 08 */ lfd f0, 8(r1) -/* 80363398 38 60 00 00 */ li r3, 0 -/* 8036339C 9B FE 00 00 */ stb r31, 0(r30) -/* 803633A0 3C 00 7F F0 */ lis r0, 0x7ff0 -/* 803633A4 38 80 00 01 */ li r4, 1 -/* 803633A8 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 803633AC 80 A1 00 20 */ lwz r5, 0x20(r1) -/* 803633B0 B0 7E 00 02 */ sth r3, 2(r30) -/* 803633B4 54 A3 00 56 */ rlwinm r3, r5, 0, 1, 0xb -/* 803633B8 7C 03 00 00 */ cmpw r3, r0 -/* 803633BC 98 9E 00 04 */ stb r4, 4(r30) -/* 803633C0 41 82 00 14 */ beq lbl_803633D4 -/* 803633C4 40 80 00 58 */ bge lbl_8036341C -/* 803633C8 2C 03 00 00 */ cmpwi r3, 0 -/* 803633CC 41 82 00 2C */ beq lbl_803633F8 -/* 803633D0 48 00 00 4C */ b lbl_8036341C -lbl_803633D4: -/* 803633D4 54 A0 03 3F */ clrlwi. r0, r5, 0xc -/* 803633D8 40 82 00 10 */ bne lbl_803633E8 -/* 803633DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803633E0 2C 00 00 00 */ cmpwi r0, 0 -/* 803633E4 41 82 00 0C */ beq lbl_803633F0 -lbl_803633E8: -/* 803633E8 38 00 00 01 */ li r0, 1 -/* 803633EC 48 00 00 34 */ b lbl_80363420 -lbl_803633F0: -/* 803633F0 38 00 00 02 */ li r0, 2 -/* 803633F4 48 00 00 2C */ b lbl_80363420 -lbl_803633F8: -/* 803633F8 54 A0 03 3F */ clrlwi. r0, r5, 0xc -/* 803633FC 40 82 00 10 */ bne lbl_8036340C -/* 80363400 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80363404 2C 00 00 00 */ cmpwi r0, 0 -/* 80363408 41 82 00 0C */ beq lbl_80363414 -lbl_8036340C: -/* 8036340C 38 00 00 05 */ li r0, 5 -/* 80363410 48 00 00 10 */ b lbl_80363420 -lbl_80363414: -/* 80363414 38 00 00 03 */ li r0, 3 -/* 80363418 48 00 00 08 */ b lbl_80363420 -lbl_8036341C: -/* 8036341C 38 00 00 04 */ li r0, 4 -lbl_80363420: -/* 80363420 2C 00 00 01 */ cmpwi r0, 1 -/* 80363424 38 00 00 49 */ li r0, 0x49 -/* 80363428 40 82 00 08 */ bne lbl_80363430 -/* 8036342C 38 00 00 4E */ li r0, 0x4e -lbl_80363430: -/* 80363430 98 1E 00 05 */ stb r0, 5(r30) -/* 80363434 48 00 02 30 */ b lbl_80363664 -lbl_80363438: -/* 80363438 7F E0 07 75 */ extsb. r0, r31 -/* 8036343C 41 82 00 0C */ beq lbl_80363448 -/* 80363440 FC 00 08 50 */ fneg f0, f1 -/* 80363444 D8 01 00 08 */ stfd f0, 8(r1) -lbl_80363448: -/* 80363448 C8 21 00 08 */ lfd f1, 8(r1) -/* 8036344C 38 61 00 10 */ addi r3, r1, 0x10 -/* 80363450 48 00 8D F5 */ bl frexp -/* 80363454 FF E0 08 90 */ fmr f31, f1 -/* 80363458 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 8036345C 81 01 00 1C */ lwz r8, 0x1c(r1) -/* 80363460 28 08 00 00 */ cmplwi r8, 0 -/* 80363464 41 82 00 70 */ beq lbl_803634D4 -/* 80363468 38 A0 00 10 */ li r5, 0x10 -/* 8036346C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 80363470 38 E0 00 00 */ li r7, 0 -/* 80363474 38 C0 00 20 */ li r6, 0x20 -/* 80363478 7C A4 2B 78 */ mr r4, r5 -/* 8036347C 38 63 FF FF */ addi r3, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 80363480 48 00 00 48 */ b lbl_803634C8 -lbl_80363484: -/* 80363484 7D 00 18 39 */ and. r0, r8, r3 -/* 80363488 40 82 00 14 */ bne lbl_8036349C -/* 8036348C 7C E7 22 14 */ add r7, r7, r4 -/* 80363490 7D 08 24 30 */ srw r8, r8, r4 -/* 80363494 7C C4 30 50 */ subf r6, r4, r6 -/* 80363498 48 00 00 0C */ b lbl_803634A4 -lbl_8036349C: -/* 8036349C 28 03 00 01 */ cmplwi r3, 1 -/* 803634A0 41 82 00 A8 */ beq lbl_80363548 -lbl_803634A4: -/* 803634A4 2C 05 00 01 */ cmpwi r5, 1 -/* 803634A8 40 81 00 10 */ ble lbl_803634B8 -/* 803634AC 54 A0 0F FE */ srwi r0, r5, 0x1f -/* 803634B0 7C 00 2A 14 */ add r0, r0, r5 -/* 803634B4 7C 05 0E 70 */ srawi r5, r0, 1 -lbl_803634B8: -/* 803634B8 28 03 00 01 */ cmplwi r3, 1 -/* 803634BC 40 81 00 0C */ ble lbl_803634C8 -/* 803634C0 7C 63 2C 30 */ srw r3, r3, r5 -/* 803634C4 7C 85 20 50 */ subf r4, r5, r4 -lbl_803634C8: -/* 803634C8 2C 06 00 00 */ cmpwi r6, 0 -/* 803634CC 40 82 FF B8 */ bne lbl_80363484 -/* 803634D0 48 00 00 78 */ b lbl_80363548 -lbl_803634D4: -/* 803634D4 80 01 00 18 */ lwz r0, 0x18(r1) -/* 803634D8 38 A0 00 10 */ li r5, 0x10 -/* 803634DC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 803634E0 38 E0 00 00 */ li r7, 0 -/* 803634E4 7C A4 2B 78 */ mr r4, r5 -/* 803634E8 64 08 00 10 */ oris r8, r0, 0x10 -/* 803634EC 38 63 FF FF */ addi r3, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 803634F0 38 C0 00 20 */ li r6, 0x20 -/* 803634F4 48 00 00 48 */ b lbl_8036353C -lbl_803634F8: -/* 803634F8 7D 00 18 39 */ and. r0, r8, r3 -/* 803634FC 40 82 00 14 */ bne lbl_80363510 -/* 80363500 7C E7 22 14 */ add r7, r7, r4 -/* 80363504 7D 08 24 30 */ srw r8, r8, r4 -/* 80363508 7C C4 30 50 */ subf r6, r4, r6 -/* 8036350C 48 00 00 0C */ b lbl_80363518 -lbl_80363510: -/* 80363510 28 03 00 01 */ cmplwi r3, 1 -/* 80363514 41 82 00 30 */ beq lbl_80363544 -lbl_80363518: -/* 80363518 2C 05 00 01 */ cmpwi r5, 1 -/* 8036351C 40 81 00 10 */ ble lbl_8036352C -/* 80363520 54 A0 0F FE */ srwi r0, r5, 0x1f -/* 80363524 7C 00 2A 14 */ add r0, r0, r5 -/* 80363528 7C 05 0E 70 */ srawi r5, r0, 1 -lbl_8036352C: -/* 8036352C 28 03 00 01 */ cmplwi r3, 1 -/* 80363530 40 81 00 0C */ ble lbl_8036353C -/* 80363534 7C 63 2C 30 */ srw r3, r3, r5 -/* 80363538 7C 85 20 50 */ subf r4, r5, r4 -lbl_8036353C: -/* 8036353C 2C 06 00 00 */ cmpwi r6, 0 -/* 80363540 40 82 FF B8 */ bne lbl_803634F8 -lbl_80363544: -/* 80363544 38 E7 00 20 */ addi r7, r7, 0x20 -lbl_80363548: -/* 80363548 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8036354C 23 47 00 35 */ subfic r26, r7, 0x35 -/* 80363550 38 61 00 38 */ addi r3, r1, 0x38 -/* 80363554 7C 9A 00 50 */ subf r4, r26, r0 -/* 80363558 48 00 01 25 */ bl __two_exp -/* 8036355C FC 20 F8 90 */ fmr f1, f31 -/* 80363560 7F 43 D3 78 */ mr r3, r26 -/* 80363564 48 00 8D 6D */ bl ldexp -/* 80363568 38 61 00 30 */ addi r3, r1, 0x30 -/* 8036356C 48 00 8F 29 */ bl modf -/* 80363570 C8 21 00 30 */ lfd f1, 0x30(r1) -/* 80363574 4B FF F1 FD */ bl __cvt_dbl_usll -/* 80363578 3B 80 00 00 */ li r28, 0 -/* 8036357C 7C 7B 1B 78 */ mr r27, r3 -/* 80363580 7C 9A 23 78 */ mr r26, r4 -/* 80363584 9B 81 00 64 */ stb r28, 0x64(r1) -/* 80363588 7F 43 E2 78 */ xor r3, r26, r28 -/* 8036358C 7F 60 E2 78 */ xor r0, r27, r28 -/* 80363590 7C 60 03 79 */ or. r0, r3, r0 -/* 80363594 40 82 00 18 */ bne lbl_803635AC -/* 80363598 38 00 00 01 */ li r0, 1 -/* 8036359C B3 81 00 66 */ sth r28, 0x66(r1) -/* 803635A0 98 01 00 68 */ stb r0, 0x68(r1) -/* 803635A4 9B 81 00 69 */ stb r28, 0x69(r1) -/* 803635A8 48 00 00 A8 */ b lbl_80363650 -lbl_803635AC: -/* 803635AC 9B 81 00 68 */ stb r28, 0x68(r1) -/* 803635B0 3B A1 00 64 */ addi r29, r1, 0x64 -/* 803635B4 48 00 00 48 */ b lbl_803635FC -lbl_803635B8: -/* 803635B8 7F 63 DB 78 */ mr r3, r27 -/* 803635BC 7F 44 D3 78 */ mr r4, r26 -/* 803635C0 38 A0 00 00 */ li r5, 0 -/* 803635C4 38 C0 00 0A */ li r6, 0xa -/* 803635C8 4B FF EE 95 */ bl __mod2u -/* 803635CC 89 01 00 68 */ lbz r8, 0x68(r1) -/* 803635D0 7F 63 DB 78 */ mr r3, r27 -/* 803635D4 38 A0 00 00 */ li r5, 0 -/* 803635D8 38 C0 00 0A */ li r6, 0xa -/* 803635DC 38 E8 00 01 */ addi r7, r8, 1 -/* 803635E0 38 08 00 05 */ addi r0, r8, 5 -/* 803635E4 98 E1 00 68 */ stb r7, 0x68(r1) -/* 803635E8 7C 9D 01 AE */ stbx r4, r29, r0 -/* 803635EC 7F 44 D3 78 */ mr r4, r26 -/* 803635F0 4B FF EC 49 */ bl __div2u -/* 803635F4 7C 9A 23 78 */ mr r26, r4 -/* 803635F8 7C 7B 1B 78 */ mr r27, r3 -lbl_803635FC: -/* 803635FC 7F 43 E2 78 */ xor r3, r26, r28 -/* 80363600 7F 60 E2 78 */ xor r0, r27, r28 -/* 80363604 7C 60 03 79 */ or. r0, r3, r0 -/* 80363608 40 82 FF B0 */ bne lbl_803635B8 -/* 8036360C 88 61 00 68 */ lbz r3, 0x68(r1) -/* 80363610 38 01 00 64 */ addi r0, r1, 0x64 -/* 80363614 38 A1 00 69 */ addi r5, r1, 0x69 -/* 80363618 38 83 00 05 */ addi r4, r3, 5 -/* 8036361C 7C 80 22 14 */ add r4, r0, r4 -/* 80363620 48 00 00 18 */ b lbl_80363638 -lbl_80363624: -/* 80363624 88 65 00 00 */ lbz r3, 0(r5) -/* 80363628 88 04 00 00 */ lbz r0, 0(r4) -/* 8036362C 98 05 00 00 */ stb r0, 0(r5) -/* 80363630 38 A5 00 01 */ addi r5, r5, 1 -/* 80363634 98 64 00 00 */ stb r3, 0(r4) -lbl_80363638: -/* 80363638 38 84 FF FF */ addi r4, r4, -1 -/* 8036363C 7C 05 20 40 */ cmplw r5, r4 -/* 80363640 41 80 FF E4 */ blt lbl_80363624 -/* 80363644 88 61 00 68 */ lbz r3, 0x68(r1) -/* 80363648 38 03 FF FF */ addi r0, r3, -1 -/* 8036364C B0 01 00 66 */ sth r0, 0x66(r1) -lbl_80363650: -/* 80363650 7F C3 F3 78 */ mr r3, r30 -/* 80363654 38 81 00 64 */ addi r4, r1, 0x64 -/* 80363658 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8036365C 48 00 17 A5 */ bl __timesdec -/* 80363660 9B FE 00 00 */ stb r31, 0(r30) -lbl_80363664: -/* 80363664 CB E1 00 A8 */ lfd f31, 0xa8(r1) -/* 80363668 BB 41 00 90 */ lmw r26, 0x90(r1) -/* 8036366C 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 80363670 7C 08 03 A6 */ mtlr r0 -/* 80363674 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80363678 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s deleted file mode 100644 index f9f9afb862..0000000000 --- a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s +++ /dev/null @@ -1,178 +0,0 @@ -lbl_80364E00: -/* 80364E00 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80364E04 3C E0 CC CD */ lis r7, 0xCCCD /* 0xCCCCCCCD@ha */ -/* 80364E08 89 85 00 04 */ lbz r12, 4(r5) -/* 80364E0C 38 00 00 00 */ li r0, 0 -/* 80364E10 BF 61 00 5C */ stmw r27, 0x5c(r1) -/* 80364E14 39 01 00 08 */ addi r8, r1, 8 -/* 80364E18 8B E4 00 04 */ lbz r31, 4(r4) -/* 80364E1C 3B AC FF FF */ addi r29, r12, -1 -/* 80364E20 39 27 CC CD */ addi r9, r7, 0xCCCD /* 0xCCCCCCCD@l */ -/* 80364E24 3B C0 00 00 */ li r30, 0 -/* 80364E28 7F BF EA 14 */ add r29, r31, r29 -/* 80364E2C 38 DD 00 01 */ addi r6, r29, 1 -/* 80364E30 7C C8 32 14 */ add r6, r8, r6 -/* 80364E34 98 03 00 00 */ stb r0, 0(r3) -/* 80364E38 7C C0 33 78 */ mr r0, r6 -/* 80364E3C 48 00 01 2C */ b lbl_80364F68 -lbl_80364E40: -/* 80364E40 39 0C FF FF */ addi r8, r12, -1 -/* 80364E44 7C E8 E8 50 */ subf r7, r8, r29 -/* 80364E48 34 E7 FF FF */ addic. r7, r7, -1 -/* 80364E4C 40 80 00 0C */ bge lbl_80364E58 -/* 80364E50 38 E0 00 00 */ li r7, 0 -/* 80364E54 39 1D FF FF */ addi r8, r29, -1 -lbl_80364E58: -/* 80364E58 39 48 00 01 */ addi r10, r8, 1 -/* 80364E5C 7D 67 F8 50 */ subf r11, r7, r31 -/* 80364E60 7C 0A 58 00 */ cmpw r10, r11 -/* 80364E64 3B 87 00 05 */ addi r28, r7, 5 -/* 80364E68 3B 68 00 05 */ addi r27, r8, 5 -/* 80364E6C 7F 84 E2 14 */ add r28, r4, r28 -/* 80364E70 7F 65 DA 14 */ add r27, r5, r27 -/* 80364E74 40 81 00 08 */ ble lbl_80364E7C -/* 80364E78 7D 6A 5B 78 */ mr r10, r11 -lbl_80364E7C: -/* 80364E7C 2C 0A 00 00 */ cmpwi r10, 0 -/* 80364E80 7D 48 53 78 */ mr r8, r10 -/* 80364E84 40 81 00 C4 */ ble lbl_80364F48 -/* 80364E88 55 47 E8 FF */ rlwinm. r7, r10, 0x1d, 3, 0x1f -/* 80364E8C 7C E9 03 A6 */ mtctr r7 -/* 80364E90 41 82 00 98 */ beq lbl_80364F28 -lbl_80364E94: -/* 80364E94 89 7C 00 00 */ lbz r11, 0(r28) -/* 80364E98 89 5B 00 00 */ lbz r10, 0(r27) -/* 80364E9C 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364EA0 89 7C 00 01 */ lbz r11, 1(r28) -/* 80364EA4 89 5B FF FF */ lbz r10, -1(r27) -/* 80364EA8 7F DE 3A 14 */ add r30, r30, r7 -/* 80364EAC 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364EB0 89 7C 00 02 */ lbz r11, 2(r28) -/* 80364EB4 89 5B FF FE */ lbz r10, -2(r27) -/* 80364EB8 7F DE 3A 14 */ add r30, r30, r7 -/* 80364EBC 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364EC0 89 7C 00 03 */ lbz r11, 3(r28) -/* 80364EC4 89 5B FF FD */ lbz r10, -3(r27) -/* 80364EC8 7F DE 3A 14 */ add r30, r30, r7 -/* 80364ECC 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364ED0 89 7C 00 04 */ lbz r11, 4(r28) -/* 80364ED4 89 5B FF FC */ lbz r10, -4(r27) -/* 80364ED8 7F DE 3A 14 */ add r30, r30, r7 -/* 80364EDC 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364EE0 89 7C 00 05 */ lbz r11, 5(r28) -/* 80364EE4 89 5B FF FB */ lbz r10, -5(r27) -/* 80364EE8 7F DE 3A 14 */ add r30, r30, r7 -/* 80364EEC 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364EF0 89 7C 00 06 */ lbz r11, 6(r28) -/* 80364EF4 89 5B FF FA */ lbz r10, -6(r27) -/* 80364EF8 7F DE 3A 14 */ add r30, r30, r7 -/* 80364EFC 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364F00 89 7C 00 07 */ lbz r11, 7(r28) -/* 80364F04 89 5B FF F9 */ lbz r10, -7(r27) -/* 80364F08 3B 9C 00 08 */ addi r28, r28, 8 -/* 80364F0C 3B 7B FF F8 */ addi r27, r27, -8 -/* 80364F10 7F DE 3A 14 */ add r30, r30, r7 -/* 80364F14 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364F18 7F DE 3A 14 */ add r30, r30, r7 -/* 80364F1C 42 00 FF 78 */ bdnz lbl_80364E94 -/* 80364F20 71 08 00 07 */ andi. r8, r8, 7 -/* 80364F24 41 82 00 24 */ beq lbl_80364F48 -lbl_80364F28: -/* 80364F28 7D 09 03 A6 */ mtctr r8 -lbl_80364F2C: -/* 80364F2C 89 7C 00 00 */ lbz r11, 0(r28) -/* 80364F30 3B 9C 00 01 */ addi r28, r28, 1 -/* 80364F34 89 5B 00 00 */ lbz r10, 0(r27) -/* 80364F38 3B 7B FF FF */ addi r27, r27, -1 -/* 80364F3C 7C EB 51 D6 */ mullw r7, r11, r10 -/* 80364F40 7F DE 3A 14 */ add r30, r30, r7 -/* 80364F44 42 00 FF E8 */ bdnz lbl_80364F2C -lbl_80364F48: -/* 80364F48 7D 09 F0 16 */ mulhwu r8, r9, r30 -/* 80364F4C 3B BD FF FF */ addi r29, r29, -1 -/* 80364F50 7D 07 43 78 */ mr r7, r8 -/* 80364F54 55 08 E8 FE */ srwi r8, r8, 3 -/* 80364F58 1D 08 00 0A */ mulli r8, r8, 0xa -/* 80364F5C 7D 08 F0 50 */ subf r8, r8, r30 -/* 80364F60 54 FE E8 FE */ srwi r30, r7, 3 -/* 80364F64 9D 06 FF FF */ stbu r8, -1(r6) -lbl_80364F68: -/* 80364F68 2C 1D 00 00 */ cmpwi r29, 0 -/* 80364F6C 41 81 FE D4 */ bgt lbl_80364E40 -/* 80364F70 A8 E4 00 02 */ lha r7, 2(r4) -/* 80364F74 28 1E 00 00 */ cmplwi r30, 0 -/* 80364F78 A8 85 00 02 */ lha r4, 2(r5) -/* 80364F7C 7C 87 22 14 */ add r4, r7, r4 -/* 80364F80 B0 83 00 02 */ sth r4, 2(r3) -/* 80364F84 41 82 00 14 */ beq lbl_80364F98 -/* 80364F88 9F C6 FF FF */ stbu r30, -1(r6) -/* 80364F8C A8 83 00 02 */ lha r4, 2(r3) -/* 80364F90 38 84 00 01 */ addi r4, r4, 1 -/* 80364F94 B0 83 00 02 */ sth r4, 2(r3) -lbl_80364F98: -/* 80364F98 38 E0 00 00 */ li r7, 0 -/* 80364F9C 48 00 00 18 */ b lbl_80364FB4 -lbl_80364FA0: -/* 80364FA0 88 A6 00 00 */ lbz r5, 0(r6) -/* 80364FA4 38 87 00 05 */ addi r4, r7, 5 -/* 80364FA8 38 E7 00 01 */ addi r7, r7, 1 -/* 80364FAC 38 C6 00 01 */ addi r6, r6, 1 -/* 80364FB0 7C A3 21 AE */ stbx r5, r3, r4 -lbl_80364FB4: -/* 80364FB4 2C 07 00 24 */ cmpwi r7, 0x24 -/* 80364FB8 40 80 00 0C */ bge lbl_80364FC4 -/* 80364FBC 7C 06 00 40 */ cmplw r6, r0 -/* 80364FC0 41 80 FF E0 */ blt lbl_80364FA0 -lbl_80364FC4: -/* 80364FC4 7C 06 00 40 */ cmplw r6, r0 -/* 80364FC8 98 E3 00 04 */ stb r7, 4(r3) -/* 80364FCC 40 80 00 A0 */ bge lbl_8036506C -/* 80364FD0 88 86 00 00 */ lbz r4, 0(r6) -/* 80364FD4 28 04 00 05 */ cmplwi r4, 5 -/* 80364FD8 41 80 00 94 */ blt lbl_8036506C -/* 80364FDC 40 82 00 38 */ bne lbl_80365014 -/* 80364FE0 38 A6 00 01 */ addi r5, r6, 1 -/* 80364FE4 7C 85 00 50 */ subf r4, r5, r0 -/* 80364FE8 7C 89 03 A6 */ mtctr r4 -/* 80364FEC 7C 05 00 40 */ cmplw r5, r0 -/* 80364FF0 40 80 00 18 */ bge lbl_80365008 -lbl_80364FF4: -/* 80364FF4 88 05 00 00 */ lbz r0, 0(r5) -/* 80364FF8 28 00 00 00 */ cmplwi r0, 0 -/* 80364FFC 40 82 00 18 */ bne lbl_80365014 -/* 80365000 38 A5 00 01 */ addi r5, r5, 1 -/* 80365004 42 00 FF F0 */ bdnz lbl_80364FF4 -lbl_80365008: -/* 80365008 88 06 FF FF */ lbz r0, -1(r6) -/* 8036500C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80365010 41 82 00 5C */ beq lbl_8036506C -lbl_80365014: -/* 80365014 88 83 00 04 */ lbz r4, 4(r3) -/* 80365018 38 C3 00 05 */ addi r6, r3, 5 -/* 8036501C 38 00 00 00 */ li r0, 0 -/* 80365020 38 A4 FF FF */ addi r5, r4, -1 -/* 80365024 7C A6 2A 14 */ add r5, r6, r5 -lbl_80365028: -/* 80365028 88 85 00 00 */ lbz r4, 0(r5) -/* 8036502C 28 04 00 09 */ cmplwi r4, 9 -/* 80365030 40 80 00 10 */ bge lbl_80365040 -/* 80365034 38 04 00 01 */ addi r0, r4, 1 -/* 80365038 98 05 00 00 */ stb r0, 0(r5) -/* 8036503C 48 00 00 30 */ b lbl_8036506C -lbl_80365040: -/* 80365040 7C 05 30 40 */ cmplw r5, r6 -/* 80365044 40 82 00 1C */ bne lbl_80365060 -/* 80365048 38 00 00 01 */ li r0, 1 -/* 8036504C 98 05 00 00 */ stb r0, 0(r5) -/* 80365050 A8 83 00 02 */ lha r4, 2(r3) -/* 80365054 38 04 00 01 */ addi r0, r4, 1 -/* 80365058 B0 03 00 02 */ sth r0, 2(r3) -/* 8036505C 48 00 00 10 */ b lbl_8036506C -lbl_80365060: -/* 80365060 98 05 00 00 */ stb r0, 0(r5) -/* 80365064 38 A5 FF FF */ addi r5, r5, -1 -/* 80365068 4B FF FF C0 */ b lbl_80365028 -lbl_8036506C: -/* 8036506C BB 61 00 5C */ lmw r27, 0x5c(r1) -/* 80365070 38 21 00 70 */ addi r1, r1, 0x70 -/* 80365074 4E 80 00 20 */ blr diff --git a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s b/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s deleted file mode 100644 index 85d8efdcf2..0000000000 --- a/asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s +++ /dev/null @@ -1,1717 +0,0 @@ -lbl_8036367C: -/* 8036367C 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80363680 7C 08 02 A6 */ mflr r0 -/* 80363684 90 01 00 74 */ stw r0, 0x74(r1) -/* 80363688 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8036368C 7C 7F 1B 78 */ mr r31, r3 -/* 80363690 93 C1 00 68 */ stw r30, 0x68(r1) -/* 80363694 7C 9E 23 78 */ mr r30, r4 -/* 80363698 38 1E 00 40 */ addi r0, r30, 0x40 -/* 8036369C 28 00 00 48 */ cmplwi r0, 0x48 -/* 803636A0 41 81 14 B8 */ bgt lbl_80364B58 -/* 803636A4 3C 60 80 3D */ lis r3, lit_1710@ha /* 0x803D2AF0@ha */ -/* 803636A8 54 00 10 3A */ slwi r0, r0, 2 -/* 803636AC 38 63 2A F0 */ addi r3, r3, lit_1710@l /* 0x803D2AF0@l */ -/* 803636B0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 803636B4 7C 09 03 A6 */ mtctr r0 -/* 803636B8 4E 80 04 20 */ bctr -/* 803636BC 38 00 FF EC */ li r0, -20 -/* 803636C0 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 803636C4 B0 1F 00 02 */ sth r0, 2(r31) -/* 803636C8 38 80 00 00 */ li r4, 0 -/* 803636CC 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 803636D0 98 9F 00 00 */ stb r4, 0(r31) -/* 803636D4 38 A3 00 25 */ addi r5, r3, 0x25 -/* 803636D8 48 00 00 1C */ b lbl_803636F4 -lbl_803636DC: -/* 803636DC 88 65 00 00 */ lbz r3, 0(r5) -/* 803636E0 38 04 00 05 */ addi r0, r4, 5 -/* 803636E4 38 A5 00 01 */ addi r5, r5, 1 -/* 803636E8 38 84 00 01 */ addi r4, r4, 1 -/* 803636EC 38 63 FF D0 */ addi r3, r3, -48 -/* 803636F0 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803636F4: -/* 803636F4 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803636F8 40 80 00 10 */ bge lbl_80363708 -/* 803636FC 88 05 00 00 */ lbz r0, 0(r5) -/* 80363700 7C 00 07 75 */ extsb. r0, r0 -/* 80363704 40 82 FF D8 */ bne lbl_803636DC -lbl_80363708: -/* 80363708 98 9F 00 04 */ stb r4, 4(r31) -/* 8036370C 88 65 00 00 */ lbz r3, 0(r5) -/* 80363710 7C 60 07 75 */ extsb. r0, r3 -/* 80363714 41 82 16 D4 */ beq lbl_80364DE8 -/* 80363718 7C 60 07 74 */ extsb r0, r3 -/* 8036371C 2C 00 00 05 */ cmpwi r0, 5 -/* 80363720 41 80 16 C8 */ blt lbl_80364DE8 -/* 80363724 41 81 00 38 */ bgt lbl_8036375C -/* 80363728 38 65 00 01 */ addi r3, r5, 1 -/* 8036372C 48 00 00 14 */ b lbl_80363740 -lbl_80363730: -/* 80363730 7C A0 07 74 */ extsb r0, r5 -/* 80363734 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363738 40 82 00 24 */ bne lbl_8036375C -/* 8036373C 38 63 00 01 */ addi r3, r3, 1 -lbl_80363740: -/* 80363740 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363744 7C A0 07 75 */ extsb. r0, r5 -/* 80363748 40 82 FF E8 */ bne lbl_80363730 -/* 8036374C 7C 7F 22 14 */ add r3, r31, r4 -/* 80363750 88 03 00 04 */ lbz r0, 4(r3) -/* 80363754 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363758 41 82 16 90 */ beq lbl_80364DE8 -lbl_8036375C: -/* 8036375C 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363760 38 BF 00 05 */ addi r5, r31, 5 -/* 80363764 38 00 00 00 */ li r0, 0 -/* 80363768 38 83 FF FF */ addi r4, r3, -1 -/* 8036376C 7C 85 22 14 */ add r4, r5, r4 -lbl_80363770: -/* 80363770 88 64 00 00 */ lbz r3, 0(r4) -/* 80363774 28 03 00 09 */ cmplwi r3, 9 -/* 80363778 40 80 00 10 */ bge lbl_80363788 -/* 8036377C 38 03 00 01 */ addi r0, r3, 1 -/* 80363780 98 04 00 00 */ stb r0, 0(r4) -/* 80363784 48 00 16 64 */ b lbl_80364DE8 -lbl_80363788: -/* 80363788 7C 04 28 40 */ cmplw r4, r5 -/* 8036378C 40 82 00 1C */ bne lbl_803637A8 -/* 80363790 38 00 00 01 */ li r0, 1 -/* 80363794 98 04 00 00 */ stb r0, 0(r4) -/* 80363798 A8 7F 00 02 */ lha r3, 2(r31) -/* 8036379C 38 03 00 01 */ addi r0, r3, 1 -/* 803637A0 B0 1F 00 02 */ sth r0, 2(r31) -/* 803637A4 48 00 16 44 */ b lbl_80364DE8 -lbl_803637A8: -/* 803637A8 98 04 00 00 */ stb r0, 0(r4) -/* 803637AC 38 84 FF FF */ addi r4, r4, -1 -/* 803637B0 4B FF FF C0 */ b lbl_80363770 -/* 803637B4 48 00 16 34 */ b lbl_80364DE8 -/* 803637B8 38 00 FF F0 */ li r0, -16 -/* 803637BC 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 803637C0 B0 1F 00 02 */ sth r0, 2(r31) -/* 803637C4 38 80 00 00 */ li r4, 0 -/* 803637C8 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 803637CC 98 9F 00 00 */ stb r4, 0(r31) -/* 803637D0 38 A3 00 53 */ addi r5, r3, 0x53 -/* 803637D4 48 00 00 1C */ b lbl_803637F0 -lbl_803637D8: -/* 803637D8 88 65 00 00 */ lbz r3, 0(r5) -/* 803637DC 38 04 00 05 */ addi r0, r4, 5 -/* 803637E0 38 A5 00 01 */ addi r5, r5, 1 -/* 803637E4 38 84 00 01 */ addi r4, r4, 1 -/* 803637E8 38 63 FF D0 */ addi r3, r3, -48 -/* 803637EC 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803637F0: -/* 803637F0 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803637F4 40 80 00 10 */ bge lbl_80363804 -/* 803637F8 88 05 00 00 */ lbz r0, 0(r5) -/* 803637FC 7C 00 07 75 */ extsb. r0, r0 -/* 80363800 40 82 FF D8 */ bne lbl_803637D8 -lbl_80363804: -/* 80363804 98 9F 00 04 */ stb r4, 4(r31) -/* 80363808 88 65 00 00 */ lbz r3, 0(r5) -/* 8036380C 7C 60 07 75 */ extsb. r0, r3 -/* 80363810 41 82 15 D8 */ beq lbl_80364DE8 -/* 80363814 7C 60 07 74 */ extsb r0, r3 -/* 80363818 2C 00 00 05 */ cmpwi r0, 5 -/* 8036381C 41 80 15 CC */ blt lbl_80364DE8 -/* 80363820 41 81 00 38 */ bgt lbl_80363858 -/* 80363824 38 65 00 01 */ addi r3, r5, 1 -/* 80363828 48 00 00 14 */ b lbl_8036383C -lbl_8036382C: -/* 8036382C 7C A0 07 74 */ extsb r0, r5 -/* 80363830 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363834 40 82 00 24 */ bne lbl_80363858 -/* 80363838 38 63 00 01 */ addi r3, r3, 1 -lbl_8036383C: -/* 8036383C 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363840 7C A0 07 75 */ extsb. r0, r5 -/* 80363844 40 82 FF E8 */ bne lbl_8036382C -/* 80363848 7C 7F 22 14 */ add r3, r31, r4 -/* 8036384C 88 03 00 04 */ lbz r0, 4(r3) -/* 80363850 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363854 41 82 15 94 */ beq lbl_80364DE8 -lbl_80363858: -/* 80363858 88 7F 00 04 */ lbz r3, 4(r31) -/* 8036385C 38 BF 00 05 */ addi r5, r31, 5 -/* 80363860 38 00 00 00 */ li r0, 0 -/* 80363864 38 83 FF FF */ addi r4, r3, -1 -/* 80363868 7C 85 22 14 */ add r4, r5, r4 -lbl_8036386C: -/* 8036386C 88 64 00 00 */ lbz r3, 0(r4) -/* 80363870 28 03 00 09 */ cmplwi r3, 9 -/* 80363874 40 80 00 10 */ bge lbl_80363884 -/* 80363878 38 03 00 01 */ addi r0, r3, 1 -/* 8036387C 98 04 00 00 */ stb r0, 0(r4) -/* 80363880 48 00 15 68 */ b lbl_80364DE8 -lbl_80363884: -/* 80363884 7C 04 28 40 */ cmplw r4, r5 -/* 80363888 40 82 00 1C */ bne lbl_803638A4 -/* 8036388C 38 00 00 01 */ li r0, 1 -/* 80363890 98 04 00 00 */ stb r0, 0(r4) -/* 80363894 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363898 38 03 00 01 */ addi r0, r3, 1 -/* 8036389C B0 1F 00 02 */ sth r0, 2(r31) -/* 803638A0 48 00 15 48 */ b lbl_80364DE8 -lbl_803638A4: -/* 803638A4 98 04 00 00 */ stb r0, 0(r4) -/* 803638A8 38 84 FF FF */ addi r4, r4, -1 -/* 803638AC 4B FF FF C0 */ b lbl_8036386C -/* 803638B0 48 00 15 38 */ b lbl_80364DE8 -/* 803638B4 38 00 FF F6 */ li r0, -10 -/* 803638B8 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 803638BC B0 1F 00 02 */ sth r0, 2(r31) -/* 803638C0 38 80 00 00 */ li r4, 0 -/* 803638C4 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 803638C8 98 9F 00 00 */ stb r4, 0(r31) -/* 803638CC 38 A3 00 7A */ addi r5, r3, 0x7a -/* 803638D0 48 00 00 1C */ b lbl_803638EC -lbl_803638D4: -/* 803638D4 88 65 00 00 */ lbz r3, 0(r5) -/* 803638D8 38 04 00 05 */ addi r0, r4, 5 -/* 803638DC 38 A5 00 01 */ addi r5, r5, 1 -/* 803638E0 38 84 00 01 */ addi r4, r4, 1 -/* 803638E4 38 63 FF D0 */ addi r3, r3, -48 -/* 803638E8 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803638EC: -/* 803638EC 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803638F0 40 80 00 10 */ bge lbl_80363900 -/* 803638F4 88 05 00 00 */ lbz r0, 0(r5) -/* 803638F8 7C 00 07 75 */ extsb. r0, r0 -/* 803638FC 40 82 FF D8 */ bne lbl_803638D4 -lbl_80363900: -/* 80363900 98 9F 00 04 */ stb r4, 4(r31) -/* 80363904 88 65 00 00 */ lbz r3, 0(r5) -/* 80363908 7C 60 07 75 */ extsb. r0, r3 -/* 8036390C 41 82 14 DC */ beq lbl_80364DE8 -/* 80363910 7C 60 07 74 */ extsb r0, r3 -/* 80363914 2C 00 00 05 */ cmpwi r0, 5 -/* 80363918 41 80 14 D0 */ blt lbl_80364DE8 -/* 8036391C 41 81 00 38 */ bgt lbl_80363954 -/* 80363920 38 65 00 01 */ addi r3, r5, 1 -/* 80363924 48 00 00 14 */ b lbl_80363938 -lbl_80363928: -/* 80363928 7C A0 07 74 */ extsb r0, r5 -/* 8036392C 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363930 40 82 00 24 */ bne lbl_80363954 -/* 80363934 38 63 00 01 */ addi r3, r3, 1 -lbl_80363938: -/* 80363938 88 A3 00 00 */ lbz r5, 0(r3) -/* 8036393C 7C A0 07 75 */ extsb. r0, r5 -/* 80363940 40 82 FF E8 */ bne lbl_80363928 -/* 80363944 7C 7F 22 14 */ add r3, r31, r4 -/* 80363948 88 03 00 04 */ lbz r0, 4(r3) -/* 8036394C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363950 41 82 14 98 */ beq lbl_80364DE8 -lbl_80363954: -/* 80363954 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363958 38 BF 00 05 */ addi r5, r31, 5 -/* 8036395C 38 00 00 00 */ li r0, 0 -/* 80363960 38 83 FF FF */ addi r4, r3, -1 -/* 80363964 7C 85 22 14 */ add r4, r5, r4 -lbl_80363968: -/* 80363968 88 64 00 00 */ lbz r3, 0(r4) -/* 8036396C 28 03 00 09 */ cmplwi r3, 9 -/* 80363970 40 80 00 10 */ bge lbl_80363980 -/* 80363974 38 03 00 01 */ addi r0, r3, 1 -/* 80363978 98 04 00 00 */ stb r0, 0(r4) -/* 8036397C 48 00 14 6C */ b lbl_80364DE8 -lbl_80363980: -/* 80363980 7C 04 28 40 */ cmplw r4, r5 -/* 80363984 40 82 00 1C */ bne lbl_803639A0 -/* 80363988 38 00 00 01 */ li r0, 1 -/* 8036398C 98 04 00 00 */ stb r0, 0(r4) -/* 80363990 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363994 38 03 00 01 */ addi r0, r3, 1 -/* 80363998 B0 1F 00 02 */ sth r0, 2(r31) -/* 8036399C 48 00 14 4C */ b lbl_80364DE8 -lbl_803639A0: -/* 803639A0 98 04 00 00 */ stb r0, 0(r4) -/* 803639A4 38 84 FF FF */ addi r4, r4, -1 -/* 803639A8 4B FF FF C0 */ b lbl_80363968 -/* 803639AC 48 00 14 3C */ b lbl_80364DE8 -/* 803639B0 38 00 FF FB */ li r0, -5 -/* 803639B4 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 803639B8 B0 1F 00 02 */ sth r0, 2(r31) -/* 803639BC 38 80 00 00 */ li r4, 0 -/* 803639C0 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 803639C4 98 9F 00 00 */ stb r4, 0(r31) -/* 803639C8 38 A3 00 92 */ addi r5, r3, 0x92 -/* 803639CC 48 00 00 1C */ b lbl_803639E8 -lbl_803639D0: -/* 803639D0 88 65 00 00 */ lbz r3, 0(r5) -/* 803639D4 38 04 00 05 */ addi r0, r4, 5 -/* 803639D8 38 A5 00 01 */ addi r5, r5, 1 -/* 803639DC 38 84 00 01 */ addi r4, r4, 1 -/* 803639E0 38 63 FF D0 */ addi r3, r3, -48 -/* 803639E4 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803639E8: -/* 803639E8 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803639EC 40 80 00 10 */ bge lbl_803639FC -/* 803639F0 88 05 00 00 */ lbz r0, 0(r5) -/* 803639F4 7C 00 07 75 */ extsb. r0, r0 -/* 803639F8 40 82 FF D8 */ bne lbl_803639D0 -lbl_803639FC: -/* 803639FC 98 9F 00 04 */ stb r4, 4(r31) -/* 80363A00 88 65 00 00 */ lbz r3, 0(r5) -/* 80363A04 7C 60 07 75 */ extsb. r0, r3 -/* 80363A08 41 82 13 E0 */ beq lbl_80364DE8 -/* 80363A0C 7C 60 07 74 */ extsb r0, r3 -/* 80363A10 2C 00 00 05 */ cmpwi r0, 5 -/* 80363A14 41 80 13 D4 */ blt lbl_80364DE8 -/* 80363A18 41 81 00 38 */ bgt lbl_80363A50 -/* 80363A1C 38 65 00 01 */ addi r3, r5, 1 -/* 80363A20 48 00 00 14 */ b lbl_80363A34 -lbl_80363A24: -/* 80363A24 7C A0 07 74 */ extsb r0, r5 -/* 80363A28 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363A2C 40 82 00 24 */ bne lbl_80363A50 -/* 80363A30 38 63 00 01 */ addi r3, r3, 1 -lbl_80363A34: -/* 80363A34 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363A38 7C A0 07 75 */ extsb. r0, r5 -/* 80363A3C 40 82 FF E8 */ bne lbl_80363A24 -/* 80363A40 7C 7F 22 14 */ add r3, r31, r4 -/* 80363A44 88 03 00 04 */ lbz r0, 4(r3) -/* 80363A48 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363A4C 41 82 13 9C */ beq lbl_80364DE8 -lbl_80363A50: -/* 80363A50 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363A54 38 BF 00 05 */ addi r5, r31, 5 -/* 80363A58 38 00 00 00 */ li r0, 0 -/* 80363A5C 38 83 FF FF */ addi r4, r3, -1 -/* 80363A60 7C 85 22 14 */ add r4, r5, r4 -lbl_80363A64: -/* 80363A64 88 64 00 00 */ lbz r3, 0(r4) -/* 80363A68 28 03 00 09 */ cmplwi r3, 9 -/* 80363A6C 40 80 00 10 */ bge lbl_80363A7C -/* 80363A70 38 03 00 01 */ addi r0, r3, 1 -/* 80363A74 98 04 00 00 */ stb r0, 0(r4) -/* 80363A78 48 00 13 70 */ b lbl_80364DE8 -lbl_80363A7C: -/* 80363A7C 7C 04 28 40 */ cmplw r4, r5 -/* 80363A80 40 82 00 1C */ bne lbl_80363A9C -/* 80363A84 38 00 00 01 */ li r0, 1 -/* 80363A88 98 04 00 00 */ stb r0, 0(r4) -/* 80363A8C A8 7F 00 02 */ lha r3, 2(r31) -/* 80363A90 38 03 00 01 */ addi r0, r3, 1 -/* 80363A94 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363A98 48 00 13 50 */ b lbl_80364DE8 -lbl_80363A9C: -/* 80363A9C 98 04 00 00 */ stb r0, 0(r4) -/* 80363AA0 38 84 FF FF */ addi r4, r4, -1 -/* 80363AA4 4B FF FF C0 */ b lbl_80363A64 -/* 80363AA8 48 00 13 40 */ b lbl_80364DE8 -/* 80363AAC 38 00 FF FD */ li r0, -3 -/* 80363AB0 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80363AB4 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363AB8 38 80 00 00 */ li r4, 0 -/* 80363ABC 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80363AC0 98 9F 00 00 */ stb r4, 0(r31) -/* 80363AC4 38 A3 00 9F */ addi r5, r3, 0x9f -/* 80363AC8 48 00 00 1C */ b lbl_80363AE4 -lbl_80363ACC: -/* 80363ACC 88 65 00 00 */ lbz r3, 0(r5) -/* 80363AD0 38 04 00 05 */ addi r0, r4, 5 -/* 80363AD4 38 A5 00 01 */ addi r5, r5, 1 -/* 80363AD8 38 84 00 01 */ addi r4, r4, 1 -/* 80363ADC 38 63 FF D0 */ addi r3, r3, -48 -/* 80363AE0 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80363AE4: -/* 80363AE4 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80363AE8 40 80 00 10 */ bge lbl_80363AF8 -/* 80363AEC 88 05 00 00 */ lbz r0, 0(r5) -/* 80363AF0 7C 00 07 75 */ extsb. r0, r0 -/* 80363AF4 40 82 FF D8 */ bne lbl_80363ACC -lbl_80363AF8: -/* 80363AF8 98 9F 00 04 */ stb r4, 4(r31) -/* 80363AFC 88 65 00 00 */ lbz r3, 0(r5) -/* 80363B00 7C 60 07 75 */ extsb. r0, r3 -/* 80363B04 41 82 12 E4 */ beq lbl_80364DE8 -/* 80363B08 7C 60 07 74 */ extsb r0, r3 -/* 80363B0C 2C 00 00 05 */ cmpwi r0, 5 -/* 80363B10 41 80 12 D8 */ blt lbl_80364DE8 -/* 80363B14 41 81 00 38 */ bgt lbl_80363B4C -/* 80363B18 38 65 00 01 */ addi r3, r5, 1 -/* 80363B1C 48 00 00 14 */ b lbl_80363B30 -lbl_80363B20: -/* 80363B20 7C A0 07 74 */ extsb r0, r5 -/* 80363B24 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363B28 40 82 00 24 */ bne lbl_80363B4C -/* 80363B2C 38 63 00 01 */ addi r3, r3, 1 -lbl_80363B30: -/* 80363B30 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363B34 7C A0 07 75 */ extsb. r0, r5 -/* 80363B38 40 82 FF E8 */ bne lbl_80363B20 -/* 80363B3C 7C 7F 22 14 */ add r3, r31, r4 -/* 80363B40 88 03 00 04 */ lbz r0, 4(r3) -/* 80363B44 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363B48 41 82 12 A0 */ beq lbl_80364DE8 -lbl_80363B4C: -/* 80363B4C 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363B50 38 BF 00 05 */ addi r5, r31, 5 -/* 80363B54 38 00 00 00 */ li r0, 0 -/* 80363B58 38 83 FF FF */ addi r4, r3, -1 -/* 80363B5C 7C 85 22 14 */ add r4, r5, r4 -lbl_80363B60: -/* 80363B60 88 64 00 00 */ lbz r3, 0(r4) -/* 80363B64 28 03 00 09 */ cmplwi r3, 9 -/* 80363B68 40 80 00 10 */ bge lbl_80363B78 -/* 80363B6C 38 03 00 01 */ addi r0, r3, 1 -/* 80363B70 98 04 00 00 */ stb r0, 0(r4) -/* 80363B74 48 00 12 74 */ b lbl_80364DE8 -lbl_80363B78: -/* 80363B78 7C 04 28 40 */ cmplw r4, r5 -/* 80363B7C 40 82 00 1C */ bne lbl_80363B98 -/* 80363B80 38 00 00 01 */ li r0, 1 -/* 80363B84 98 04 00 00 */ stb r0, 0(r4) -/* 80363B88 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363B8C 38 03 00 01 */ addi r0, r3, 1 -/* 80363B90 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363B94 48 00 12 54 */ b lbl_80364DE8 -lbl_80363B98: -/* 80363B98 98 04 00 00 */ stb r0, 0(r4) -/* 80363B9C 38 84 FF FF */ addi r4, r4, -1 -/* 80363BA0 4B FF FF C0 */ b lbl_80363B60 -/* 80363BA4 48 00 12 44 */ b lbl_80364DE8 -/* 80363BA8 38 00 FF FD */ li r0, -3 -/* 80363BAC 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80363BB0 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363BB4 38 80 00 00 */ li r4, 0 -/* 80363BB8 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80363BBC 98 9F 00 00 */ stb r4, 0(r31) -/* 80363BC0 38 A3 00 A6 */ addi r5, r3, 0xa6 -/* 80363BC4 48 00 00 1C */ b lbl_80363BE0 -lbl_80363BC8: -/* 80363BC8 88 65 00 00 */ lbz r3, 0(r5) -/* 80363BCC 38 04 00 05 */ addi r0, r4, 5 -/* 80363BD0 38 A5 00 01 */ addi r5, r5, 1 -/* 80363BD4 38 84 00 01 */ addi r4, r4, 1 -/* 80363BD8 38 63 FF D0 */ addi r3, r3, -48 -/* 80363BDC 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80363BE0: -/* 80363BE0 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80363BE4 40 80 00 10 */ bge lbl_80363BF4 -/* 80363BE8 88 05 00 00 */ lbz r0, 0(r5) -/* 80363BEC 7C 00 07 75 */ extsb. r0, r0 -/* 80363BF0 40 82 FF D8 */ bne lbl_80363BC8 -lbl_80363BF4: -/* 80363BF4 98 9F 00 04 */ stb r4, 4(r31) -/* 80363BF8 88 65 00 00 */ lbz r3, 0(r5) -/* 80363BFC 7C 60 07 75 */ extsb. r0, r3 -/* 80363C00 41 82 11 E8 */ beq lbl_80364DE8 -/* 80363C04 7C 60 07 74 */ extsb r0, r3 -/* 80363C08 2C 00 00 05 */ cmpwi r0, 5 -/* 80363C0C 41 80 11 DC */ blt lbl_80364DE8 -/* 80363C10 41 81 00 38 */ bgt lbl_80363C48 -/* 80363C14 38 65 00 01 */ addi r3, r5, 1 -/* 80363C18 48 00 00 14 */ b lbl_80363C2C -lbl_80363C1C: -/* 80363C1C 7C A0 07 74 */ extsb r0, r5 -/* 80363C20 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363C24 40 82 00 24 */ bne lbl_80363C48 -/* 80363C28 38 63 00 01 */ addi r3, r3, 1 -lbl_80363C2C: -/* 80363C2C 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363C30 7C A0 07 75 */ extsb. r0, r5 -/* 80363C34 40 82 FF E8 */ bne lbl_80363C1C -/* 80363C38 7C 7F 22 14 */ add r3, r31, r4 -/* 80363C3C 88 03 00 04 */ lbz r0, 4(r3) -/* 80363C40 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363C44 41 82 11 A4 */ beq lbl_80364DE8 -lbl_80363C48: -/* 80363C48 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363C4C 38 BF 00 05 */ addi r5, r31, 5 -/* 80363C50 38 00 00 00 */ li r0, 0 -/* 80363C54 38 83 FF FF */ addi r4, r3, -1 -/* 80363C58 7C 85 22 14 */ add r4, r5, r4 -lbl_80363C5C: -/* 80363C5C 88 64 00 00 */ lbz r3, 0(r4) -/* 80363C60 28 03 00 09 */ cmplwi r3, 9 -/* 80363C64 40 80 00 10 */ bge lbl_80363C74 -/* 80363C68 38 03 00 01 */ addi r0, r3, 1 -/* 80363C6C 98 04 00 00 */ stb r0, 0(r4) -/* 80363C70 48 00 11 78 */ b lbl_80364DE8 -lbl_80363C74: -/* 80363C74 7C 04 28 40 */ cmplw r4, r5 -/* 80363C78 40 82 00 1C */ bne lbl_80363C94 -/* 80363C7C 38 00 00 01 */ li r0, 1 -/* 80363C80 98 04 00 00 */ stb r0, 0(r4) -/* 80363C84 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363C88 38 03 00 01 */ addi r0, r3, 1 -/* 80363C8C B0 1F 00 02 */ sth r0, 2(r31) -/* 80363C90 48 00 11 58 */ b lbl_80364DE8 -lbl_80363C94: -/* 80363C94 98 04 00 00 */ stb r0, 0(r4) -/* 80363C98 38 84 FF FF */ addi r4, r4, -1 -/* 80363C9C 4B FF FF C0 */ b lbl_80363C5C -/* 80363CA0 48 00 11 48 */ b lbl_80364DE8 -/* 80363CA4 38 00 FF FE */ li r0, -2 -/* 80363CA8 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80363CAC B0 1F 00 02 */ sth r0, 2(r31) -/* 80363CB0 38 80 00 00 */ li r4, 0 -/* 80363CB4 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80363CB8 98 9F 00 00 */ stb r4, 0(r31) -/* 80363CBC 38 A3 00 AC */ addi r5, r3, 0xac -/* 80363CC0 48 00 00 1C */ b lbl_80363CDC -lbl_80363CC4: -/* 80363CC4 88 65 00 00 */ lbz r3, 0(r5) -/* 80363CC8 38 04 00 05 */ addi r0, r4, 5 -/* 80363CCC 38 A5 00 01 */ addi r5, r5, 1 -/* 80363CD0 38 84 00 01 */ addi r4, r4, 1 -/* 80363CD4 38 63 FF D0 */ addi r3, r3, -48 -/* 80363CD8 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80363CDC: -/* 80363CDC 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80363CE0 40 80 00 10 */ bge lbl_80363CF0 -/* 80363CE4 88 05 00 00 */ lbz r0, 0(r5) -/* 80363CE8 7C 00 07 75 */ extsb. r0, r0 -/* 80363CEC 40 82 FF D8 */ bne lbl_80363CC4 -lbl_80363CF0: -/* 80363CF0 98 9F 00 04 */ stb r4, 4(r31) -/* 80363CF4 88 65 00 00 */ lbz r3, 0(r5) -/* 80363CF8 7C 60 07 75 */ extsb. r0, r3 -/* 80363CFC 41 82 10 EC */ beq lbl_80364DE8 -/* 80363D00 7C 60 07 74 */ extsb r0, r3 -/* 80363D04 2C 00 00 05 */ cmpwi r0, 5 -/* 80363D08 41 80 10 E0 */ blt lbl_80364DE8 -/* 80363D0C 41 81 00 38 */ bgt lbl_80363D44 -/* 80363D10 38 65 00 01 */ addi r3, r5, 1 -/* 80363D14 48 00 00 14 */ b lbl_80363D28 -lbl_80363D18: -/* 80363D18 7C A0 07 74 */ extsb r0, r5 -/* 80363D1C 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363D20 40 82 00 24 */ bne lbl_80363D44 -/* 80363D24 38 63 00 01 */ addi r3, r3, 1 -lbl_80363D28: -/* 80363D28 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363D2C 7C A0 07 75 */ extsb. r0, r5 -/* 80363D30 40 82 FF E8 */ bne lbl_80363D18 -/* 80363D34 7C 7F 22 14 */ add r3, r31, r4 -/* 80363D38 88 03 00 04 */ lbz r0, 4(r3) -/* 80363D3C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363D40 41 82 10 A8 */ beq lbl_80364DE8 -lbl_80363D44: -/* 80363D44 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363D48 38 BF 00 05 */ addi r5, r31, 5 -/* 80363D4C 38 00 00 00 */ li r0, 0 -/* 80363D50 38 83 FF FF */ addi r4, r3, -1 -/* 80363D54 7C 85 22 14 */ add r4, r5, r4 -lbl_80363D58: -/* 80363D58 88 64 00 00 */ lbz r3, 0(r4) -/* 80363D5C 28 03 00 09 */ cmplwi r3, 9 -/* 80363D60 40 80 00 10 */ bge lbl_80363D70 -/* 80363D64 38 03 00 01 */ addi r0, r3, 1 -/* 80363D68 98 04 00 00 */ stb r0, 0(r4) -/* 80363D6C 48 00 10 7C */ b lbl_80364DE8 -lbl_80363D70: -/* 80363D70 7C 04 28 40 */ cmplw r4, r5 -/* 80363D74 40 82 00 1C */ bne lbl_80363D90 -/* 80363D78 38 00 00 01 */ li r0, 1 -/* 80363D7C 98 04 00 00 */ stb r0, 0(r4) -/* 80363D80 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363D84 38 03 00 01 */ addi r0, r3, 1 -/* 80363D88 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363D8C 48 00 10 5C */ b lbl_80364DE8 -lbl_80363D90: -/* 80363D90 98 04 00 00 */ stb r0, 0(r4) -/* 80363D94 38 84 FF FF */ addi r4, r4, -1 -/* 80363D98 4B FF FF C0 */ b lbl_80363D58 -/* 80363D9C 48 00 10 4C */ b lbl_80364DE8 -/* 80363DA0 38 00 FF FE */ li r0, -2 -/* 80363DA4 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80363DA8 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363DAC 38 80 00 00 */ li r4, 0 -/* 80363DB0 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80363DB4 98 9F 00 00 */ stb r4, 0(r31) -/* 80363DB8 38 A3 00 B2 */ addi r5, r3, 0xb2 -/* 80363DBC 48 00 00 1C */ b lbl_80363DD8 -lbl_80363DC0: -/* 80363DC0 88 65 00 00 */ lbz r3, 0(r5) -/* 80363DC4 38 04 00 05 */ addi r0, r4, 5 -/* 80363DC8 38 A5 00 01 */ addi r5, r5, 1 -/* 80363DCC 38 84 00 01 */ addi r4, r4, 1 -/* 80363DD0 38 63 FF D0 */ addi r3, r3, -48 -/* 80363DD4 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80363DD8: -/* 80363DD8 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80363DDC 40 80 00 10 */ bge lbl_80363DEC -/* 80363DE0 88 05 00 00 */ lbz r0, 0(r5) -/* 80363DE4 7C 00 07 75 */ extsb. r0, r0 -/* 80363DE8 40 82 FF D8 */ bne lbl_80363DC0 -lbl_80363DEC: -/* 80363DEC 98 9F 00 04 */ stb r4, 4(r31) -/* 80363DF0 88 65 00 00 */ lbz r3, 0(r5) -/* 80363DF4 7C 60 07 75 */ extsb. r0, r3 -/* 80363DF8 41 82 0F F0 */ beq lbl_80364DE8 -/* 80363DFC 7C 60 07 74 */ extsb r0, r3 -/* 80363E00 2C 00 00 05 */ cmpwi r0, 5 -/* 80363E04 41 80 0F E4 */ blt lbl_80364DE8 -/* 80363E08 41 81 00 38 */ bgt lbl_80363E40 -/* 80363E0C 38 65 00 01 */ addi r3, r5, 1 -/* 80363E10 48 00 00 14 */ b lbl_80363E24 -lbl_80363E14: -/* 80363E14 7C A0 07 74 */ extsb r0, r5 -/* 80363E18 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363E1C 40 82 00 24 */ bne lbl_80363E40 -/* 80363E20 38 63 00 01 */ addi r3, r3, 1 -lbl_80363E24: -/* 80363E24 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363E28 7C A0 07 75 */ extsb. r0, r5 -/* 80363E2C 40 82 FF E8 */ bne lbl_80363E14 -/* 80363E30 7C 7F 22 14 */ add r3, r31, r4 -/* 80363E34 88 03 00 04 */ lbz r0, 4(r3) -/* 80363E38 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363E3C 41 82 0F AC */ beq lbl_80364DE8 -lbl_80363E40: -/* 80363E40 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363E44 38 BF 00 05 */ addi r5, r31, 5 -/* 80363E48 38 00 00 00 */ li r0, 0 -/* 80363E4C 38 83 FF FF */ addi r4, r3, -1 -/* 80363E50 7C 85 22 14 */ add r4, r5, r4 -lbl_80363E54: -/* 80363E54 88 64 00 00 */ lbz r3, 0(r4) -/* 80363E58 28 03 00 09 */ cmplwi r3, 9 -/* 80363E5C 40 80 00 10 */ bge lbl_80363E6C -/* 80363E60 38 03 00 01 */ addi r0, r3, 1 -/* 80363E64 98 04 00 00 */ stb r0, 0(r4) -/* 80363E68 48 00 0F 80 */ b lbl_80364DE8 -lbl_80363E6C: -/* 80363E6C 7C 04 28 40 */ cmplw r4, r5 -/* 80363E70 40 82 00 1C */ bne lbl_80363E8C -/* 80363E74 38 00 00 01 */ li r0, 1 -/* 80363E78 98 04 00 00 */ stb r0, 0(r4) -/* 80363E7C A8 7F 00 02 */ lha r3, 2(r31) -/* 80363E80 38 03 00 01 */ addi r0, r3, 1 -/* 80363E84 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363E88 48 00 0F 60 */ b lbl_80364DE8 -lbl_80363E8C: -/* 80363E8C 98 04 00 00 */ stb r0, 0(r4) -/* 80363E90 38 84 FF FF */ addi r4, r4, -1 -/* 80363E94 4B FF FF C0 */ b lbl_80363E54 -/* 80363E98 48 00 0F 50 */ b lbl_80364DE8 -/* 80363E9C 38 00 FF FE */ li r0, -2 -/* 80363EA0 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80363EA4 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363EA8 38 80 00 00 */ li r4, 0 -/* 80363EAC 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80363EB0 98 9F 00 00 */ stb r4, 0(r31) -/* 80363EB4 38 A3 00 B7 */ addi r5, r3, 0xb7 -/* 80363EB8 48 00 00 1C */ b lbl_80363ED4 -lbl_80363EBC: -/* 80363EBC 88 65 00 00 */ lbz r3, 0(r5) -/* 80363EC0 38 04 00 05 */ addi r0, r4, 5 -/* 80363EC4 38 A5 00 01 */ addi r5, r5, 1 -/* 80363EC8 38 84 00 01 */ addi r4, r4, 1 -/* 80363ECC 38 63 FF D0 */ addi r3, r3, -48 -/* 80363ED0 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80363ED4: -/* 80363ED4 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80363ED8 40 80 00 10 */ bge lbl_80363EE8 -/* 80363EDC 88 05 00 00 */ lbz r0, 0(r5) -/* 80363EE0 7C 00 07 75 */ extsb. r0, r0 -/* 80363EE4 40 82 FF D8 */ bne lbl_80363EBC -lbl_80363EE8: -/* 80363EE8 98 9F 00 04 */ stb r4, 4(r31) -/* 80363EEC 88 65 00 00 */ lbz r3, 0(r5) -/* 80363EF0 7C 60 07 75 */ extsb. r0, r3 -/* 80363EF4 41 82 0E F4 */ beq lbl_80364DE8 -/* 80363EF8 7C 60 07 74 */ extsb r0, r3 -/* 80363EFC 2C 00 00 05 */ cmpwi r0, 5 -/* 80363F00 41 80 0E E8 */ blt lbl_80364DE8 -/* 80363F04 41 81 00 38 */ bgt lbl_80363F3C -/* 80363F08 38 65 00 01 */ addi r3, r5, 1 -/* 80363F0C 48 00 00 14 */ b lbl_80363F20 -lbl_80363F10: -/* 80363F10 7C A0 07 74 */ extsb r0, r5 -/* 80363F14 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80363F18 40 82 00 24 */ bne lbl_80363F3C -/* 80363F1C 38 63 00 01 */ addi r3, r3, 1 -lbl_80363F20: -/* 80363F20 88 A3 00 00 */ lbz r5, 0(r3) -/* 80363F24 7C A0 07 75 */ extsb. r0, r5 -/* 80363F28 40 82 FF E8 */ bne lbl_80363F10 -/* 80363F2C 7C 7F 22 14 */ add r3, r31, r4 -/* 80363F30 88 03 00 04 */ lbz r0, 4(r3) -/* 80363F34 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80363F38 41 82 0E B0 */ beq lbl_80364DE8 -lbl_80363F3C: -/* 80363F3C 88 7F 00 04 */ lbz r3, 4(r31) -/* 80363F40 38 BF 00 05 */ addi r5, r31, 5 -/* 80363F44 38 00 00 00 */ li r0, 0 -/* 80363F48 38 83 FF FF */ addi r4, r3, -1 -/* 80363F4C 7C 85 22 14 */ add r4, r5, r4 -lbl_80363F50: -/* 80363F50 88 64 00 00 */ lbz r3, 0(r4) -/* 80363F54 28 03 00 09 */ cmplwi r3, 9 -/* 80363F58 40 80 00 10 */ bge lbl_80363F68 -/* 80363F5C 38 03 00 01 */ addi r0, r3, 1 -/* 80363F60 98 04 00 00 */ stb r0, 0(r4) -/* 80363F64 48 00 0E 84 */ b lbl_80364DE8 -lbl_80363F68: -/* 80363F68 7C 04 28 40 */ cmplw r4, r5 -/* 80363F6C 40 82 00 1C */ bne lbl_80363F88 -/* 80363F70 38 00 00 01 */ li r0, 1 -/* 80363F74 98 04 00 00 */ stb r0, 0(r4) -/* 80363F78 A8 7F 00 02 */ lha r3, 2(r31) -/* 80363F7C 38 03 00 01 */ addi r0, r3, 1 -/* 80363F80 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363F84 48 00 0E 64 */ b lbl_80364DE8 -lbl_80363F88: -/* 80363F88 98 04 00 00 */ stb r0, 0(r4) -/* 80363F8C 38 84 FF FF */ addi r4, r4, -1 -/* 80363F90 4B FF FF C0 */ b lbl_80363F50 -/* 80363F94 48 00 0E 54 */ b lbl_80364DE8 -/* 80363F98 38 00 FF FF */ li r0, -1 -/* 80363F9C 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80363FA0 B0 1F 00 02 */ sth r0, 2(r31) -/* 80363FA4 38 80 00 00 */ li r4, 0 -/* 80363FA8 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80363FAC 98 9F 00 00 */ stb r4, 0(r31) -/* 80363FB0 38 A3 00 BB */ addi r5, r3, 0xbb -/* 80363FB4 48 00 00 1C */ b lbl_80363FD0 -lbl_80363FB8: -/* 80363FB8 88 65 00 00 */ lbz r3, 0(r5) -/* 80363FBC 38 04 00 05 */ addi r0, r4, 5 -/* 80363FC0 38 A5 00 01 */ addi r5, r5, 1 -/* 80363FC4 38 84 00 01 */ addi r4, r4, 1 -/* 80363FC8 38 63 FF D0 */ addi r3, r3, -48 -/* 80363FCC 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80363FD0: -/* 80363FD0 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80363FD4 40 80 00 10 */ bge lbl_80363FE4 -/* 80363FD8 88 05 00 00 */ lbz r0, 0(r5) -/* 80363FDC 7C 00 07 75 */ extsb. r0, r0 -/* 80363FE0 40 82 FF D8 */ bne lbl_80363FB8 -lbl_80363FE4: -/* 80363FE4 98 9F 00 04 */ stb r4, 4(r31) -/* 80363FE8 88 65 00 00 */ lbz r3, 0(r5) -/* 80363FEC 7C 60 07 75 */ extsb. r0, r3 -/* 80363FF0 41 82 0D F8 */ beq lbl_80364DE8 -/* 80363FF4 7C 60 07 74 */ extsb r0, r3 -/* 80363FF8 2C 00 00 05 */ cmpwi r0, 5 -/* 80363FFC 41 80 0D EC */ blt lbl_80364DE8 -/* 80364000 41 81 00 38 */ bgt lbl_80364038 -/* 80364004 38 65 00 01 */ addi r3, r5, 1 -/* 80364008 48 00 00 14 */ b lbl_8036401C -lbl_8036400C: -/* 8036400C 7C A0 07 74 */ extsb r0, r5 -/* 80364010 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80364014 40 82 00 24 */ bne lbl_80364038 -/* 80364018 38 63 00 01 */ addi r3, r3, 1 -lbl_8036401C: -/* 8036401C 88 A3 00 00 */ lbz r5, 0(r3) -/* 80364020 7C A0 07 75 */ extsb. r0, r5 -/* 80364024 40 82 FF E8 */ bne lbl_8036400C -/* 80364028 7C 7F 22 14 */ add r3, r31, r4 -/* 8036402C 88 03 00 04 */ lbz r0, 4(r3) -/* 80364030 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364034 41 82 0D B4 */ beq lbl_80364DE8 -lbl_80364038: -/* 80364038 88 7F 00 04 */ lbz r3, 4(r31) -/* 8036403C 38 BF 00 05 */ addi r5, r31, 5 -/* 80364040 38 00 00 00 */ li r0, 0 -/* 80364044 38 83 FF FF */ addi r4, r3, -1 -/* 80364048 7C 85 22 14 */ add r4, r5, r4 -lbl_8036404C: -/* 8036404C 88 64 00 00 */ lbz r3, 0(r4) -/* 80364050 28 03 00 09 */ cmplwi r3, 9 -/* 80364054 40 80 00 10 */ bge lbl_80364064 -/* 80364058 38 03 00 01 */ addi r0, r3, 1 -/* 8036405C 98 04 00 00 */ stb r0, 0(r4) -/* 80364060 48 00 0D 88 */ b lbl_80364DE8 -lbl_80364064: -/* 80364064 7C 04 28 40 */ cmplw r4, r5 -/* 80364068 40 82 00 1C */ bne lbl_80364084 -/* 8036406C 38 00 00 01 */ li r0, 1 -/* 80364070 98 04 00 00 */ stb r0, 0(r4) -/* 80364074 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364078 38 03 00 01 */ addi r0, r3, 1 -/* 8036407C B0 1F 00 02 */ sth r0, 2(r31) -/* 80364080 48 00 0D 68 */ b lbl_80364DE8 -lbl_80364084: -/* 80364084 98 04 00 00 */ stb r0, 0(r4) -/* 80364088 38 84 FF FF */ addi r4, r4, -1 -/* 8036408C 4B FF FF C0 */ b lbl_8036404C -/* 80364090 48 00 0D 58 */ b lbl_80364DE8 -/* 80364094 38 00 FF FF */ li r0, -1 -/* 80364098 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 8036409C B0 1F 00 02 */ sth r0, 2(r31) -/* 803640A0 38 80 00 00 */ li r4, 0 -/* 803640A4 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 803640A8 98 9F 00 00 */ stb r4, 0(r31) -/* 803640AC 38 A3 00 BF */ addi r5, r3, 0xbf -/* 803640B0 48 00 00 1C */ b lbl_803640CC -lbl_803640B4: -/* 803640B4 88 65 00 00 */ lbz r3, 0(r5) -/* 803640B8 38 04 00 05 */ addi r0, r4, 5 -/* 803640BC 38 A5 00 01 */ addi r5, r5, 1 -/* 803640C0 38 84 00 01 */ addi r4, r4, 1 -/* 803640C4 38 63 FF D0 */ addi r3, r3, -48 -/* 803640C8 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803640CC: -/* 803640CC 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803640D0 40 80 00 10 */ bge lbl_803640E0 -/* 803640D4 88 05 00 00 */ lbz r0, 0(r5) -/* 803640D8 7C 00 07 75 */ extsb. r0, r0 -/* 803640DC 40 82 FF D8 */ bne lbl_803640B4 -lbl_803640E0: -/* 803640E0 98 9F 00 04 */ stb r4, 4(r31) -/* 803640E4 88 65 00 00 */ lbz r3, 0(r5) -/* 803640E8 7C 60 07 75 */ extsb. r0, r3 -/* 803640EC 41 82 0C FC */ beq lbl_80364DE8 -/* 803640F0 7C 60 07 74 */ extsb r0, r3 -/* 803640F4 2C 00 00 05 */ cmpwi r0, 5 -/* 803640F8 41 80 0C F0 */ blt lbl_80364DE8 -/* 803640FC 41 81 00 38 */ bgt lbl_80364134 -/* 80364100 38 65 00 01 */ addi r3, r5, 1 -/* 80364104 48 00 00 14 */ b lbl_80364118 -lbl_80364108: -/* 80364108 7C A0 07 74 */ extsb r0, r5 -/* 8036410C 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80364110 40 82 00 24 */ bne lbl_80364134 -/* 80364114 38 63 00 01 */ addi r3, r3, 1 -lbl_80364118: -/* 80364118 88 A3 00 00 */ lbz r5, 0(r3) -/* 8036411C 7C A0 07 75 */ extsb. r0, r5 -/* 80364120 40 82 FF E8 */ bne lbl_80364108 -/* 80364124 7C 7F 22 14 */ add r3, r31, r4 -/* 80364128 88 03 00 04 */ lbz r0, 4(r3) -/* 8036412C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364130 41 82 0C B8 */ beq lbl_80364DE8 -lbl_80364134: -/* 80364134 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364138 38 BF 00 05 */ addi r5, r31, 5 -/* 8036413C 38 00 00 00 */ li r0, 0 -/* 80364140 38 83 FF FF */ addi r4, r3, -1 -/* 80364144 7C 85 22 14 */ add r4, r5, r4 -lbl_80364148: -/* 80364148 88 64 00 00 */ lbz r3, 0(r4) -/* 8036414C 28 03 00 09 */ cmplwi r3, 9 -/* 80364150 40 80 00 10 */ bge lbl_80364160 -/* 80364154 38 03 00 01 */ addi r0, r3, 1 -/* 80364158 98 04 00 00 */ stb r0, 0(r4) -/* 8036415C 48 00 0C 8C */ b lbl_80364DE8 -lbl_80364160: -/* 80364160 7C 04 28 40 */ cmplw r4, r5 -/* 80364164 40 82 00 1C */ bne lbl_80364180 -/* 80364168 38 00 00 01 */ li r0, 1 -/* 8036416C 98 04 00 00 */ stb r0, 0(r4) -/* 80364170 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364174 38 03 00 01 */ addi r0, r3, 1 -/* 80364178 B0 1F 00 02 */ sth r0, 2(r31) -/* 8036417C 48 00 0C 6C */ b lbl_80364DE8 -lbl_80364180: -/* 80364180 98 04 00 00 */ stb r0, 0(r4) -/* 80364184 38 84 FF FF */ addi r4, r4, -1 -/* 80364188 4B FF FF C0 */ b lbl_80364148 -/* 8036418C 48 00 0C 5C */ b lbl_80364DE8 -/* 80364190 38 00 FF FF */ li r0, -1 -/* 80364194 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364198 B0 1F 00 02 */ sth r0, 2(r31) -/* 8036419C 38 80 00 00 */ li r4, 0 -/* 803641A0 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 803641A4 98 9F 00 00 */ stb r4, 0(r31) -/* 803641A8 38 A3 00 C2 */ addi r5, r3, 0xc2 -/* 803641AC 48 00 00 1C */ b lbl_803641C8 -lbl_803641B0: -/* 803641B0 88 65 00 00 */ lbz r3, 0(r5) -/* 803641B4 38 04 00 05 */ addi r0, r4, 5 -/* 803641B8 38 A5 00 01 */ addi r5, r5, 1 -/* 803641BC 38 84 00 01 */ addi r4, r4, 1 -/* 803641C0 38 63 FF D0 */ addi r3, r3, -48 -/* 803641C4 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803641C8: -/* 803641C8 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803641CC 40 80 00 10 */ bge lbl_803641DC -/* 803641D0 88 05 00 00 */ lbz r0, 0(r5) -/* 803641D4 7C 00 07 75 */ extsb. r0, r0 -/* 803641D8 40 82 FF D8 */ bne lbl_803641B0 -lbl_803641DC: -/* 803641DC 98 9F 00 04 */ stb r4, 4(r31) -/* 803641E0 88 65 00 00 */ lbz r3, 0(r5) -/* 803641E4 7C 60 07 75 */ extsb. r0, r3 -/* 803641E8 41 82 0C 00 */ beq lbl_80364DE8 -/* 803641EC 7C 60 07 74 */ extsb r0, r3 -/* 803641F0 2C 00 00 05 */ cmpwi r0, 5 -/* 803641F4 41 80 0B F4 */ blt lbl_80364DE8 -/* 803641F8 41 81 00 38 */ bgt lbl_80364230 -/* 803641FC 38 65 00 01 */ addi r3, r5, 1 -/* 80364200 48 00 00 14 */ b lbl_80364214 -lbl_80364204: -/* 80364204 7C A0 07 74 */ extsb r0, r5 -/* 80364208 2C 00 00 30 */ cmpwi r0, 0x30 -/* 8036420C 40 82 00 24 */ bne lbl_80364230 -/* 80364210 38 63 00 01 */ addi r3, r3, 1 -lbl_80364214: -/* 80364214 88 A3 00 00 */ lbz r5, 0(r3) -/* 80364218 7C A0 07 75 */ extsb. r0, r5 -/* 8036421C 40 82 FF E8 */ bne lbl_80364204 -/* 80364220 7C 7F 22 14 */ add r3, r31, r4 -/* 80364224 88 03 00 04 */ lbz r0, 4(r3) -/* 80364228 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8036422C 41 82 0B BC */ beq lbl_80364DE8 -lbl_80364230: -/* 80364230 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364234 38 BF 00 05 */ addi r5, r31, 5 -/* 80364238 38 00 00 00 */ li r0, 0 -/* 8036423C 38 83 FF FF */ addi r4, r3, -1 -/* 80364240 7C 85 22 14 */ add r4, r5, r4 -lbl_80364244: -/* 80364244 88 64 00 00 */ lbz r3, 0(r4) -/* 80364248 28 03 00 09 */ cmplwi r3, 9 -/* 8036424C 40 80 00 10 */ bge lbl_8036425C -/* 80364250 38 03 00 01 */ addi r0, r3, 1 -/* 80364254 98 04 00 00 */ stb r0, 0(r4) -/* 80364258 48 00 0B 90 */ b lbl_80364DE8 -lbl_8036425C: -/* 8036425C 7C 04 28 40 */ cmplw r4, r5 -/* 80364260 40 82 00 1C */ bne lbl_8036427C -/* 80364264 38 00 00 01 */ li r0, 1 -/* 80364268 98 04 00 00 */ stb r0, 0(r4) -/* 8036426C A8 7F 00 02 */ lha r3, 2(r31) -/* 80364270 38 03 00 01 */ addi r0, r3, 1 -/* 80364274 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364278 48 00 0B 70 */ b lbl_80364DE8 -lbl_8036427C: -/* 8036427C 98 04 00 00 */ stb r0, 0(r4) -/* 80364280 38 84 FF FF */ addi r4, r4, -1 -/* 80364284 4B FF FF C0 */ b lbl_80364244 -/* 80364288 48 00 0B 60 */ b lbl_80364DE8 -/* 8036428C 38 80 00 00 */ li r4, 0 -/* 80364290 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364294 B0 9F 00 02 */ sth r4, 2(r31) -/* 80364298 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 8036429C 38 A3 00 C4 */ addi r5, r3, 0xc4 -/* 803642A0 98 9F 00 00 */ stb r4, 0(r31) -/* 803642A4 48 00 00 1C */ b lbl_803642C0 -lbl_803642A8: -/* 803642A8 88 65 00 00 */ lbz r3, 0(r5) -/* 803642AC 38 04 00 05 */ addi r0, r4, 5 -/* 803642B0 38 A5 00 01 */ addi r5, r5, 1 -/* 803642B4 38 84 00 01 */ addi r4, r4, 1 -/* 803642B8 38 63 FF D0 */ addi r3, r3, -48 -/* 803642BC 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803642C0: -/* 803642C0 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803642C4 40 80 00 10 */ bge lbl_803642D4 -/* 803642C8 88 05 00 00 */ lbz r0, 0(r5) -/* 803642CC 7C 00 07 75 */ extsb. r0, r0 -/* 803642D0 40 82 FF D8 */ bne lbl_803642A8 -lbl_803642D4: -/* 803642D4 98 9F 00 04 */ stb r4, 4(r31) -/* 803642D8 88 65 00 00 */ lbz r3, 0(r5) -/* 803642DC 7C 60 07 75 */ extsb. r0, r3 -/* 803642E0 41 82 0B 08 */ beq lbl_80364DE8 -/* 803642E4 7C 60 07 74 */ extsb r0, r3 -/* 803642E8 2C 00 00 05 */ cmpwi r0, 5 -/* 803642EC 41 80 0A FC */ blt lbl_80364DE8 -/* 803642F0 41 81 00 38 */ bgt lbl_80364328 -/* 803642F4 38 65 00 01 */ addi r3, r5, 1 -/* 803642F8 48 00 00 14 */ b lbl_8036430C -lbl_803642FC: -/* 803642FC 7C A0 07 74 */ extsb r0, r5 -/* 80364300 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80364304 40 82 00 24 */ bne lbl_80364328 -/* 80364308 38 63 00 01 */ addi r3, r3, 1 -lbl_8036430C: -/* 8036430C 88 A3 00 00 */ lbz r5, 0(r3) -/* 80364310 7C A0 07 75 */ extsb. r0, r5 -/* 80364314 40 82 FF E8 */ bne lbl_803642FC -/* 80364318 7C 7F 22 14 */ add r3, r31, r4 -/* 8036431C 88 03 00 04 */ lbz r0, 4(r3) -/* 80364320 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364324 41 82 0A C4 */ beq lbl_80364DE8 -lbl_80364328: -/* 80364328 88 7F 00 04 */ lbz r3, 4(r31) -/* 8036432C 38 BF 00 05 */ addi r5, r31, 5 -/* 80364330 38 00 00 00 */ li r0, 0 -/* 80364334 38 83 FF FF */ addi r4, r3, -1 -/* 80364338 7C 85 22 14 */ add r4, r5, r4 -lbl_8036433C: -/* 8036433C 88 64 00 00 */ lbz r3, 0(r4) -/* 80364340 28 03 00 09 */ cmplwi r3, 9 -/* 80364344 40 80 00 10 */ bge lbl_80364354 -/* 80364348 38 03 00 01 */ addi r0, r3, 1 -/* 8036434C 98 04 00 00 */ stb r0, 0(r4) -/* 80364350 48 00 0A 98 */ b lbl_80364DE8 -lbl_80364354: -/* 80364354 7C 04 28 40 */ cmplw r4, r5 -/* 80364358 40 82 00 1C */ bne lbl_80364374 -/* 8036435C 38 00 00 01 */ li r0, 1 -/* 80364360 98 04 00 00 */ stb r0, 0(r4) -/* 80364364 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364368 38 03 00 01 */ addi r0, r3, 1 -/* 8036436C B0 1F 00 02 */ sth r0, 2(r31) -/* 80364370 48 00 0A 78 */ b lbl_80364DE8 -lbl_80364374: -/* 80364374 98 04 00 00 */ stb r0, 0(r4) -/* 80364378 38 84 FF FF */ addi r4, r4, -1 -/* 8036437C 4B FF FF C0 */ b lbl_8036433C -/* 80364380 48 00 0A 68 */ b lbl_80364DE8 -/* 80364384 38 80 00 00 */ li r4, 0 -/* 80364388 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 8036438C B0 9F 00 02 */ sth r4, 2(r31) -/* 80364390 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364394 38 A3 00 C6 */ addi r5, r3, 0xc6 -/* 80364398 98 9F 00 00 */ stb r4, 0(r31) -/* 8036439C 48 00 00 1C */ b lbl_803643B8 -lbl_803643A0: -/* 803643A0 88 65 00 00 */ lbz r3, 0(r5) -/* 803643A4 38 04 00 05 */ addi r0, r4, 5 -/* 803643A8 38 A5 00 01 */ addi r5, r5, 1 -/* 803643AC 38 84 00 01 */ addi r4, r4, 1 -/* 803643B0 38 63 FF D0 */ addi r3, r3, -48 -/* 803643B4 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803643B8: -/* 803643B8 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803643BC 40 80 00 10 */ bge lbl_803643CC -/* 803643C0 88 05 00 00 */ lbz r0, 0(r5) -/* 803643C4 7C 00 07 75 */ extsb. r0, r0 -/* 803643C8 40 82 FF D8 */ bne lbl_803643A0 -lbl_803643CC: -/* 803643CC 98 9F 00 04 */ stb r4, 4(r31) -/* 803643D0 88 65 00 00 */ lbz r3, 0(r5) -/* 803643D4 7C 60 07 75 */ extsb. r0, r3 -/* 803643D8 41 82 0A 10 */ beq lbl_80364DE8 -/* 803643DC 7C 60 07 74 */ extsb r0, r3 -/* 803643E0 2C 00 00 05 */ cmpwi r0, 5 -/* 803643E4 41 80 0A 04 */ blt lbl_80364DE8 -/* 803643E8 41 81 00 38 */ bgt lbl_80364420 -/* 803643EC 38 65 00 01 */ addi r3, r5, 1 -/* 803643F0 48 00 00 14 */ b lbl_80364404 -lbl_803643F4: -/* 803643F4 7C A0 07 74 */ extsb r0, r5 -/* 803643F8 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803643FC 40 82 00 24 */ bne lbl_80364420 -/* 80364400 38 63 00 01 */ addi r3, r3, 1 -lbl_80364404: -/* 80364404 88 A3 00 00 */ lbz r5, 0(r3) -/* 80364408 7C A0 07 75 */ extsb. r0, r5 -/* 8036440C 40 82 FF E8 */ bne lbl_803643F4 -/* 80364410 7C 7F 22 14 */ add r3, r31, r4 -/* 80364414 88 03 00 04 */ lbz r0, 4(r3) -/* 80364418 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8036441C 41 82 09 CC */ beq lbl_80364DE8 -lbl_80364420: -/* 80364420 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364424 38 BF 00 05 */ addi r5, r31, 5 -/* 80364428 38 00 00 00 */ li r0, 0 -/* 8036442C 38 83 FF FF */ addi r4, r3, -1 -/* 80364430 7C 85 22 14 */ add r4, r5, r4 -lbl_80364434: -/* 80364434 88 64 00 00 */ lbz r3, 0(r4) -/* 80364438 28 03 00 09 */ cmplwi r3, 9 -/* 8036443C 40 80 00 10 */ bge lbl_8036444C -/* 80364440 38 03 00 01 */ addi r0, r3, 1 -/* 80364444 98 04 00 00 */ stb r0, 0(r4) -/* 80364448 48 00 09 A0 */ b lbl_80364DE8 -lbl_8036444C: -/* 8036444C 7C 04 28 40 */ cmplw r4, r5 -/* 80364450 40 82 00 1C */ bne lbl_8036446C -/* 80364454 38 00 00 01 */ li r0, 1 -/* 80364458 98 04 00 00 */ stb r0, 0(r4) -/* 8036445C A8 7F 00 02 */ lha r3, 2(r31) -/* 80364460 38 03 00 01 */ addi r0, r3, 1 -/* 80364464 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364468 48 00 09 80 */ b lbl_80364DE8 -lbl_8036446C: -/* 8036446C 98 04 00 00 */ stb r0, 0(r4) -/* 80364470 38 84 FF FF */ addi r4, r4, -1 -/* 80364474 4B FF FF C0 */ b lbl_80364434 -/* 80364478 48 00 09 70 */ b lbl_80364DE8 -/* 8036447C 38 80 00 00 */ li r4, 0 -/* 80364480 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364484 B0 9F 00 02 */ sth r4, 2(r31) -/* 80364488 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 8036448C 38 A3 00 C8 */ addi r5, r3, 0xc8 -/* 80364490 98 9F 00 00 */ stb r4, 0(r31) -/* 80364494 48 00 00 1C */ b lbl_803644B0 -lbl_80364498: -/* 80364498 88 65 00 00 */ lbz r3, 0(r5) -/* 8036449C 38 04 00 05 */ addi r0, r4, 5 -/* 803644A0 38 A5 00 01 */ addi r5, r5, 1 -/* 803644A4 38 84 00 01 */ addi r4, r4, 1 -/* 803644A8 38 63 FF D0 */ addi r3, r3, -48 -/* 803644AC 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803644B0: -/* 803644B0 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803644B4 40 80 00 10 */ bge lbl_803644C4 -/* 803644B8 88 05 00 00 */ lbz r0, 0(r5) -/* 803644BC 7C 00 07 75 */ extsb. r0, r0 -/* 803644C0 40 82 FF D8 */ bne lbl_80364498 -lbl_803644C4: -/* 803644C4 98 9F 00 04 */ stb r4, 4(r31) -/* 803644C8 88 65 00 00 */ lbz r3, 0(r5) -/* 803644CC 7C 60 07 75 */ extsb. r0, r3 -/* 803644D0 41 82 09 18 */ beq lbl_80364DE8 -/* 803644D4 7C 60 07 74 */ extsb r0, r3 -/* 803644D8 2C 00 00 05 */ cmpwi r0, 5 -/* 803644DC 41 80 09 0C */ blt lbl_80364DE8 -/* 803644E0 41 81 00 38 */ bgt lbl_80364518 -/* 803644E4 38 65 00 01 */ addi r3, r5, 1 -/* 803644E8 48 00 00 14 */ b lbl_803644FC -lbl_803644EC: -/* 803644EC 7C A0 07 74 */ extsb r0, r5 -/* 803644F0 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803644F4 40 82 00 24 */ bne lbl_80364518 -/* 803644F8 38 63 00 01 */ addi r3, r3, 1 -lbl_803644FC: -/* 803644FC 88 A3 00 00 */ lbz r5, 0(r3) -/* 80364500 7C A0 07 75 */ extsb. r0, r5 -/* 80364504 40 82 FF E8 */ bne lbl_803644EC -/* 80364508 7C 7F 22 14 */ add r3, r31, r4 -/* 8036450C 88 03 00 04 */ lbz r0, 4(r3) -/* 80364510 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364514 41 82 08 D4 */ beq lbl_80364DE8 -lbl_80364518: -/* 80364518 88 7F 00 04 */ lbz r3, 4(r31) -/* 8036451C 38 BF 00 05 */ addi r5, r31, 5 -/* 80364520 38 00 00 00 */ li r0, 0 -/* 80364524 38 83 FF FF */ addi r4, r3, -1 -/* 80364528 7C 85 22 14 */ add r4, r5, r4 -lbl_8036452C: -/* 8036452C 88 64 00 00 */ lbz r3, 0(r4) -/* 80364530 28 03 00 09 */ cmplwi r3, 9 -/* 80364534 40 80 00 10 */ bge lbl_80364544 -/* 80364538 38 03 00 01 */ addi r0, r3, 1 -/* 8036453C 98 04 00 00 */ stb r0, 0(r4) -/* 80364540 48 00 08 A8 */ b lbl_80364DE8 -lbl_80364544: -/* 80364544 7C 04 28 40 */ cmplw r4, r5 -/* 80364548 40 82 00 1C */ bne lbl_80364564 -/* 8036454C 38 00 00 01 */ li r0, 1 -/* 80364550 98 04 00 00 */ stb r0, 0(r4) -/* 80364554 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364558 38 03 00 01 */ addi r0, r3, 1 -/* 8036455C B0 1F 00 02 */ sth r0, 2(r31) -/* 80364560 48 00 08 88 */ b lbl_80364DE8 -lbl_80364564: -/* 80364564 98 04 00 00 */ stb r0, 0(r4) -/* 80364568 38 84 FF FF */ addi r4, r4, -1 -/* 8036456C 4B FF FF C0 */ b lbl_8036452C -/* 80364570 48 00 08 78 */ b lbl_80364DE8 -/* 80364574 38 80 00 00 */ li r4, 0 -/* 80364578 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 8036457C B0 9F 00 02 */ sth r4, 2(r31) -/* 80364580 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364584 38 A3 00 CA */ addi r5, r3, 0xca -/* 80364588 98 9F 00 00 */ stb r4, 0(r31) -/* 8036458C 48 00 00 1C */ b lbl_803645A8 -lbl_80364590: -/* 80364590 88 65 00 00 */ lbz r3, 0(r5) -/* 80364594 38 04 00 05 */ addi r0, r4, 5 -/* 80364598 38 A5 00 01 */ addi r5, r5, 1 -/* 8036459C 38 84 00 01 */ addi r4, r4, 1 -/* 803645A0 38 63 FF D0 */ addi r3, r3, -48 -/* 803645A4 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803645A8: -/* 803645A8 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803645AC 40 80 00 10 */ bge lbl_803645BC -/* 803645B0 88 05 00 00 */ lbz r0, 0(r5) -/* 803645B4 7C 00 07 75 */ extsb. r0, r0 -/* 803645B8 40 82 FF D8 */ bne lbl_80364590 -lbl_803645BC: -/* 803645BC 98 9F 00 04 */ stb r4, 4(r31) -/* 803645C0 88 65 00 00 */ lbz r3, 0(r5) -/* 803645C4 7C 60 07 75 */ extsb. r0, r3 -/* 803645C8 41 82 08 20 */ beq lbl_80364DE8 -/* 803645CC 7C 60 07 74 */ extsb r0, r3 -/* 803645D0 2C 00 00 05 */ cmpwi r0, 5 -/* 803645D4 41 80 08 14 */ blt lbl_80364DE8 -/* 803645D8 41 81 00 38 */ bgt lbl_80364610 -/* 803645DC 38 65 00 01 */ addi r3, r5, 1 -/* 803645E0 48 00 00 14 */ b lbl_803645F4 -lbl_803645E4: -/* 803645E4 7C A0 07 74 */ extsb r0, r5 -/* 803645E8 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803645EC 40 82 00 24 */ bne lbl_80364610 -/* 803645F0 38 63 00 01 */ addi r3, r3, 1 -lbl_803645F4: -/* 803645F4 88 A3 00 00 */ lbz r5, 0(r3) -/* 803645F8 7C A0 07 75 */ extsb. r0, r5 -/* 803645FC 40 82 FF E8 */ bne lbl_803645E4 -/* 80364600 7C 7F 22 14 */ add r3, r31, r4 -/* 80364604 88 03 00 04 */ lbz r0, 4(r3) -/* 80364608 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8036460C 41 82 07 DC */ beq lbl_80364DE8 -lbl_80364610: -/* 80364610 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364614 38 BF 00 05 */ addi r5, r31, 5 -/* 80364618 38 00 00 00 */ li r0, 0 -/* 8036461C 38 83 FF FF */ addi r4, r3, -1 -/* 80364620 7C 85 22 14 */ add r4, r5, r4 -lbl_80364624: -/* 80364624 88 64 00 00 */ lbz r3, 0(r4) -/* 80364628 28 03 00 09 */ cmplwi r3, 9 -/* 8036462C 40 80 00 10 */ bge lbl_8036463C -/* 80364630 38 03 00 01 */ addi r0, r3, 1 -/* 80364634 98 04 00 00 */ stb r0, 0(r4) -/* 80364638 48 00 07 B0 */ b lbl_80364DE8 -lbl_8036463C: -/* 8036463C 7C 04 28 40 */ cmplw r4, r5 -/* 80364640 40 82 00 1C */ bne lbl_8036465C -/* 80364644 38 00 00 01 */ li r0, 1 -/* 80364648 98 04 00 00 */ stb r0, 0(r4) -/* 8036464C A8 7F 00 02 */ lha r3, 2(r31) -/* 80364650 38 03 00 01 */ addi r0, r3, 1 -/* 80364654 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364658 48 00 07 90 */ b lbl_80364DE8 -lbl_8036465C: -/* 8036465C 98 04 00 00 */ stb r0, 0(r4) -/* 80364660 38 84 FF FF */ addi r4, r4, -1 -/* 80364664 4B FF FF C0 */ b lbl_80364624 -/* 80364668 48 00 07 80 */ b lbl_80364DE8 -/* 8036466C 38 00 00 01 */ li r0, 1 -/* 80364670 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364674 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364678 38 80 00 00 */ li r4, 0 -/* 8036467C 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364680 98 9F 00 00 */ stb r4, 0(r31) -/* 80364684 38 A3 00 CC */ addi r5, r3, 0xcc -/* 80364688 48 00 00 1C */ b lbl_803646A4 -lbl_8036468C: -/* 8036468C 88 65 00 00 */ lbz r3, 0(r5) -/* 80364690 38 04 00 05 */ addi r0, r4, 5 -/* 80364694 38 A5 00 01 */ addi r5, r5, 1 -/* 80364698 38 84 00 01 */ addi r4, r4, 1 -/* 8036469C 38 63 FF D0 */ addi r3, r3, -48 -/* 803646A0 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803646A4: -/* 803646A4 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803646A8 40 80 00 10 */ bge lbl_803646B8 -/* 803646AC 88 05 00 00 */ lbz r0, 0(r5) -/* 803646B0 7C 00 07 75 */ extsb. r0, r0 -/* 803646B4 40 82 FF D8 */ bne lbl_8036468C -lbl_803646B8: -/* 803646B8 98 9F 00 04 */ stb r4, 4(r31) -/* 803646BC 88 65 00 00 */ lbz r3, 0(r5) -/* 803646C0 7C 60 07 75 */ extsb. r0, r3 -/* 803646C4 41 82 07 24 */ beq lbl_80364DE8 -/* 803646C8 7C 60 07 74 */ extsb r0, r3 -/* 803646CC 2C 00 00 05 */ cmpwi r0, 5 -/* 803646D0 41 80 07 18 */ blt lbl_80364DE8 -/* 803646D4 41 81 00 38 */ bgt lbl_8036470C -/* 803646D8 38 65 00 01 */ addi r3, r5, 1 -/* 803646DC 48 00 00 14 */ b lbl_803646F0 -lbl_803646E0: -/* 803646E0 7C A0 07 74 */ extsb r0, r5 -/* 803646E4 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803646E8 40 82 00 24 */ bne lbl_8036470C -/* 803646EC 38 63 00 01 */ addi r3, r3, 1 -lbl_803646F0: -/* 803646F0 88 A3 00 00 */ lbz r5, 0(r3) -/* 803646F4 7C A0 07 75 */ extsb. r0, r5 -/* 803646F8 40 82 FF E8 */ bne lbl_803646E0 -/* 803646FC 7C 7F 22 14 */ add r3, r31, r4 -/* 80364700 88 03 00 04 */ lbz r0, 4(r3) -/* 80364704 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364708 41 82 06 E0 */ beq lbl_80364DE8 -lbl_8036470C: -/* 8036470C 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364710 38 BF 00 05 */ addi r5, r31, 5 -/* 80364714 38 00 00 00 */ li r0, 0 -/* 80364718 38 83 FF FF */ addi r4, r3, -1 -/* 8036471C 7C 85 22 14 */ add r4, r5, r4 -lbl_80364720: -/* 80364720 88 64 00 00 */ lbz r3, 0(r4) -/* 80364724 28 03 00 09 */ cmplwi r3, 9 -/* 80364728 40 80 00 10 */ bge lbl_80364738 -/* 8036472C 38 03 00 01 */ addi r0, r3, 1 -/* 80364730 98 04 00 00 */ stb r0, 0(r4) -/* 80364734 48 00 06 B4 */ b lbl_80364DE8 -lbl_80364738: -/* 80364738 7C 04 28 40 */ cmplw r4, r5 -/* 8036473C 40 82 00 1C */ bne lbl_80364758 -/* 80364740 38 00 00 01 */ li r0, 1 -/* 80364744 98 04 00 00 */ stb r0, 0(r4) -/* 80364748 A8 7F 00 02 */ lha r3, 2(r31) -/* 8036474C 38 03 00 01 */ addi r0, r3, 1 -/* 80364750 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364754 48 00 06 94 */ b lbl_80364DE8 -lbl_80364758: -/* 80364758 98 04 00 00 */ stb r0, 0(r4) -/* 8036475C 38 84 FF FF */ addi r4, r4, -1 -/* 80364760 4B FF FF C0 */ b lbl_80364720 -/* 80364764 48 00 06 84 */ b lbl_80364DE8 -/* 80364768 38 00 00 01 */ li r0, 1 -/* 8036476C 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364770 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364774 38 80 00 00 */ li r4, 0 -/* 80364778 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 8036477C 98 9F 00 00 */ stb r4, 0(r31) -/* 80364780 38 A3 00 CF */ addi r5, r3, 0xcf -/* 80364784 48 00 00 1C */ b lbl_803647A0 -lbl_80364788: -/* 80364788 88 65 00 00 */ lbz r3, 0(r5) -/* 8036478C 38 04 00 05 */ addi r0, r4, 5 -/* 80364790 38 A5 00 01 */ addi r5, r5, 1 -/* 80364794 38 84 00 01 */ addi r4, r4, 1 -/* 80364798 38 63 FF D0 */ addi r3, r3, -48 -/* 8036479C 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_803647A0: -/* 803647A0 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803647A4 40 80 00 10 */ bge lbl_803647B4 -/* 803647A8 88 05 00 00 */ lbz r0, 0(r5) -/* 803647AC 7C 00 07 75 */ extsb. r0, r0 -/* 803647B0 40 82 FF D8 */ bne lbl_80364788 -lbl_803647B4: -/* 803647B4 98 9F 00 04 */ stb r4, 4(r31) -/* 803647B8 88 65 00 00 */ lbz r3, 0(r5) -/* 803647BC 7C 60 07 75 */ extsb. r0, r3 -/* 803647C0 41 82 06 28 */ beq lbl_80364DE8 -/* 803647C4 7C 60 07 74 */ extsb r0, r3 -/* 803647C8 2C 00 00 05 */ cmpwi r0, 5 -/* 803647CC 41 80 06 1C */ blt lbl_80364DE8 -/* 803647D0 41 81 00 38 */ bgt lbl_80364808 -/* 803647D4 38 65 00 01 */ addi r3, r5, 1 -/* 803647D8 48 00 00 14 */ b lbl_803647EC -lbl_803647DC: -/* 803647DC 7C A0 07 74 */ extsb r0, r5 -/* 803647E0 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803647E4 40 82 00 24 */ bne lbl_80364808 -/* 803647E8 38 63 00 01 */ addi r3, r3, 1 -lbl_803647EC: -/* 803647EC 88 A3 00 00 */ lbz r5, 0(r3) -/* 803647F0 7C A0 07 75 */ extsb. r0, r5 -/* 803647F4 40 82 FF E8 */ bne lbl_803647DC -/* 803647F8 7C 7F 22 14 */ add r3, r31, r4 -/* 803647FC 88 03 00 04 */ lbz r0, 4(r3) -/* 80364800 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364804 41 82 05 E4 */ beq lbl_80364DE8 -lbl_80364808: -/* 80364808 88 7F 00 04 */ lbz r3, 4(r31) -/* 8036480C 38 BF 00 05 */ addi r5, r31, 5 -/* 80364810 38 00 00 00 */ li r0, 0 -/* 80364814 38 83 FF FF */ addi r4, r3, -1 -/* 80364818 7C 85 22 14 */ add r4, r5, r4 -lbl_8036481C: -/* 8036481C 88 64 00 00 */ lbz r3, 0(r4) -/* 80364820 28 03 00 09 */ cmplwi r3, 9 -/* 80364824 40 80 00 10 */ bge lbl_80364834 -/* 80364828 38 03 00 01 */ addi r0, r3, 1 -/* 8036482C 98 04 00 00 */ stb r0, 0(r4) -/* 80364830 48 00 05 B8 */ b lbl_80364DE8 -lbl_80364834: -/* 80364834 7C 04 28 40 */ cmplw r4, r5 -/* 80364838 40 82 00 1C */ bne lbl_80364854 -/* 8036483C 38 00 00 01 */ li r0, 1 -/* 80364840 98 04 00 00 */ stb r0, 0(r4) -/* 80364844 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364848 38 03 00 01 */ addi r0, r3, 1 -/* 8036484C B0 1F 00 02 */ sth r0, 2(r31) -/* 80364850 48 00 05 98 */ b lbl_80364DE8 -lbl_80364854: -/* 80364854 98 04 00 00 */ stb r0, 0(r4) -/* 80364858 38 84 FF FF */ addi r4, r4, -1 -/* 8036485C 4B FF FF C0 */ b lbl_8036481C -/* 80364860 48 00 05 88 */ b lbl_80364DE8 -/* 80364864 38 00 00 01 */ li r0, 1 -/* 80364868 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 8036486C B0 1F 00 02 */ sth r0, 2(r31) -/* 80364870 38 80 00 00 */ li r4, 0 -/* 80364874 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364878 98 9F 00 00 */ stb r4, 0(r31) -/* 8036487C 38 A3 00 D2 */ addi r5, r3, 0xd2 -/* 80364880 48 00 00 1C */ b lbl_8036489C -lbl_80364884: -/* 80364884 88 65 00 00 */ lbz r3, 0(r5) -/* 80364888 38 04 00 05 */ addi r0, r4, 5 -/* 8036488C 38 A5 00 01 */ addi r5, r5, 1 -/* 80364890 38 84 00 01 */ addi r4, r4, 1 -/* 80364894 38 63 FF D0 */ addi r3, r3, -48 -/* 80364898 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_8036489C: -/* 8036489C 2C 04 00 24 */ cmpwi r4, 0x24 -/* 803648A0 40 80 00 10 */ bge lbl_803648B0 -/* 803648A4 88 05 00 00 */ lbz r0, 0(r5) -/* 803648A8 7C 00 07 75 */ extsb. r0, r0 -/* 803648AC 40 82 FF D8 */ bne lbl_80364884 -lbl_803648B0: -/* 803648B0 98 9F 00 04 */ stb r4, 4(r31) -/* 803648B4 88 65 00 00 */ lbz r3, 0(r5) -/* 803648B8 7C 60 07 75 */ extsb. r0, r3 -/* 803648BC 41 82 05 2C */ beq lbl_80364DE8 -/* 803648C0 7C 60 07 74 */ extsb r0, r3 -/* 803648C4 2C 00 00 05 */ cmpwi r0, 5 -/* 803648C8 41 80 05 20 */ blt lbl_80364DE8 -/* 803648CC 41 81 00 38 */ bgt lbl_80364904 -/* 803648D0 38 65 00 01 */ addi r3, r5, 1 -/* 803648D4 48 00 00 14 */ b lbl_803648E8 -lbl_803648D8: -/* 803648D8 7C A0 07 74 */ extsb r0, r5 -/* 803648DC 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803648E0 40 82 00 24 */ bne lbl_80364904 -/* 803648E4 38 63 00 01 */ addi r3, r3, 1 -lbl_803648E8: -/* 803648E8 88 A3 00 00 */ lbz r5, 0(r3) -/* 803648EC 7C A0 07 75 */ extsb. r0, r5 -/* 803648F0 40 82 FF E8 */ bne lbl_803648D8 -/* 803648F4 7C 7F 22 14 */ add r3, r31, r4 -/* 803648F8 88 03 00 04 */ lbz r0, 4(r3) -/* 803648FC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364900 41 82 04 E8 */ beq lbl_80364DE8 -lbl_80364904: -/* 80364904 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364908 38 BF 00 05 */ addi r5, r31, 5 -/* 8036490C 38 00 00 00 */ li r0, 0 -/* 80364910 38 83 FF FF */ addi r4, r3, -1 -/* 80364914 7C 85 22 14 */ add r4, r5, r4 -lbl_80364918: -/* 80364918 88 64 00 00 */ lbz r3, 0(r4) -/* 8036491C 28 03 00 09 */ cmplwi r3, 9 -/* 80364920 40 80 00 10 */ bge lbl_80364930 -/* 80364924 38 03 00 01 */ addi r0, r3, 1 -/* 80364928 98 04 00 00 */ stb r0, 0(r4) -/* 8036492C 48 00 04 BC */ b lbl_80364DE8 -lbl_80364930: -/* 80364930 7C 04 28 40 */ cmplw r4, r5 -/* 80364934 40 82 00 1C */ bne lbl_80364950 -/* 80364938 38 00 00 01 */ li r0, 1 -/* 8036493C 98 04 00 00 */ stb r0, 0(r4) -/* 80364940 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364944 38 03 00 01 */ addi r0, r3, 1 -/* 80364948 B0 1F 00 02 */ sth r0, 2(r31) -/* 8036494C 48 00 04 9C */ b lbl_80364DE8 -lbl_80364950: -/* 80364950 98 04 00 00 */ stb r0, 0(r4) -/* 80364954 38 84 FF FF */ addi r4, r4, -1 -/* 80364958 4B FF FF C0 */ b lbl_80364918 -/* 8036495C 48 00 04 8C */ b lbl_80364DE8 -/* 80364960 38 00 00 02 */ li r0, 2 -/* 80364964 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364968 B0 1F 00 02 */ sth r0, 2(r31) -/* 8036496C 38 80 00 00 */ li r4, 0 -/* 80364970 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364974 98 9F 00 00 */ stb r4, 0(r31) -/* 80364978 38 A3 00 D5 */ addi r5, r3, 0xd5 -/* 8036497C 48 00 00 1C */ b lbl_80364998 -lbl_80364980: -/* 80364980 88 65 00 00 */ lbz r3, 0(r5) -/* 80364984 38 04 00 05 */ addi r0, r4, 5 -/* 80364988 38 A5 00 01 */ addi r5, r5, 1 -/* 8036498C 38 84 00 01 */ addi r4, r4, 1 -/* 80364990 38 63 FF D0 */ addi r3, r3, -48 -/* 80364994 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80364998: -/* 80364998 2C 04 00 24 */ cmpwi r4, 0x24 -/* 8036499C 40 80 00 10 */ bge lbl_803649AC -/* 803649A0 88 05 00 00 */ lbz r0, 0(r5) -/* 803649A4 7C 00 07 75 */ extsb. r0, r0 -/* 803649A8 40 82 FF D8 */ bne lbl_80364980 -lbl_803649AC: -/* 803649AC 98 9F 00 04 */ stb r4, 4(r31) -/* 803649B0 88 65 00 00 */ lbz r3, 0(r5) -/* 803649B4 7C 60 07 75 */ extsb. r0, r3 -/* 803649B8 41 82 04 30 */ beq lbl_80364DE8 -/* 803649BC 7C 60 07 74 */ extsb r0, r3 -/* 803649C0 2C 00 00 05 */ cmpwi r0, 5 -/* 803649C4 41 80 04 24 */ blt lbl_80364DE8 -/* 803649C8 41 81 00 38 */ bgt lbl_80364A00 -/* 803649CC 38 65 00 01 */ addi r3, r5, 1 -/* 803649D0 48 00 00 14 */ b lbl_803649E4 -lbl_803649D4: -/* 803649D4 7C A0 07 74 */ extsb r0, r5 -/* 803649D8 2C 00 00 30 */ cmpwi r0, 0x30 -/* 803649DC 40 82 00 24 */ bne lbl_80364A00 -/* 803649E0 38 63 00 01 */ addi r3, r3, 1 -lbl_803649E4: -/* 803649E4 88 A3 00 00 */ lbz r5, 0(r3) -/* 803649E8 7C A0 07 75 */ extsb. r0, r5 -/* 803649EC 40 82 FF E8 */ bne lbl_803649D4 -/* 803649F0 7C 7F 22 14 */ add r3, r31, r4 -/* 803649F4 88 03 00 04 */ lbz r0, 4(r3) -/* 803649F8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 803649FC 41 82 03 EC */ beq lbl_80364DE8 -lbl_80364A00: -/* 80364A00 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364A04 38 BF 00 05 */ addi r5, r31, 5 -/* 80364A08 38 00 00 00 */ li r0, 0 -/* 80364A0C 38 83 FF FF */ addi r4, r3, -1 -/* 80364A10 7C 85 22 14 */ add r4, r5, r4 -lbl_80364A14: -/* 80364A14 88 64 00 00 */ lbz r3, 0(r4) -/* 80364A18 28 03 00 09 */ cmplwi r3, 9 -/* 80364A1C 40 80 00 10 */ bge lbl_80364A2C -/* 80364A20 38 03 00 01 */ addi r0, r3, 1 -/* 80364A24 98 04 00 00 */ stb r0, 0(r4) -/* 80364A28 48 00 03 C0 */ b lbl_80364DE8 -lbl_80364A2C: -/* 80364A2C 7C 04 28 40 */ cmplw r4, r5 -/* 80364A30 40 82 00 1C */ bne lbl_80364A4C -/* 80364A34 38 00 00 01 */ li r0, 1 -/* 80364A38 98 04 00 00 */ stb r0, 0(r4) -/* 80364A3C A8 7F 00 02 */ lha r3, 2(r31) -/* 80364A40 38 03 00 01 */ addi r0, r3, 1 -/* 80364A44 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364A48 48 00 03 A0 */ b lbl_80364DE8 -lbl_80364A4C: -/* 80364A4C 98 04 00 00 */ stb r0, 0(r4) -/* 80364A50 38 84 FF FF */ addi r4, r4, -1 -/* 80364A54 4B FF FF C0 */ b lbl_80364A14 -/* 80364A58 48 00 03 90 */ b lbl_80364DE8 -/* 80364A5C 38 00 00 02 */ li r0, 2 -/* 80364A60 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364A64 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364A68 38 80 00 00 */ li r4, 0 -/* 80364A6C 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364A70 98 9F 00 00 */ stb r4, 0(r31) -/* 80364A74 38 A3 00 D9 */ addi r5, r3, 0xd9 -/* 80364A78 48 00 00 1C */ b lbl_80364A94 -lbl_80364A7C: -/* 80364A7C 88 65 00 00 */ lbz r3, 0(r5) -/* 80364A80 38 04 00 05 */ addi r0, r4, 5 -/* 80364A84 38 A5 00 01 */ addi r5, r5, 1 -/* 80364A88 38 84 00 01 */ addi r4, r4, 1 -/* 80364A8C 38 63 FF D0 */ addi r3, r3, -48 -/* 80364A90 7C 7F 01 AE */ stbx r3, r31, r0 -lbl_80364A94: -/* 80364A94 2C 04 00 24 */ cmpwi r4, 0x24 -/* 80364A98 40 80 00 10 */ bge lbl_80364AA8 -/* 80364A9C 88 05 00 00 */ lbz r0, 0(r5) -/* 80364AA0 7C 00 07 75 */ extsb. r0, r0 -/* 80364AA4 40 82 FF D8 */ bne lbl_80364A7C -lbl_80364AA8: -/* 80364AA8 98 9F 00 04 */ stb r4, 4(r31) -/* 80364AAC 88 65 00 00 */ lbz r3, 0(r5) -/* 80364AB0 7C 60 07 75 */ extsb. r0, r3 -/* 80364AB4 41 82 03 34 */ beq lbl_80364DE8 -/* 80364AB8 7C 60 07 74 */ extsb r0, r3 -/* 80364ABC 2C 00 00 05 */ cmpwi r0, 5 -/* 80364AC0 41 80 03 28 */ blt lbl_80364DE8 -/* 80364AC4 41 81 00 38 */ bgt lbl_80364AFC -/* 80364AC8 38 65 00 01 */ addi r3, r5, 1 -/* 80364ACC 48 00 00 14 */ b lbl_80364AE0 -lbl_80364AD0: -/* 80364AD0 7C A0 07 74 */ extsb r0, r5 -/* 80364AD4 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80364AD8 40 82 00 24 */ bne lbl_80364AFC -/* 80364ADC 38 63 00 01 */ addi r3, r3, 1 -lbl_80364AE0: -/* 80364AE0 88 A3 00 00 */ lbz r5, 0(r3) -/* 80364AE4 7C A0 07 75 */ extsb. r0, r5 -/* 80364AE8 40 82 FF E8 */ bne lbl_80364AD0 -/* 80364AEC 7C 7F 22 14 */ add r3, r31, r4 -/* 80364AF0 88 03 00 04 */ lbz r0, 4(r3) -/* 80364AF4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364AF8 41 82 02 F0 */ beq lbl_80364DE8 -lbl_80364AFC: -/* 80364AFC 88 7F 00 04 */ lbz r3, 4(r31) -/* 80364B00 38 BF 00 05 */ addi r5, r31, 5 -/* 80364B04 38 00 00 00 */ li r0, 0 -/* 80364B08 38 83 FF FF */ addi r4, r3, -1 -/* 80364B0C 7C 85 22 14 */ add r4, r5, r4 -lbl_80364B10: -/* 80364B10 88 64 00 00 */ lbz r3, 0(r4) -/* 80364B14 28 03 00 09 */ cmplwi r3, 9 -/* 80364B18 40 80 00 10 */ bge lbl_80364B28 -/* 80364B1C 38 03 00 01 */ addi r0, r3, 1 -/* 80364B20 98 04 00 00 */ stb r0, 0(r4) -/* 80364B24 48 00 02 C4 */ b lbl_80364DE8 -lbl_80364B28: -/* 80364B28 7C 04 28 40 */ cmplw r4, r5 -/* 80364B2C 40 82 00 1C */ bne lbl_80364B48 -/* 80364B30 38 00 00 01 */ li r0, 1 -/* 80364B34 98 04 00 00 */ stb r0, 0(r4) -/* 80364B38 A8 7F 00 02 */ lha r3, 2(r31) -/* 80364B3C 38 03 00 01 */ addi r0, r3, 1 -/* 80364B40 B0 1F 00 02 */ sth r0, 2(r31) -/* 80364B44 48 00 02 A4 */ b lbl_80364DE8 -lbl_80364B48: -/* 80364B48 98 04 00 00 */ stb r0, 0(r4) -/* 80364B4C 38 84 FF FF */ addi r4, r4, -1 -/* 80364B50 4B FF FF C0 */ b lbl_80364B10 -/* 80364B54 48 00 02 94 */ b lbl_80364DE8 -lbl_80364B58: -/* 80364B58 57 C0 0F FE */ srwi r0, r30, 0x1f -/* 80364B5C 38 61 00 34 */ addi r3, r1, 0x34 -/* 80364B60 7C 00 F2 14 */ add r0, r0, r30 -/* 80364B64 7C 04 0E 70 */ srawi r4, r0, 1 -/* 80364B68 4B FF EB 15 */ bl __two_exp -/* 80364B6C 38 81 00 34 */ addi r4, r1, 0x34 -/* 80364B70 7F E3 FB 78 */ mr r3, r31 -/* 80364B74 7C 85 23 78 */ mr r5, r4 -/* 80364B78 48 00 02 89 */ bl __timesdec -/* 80364B7C 57 C0 07 FF */ clrlwi. r0, r30, 0x1f -/* 80364B80 41 82 02 68 */ beq lbl_80364DE8 -/* 80364B84 80 7F 00 00 */ lwz r3, 0(r31) -/* 80364B88 2C 1E 00 00 */ cmpwi r30, 0 -/* 80364B8C 80 1F 00 04 */ lwz r0, 4(r31) -/* 80364B90 90 61 00 08 */ stw r3, 8(r1) -/* 80364B94 90 01 00 0C */ stw r0, 0xc(r1) -/* 80364B98 80 7F 00 08 */ lwz r3, 8(r31) -/* 80364B9C 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 80364BA0 90 61 00 10 */ stw r3, 0x10(r1) -/* 80364BA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80364BA8 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80364BAC 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 80364BB0 90 61 00 18 */ stw r3, 0x18(r1) -/* 80364BB4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80364BB8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 80364BBC 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80364BC0 90 61 00 20 */ stw r3, 0x20(r1) -/* 80364BC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80364BC8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80364BCC 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 80364BD0 90 61 00 28 */ stw r3, 0x28(r1) -/* 80364BD4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80364BD8 A0 1F 00 28 */ lhz r0, 0x28(r31) -/* 80364BDC B0 01 00 30 */ sth r0, 0x30(r1) -/* 80364BE0 40 81 00 FC */ ble lbl_80364CDC -/* 80364BE4 38 A0 00 00 */ li r5, 0 -/* 80364BE8 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364BEC 38 83 22 38 */ addi r4, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364BF0 B0 A1 00 36 */ sth r5, 0x36(r1) -/* 80364BF4 38 61 00 34 */ addi r3, r1, 0x34 -/* 80364BF8 98 A1 00 34 */ stb r5, 0x34(r1) -/* 80364BFC 38 C4 00 C6 */ addi r6, r4, 0xc6 -/* 80364C00 48 00 00 1C */ b lbl_80364C1C -lbl_80364C04: -/* 80364C04 88 86 00 00 */ lbz r4, 0(r6) -/* 80364C08 38 05 00 05 */ addi r0, r5, 5 -/* 80364C0C 38 C6 00 01 */ addi r6, r6, 1 -/* 80364C10 38 A5 00 01 */ addi r5, r5, 1 -/* 80364C14 38 84 FF D0 */ addi r4, r4, -48 -/* 80364C18 7C 83 01 AE */ stbx r4, r3, r0 -lbl_80364C1C: -/* 80364C1C 2C 05 00 24 */ cmpwi r5, 0x24 -/* 80364C20 40 80 00 10 */ bge lbl_80364C30 -/* 80364C24 88 06 00 00 */ lbz r0, 0(r6) -/* 80364C28 7C 00 07 75 */ extsb. r0, r0 -/* 80364C2C 40 82 FF D8 */ bne lbl_80364C04 -lbl_80364C30: -/* 80364C30 98 A1 00 38 */ stb r5, 0x38(r1) -/* 80364C34 88 66 00 00 */ lbz r3, 0(r6) -/* 80364C38 7C 60 07 75 */ extsb. r0, r3 -/* 80364C3C 41 82 01 9C */ beq lbl_80364DD8 -/* 80364C40 7C 60 07 74 */ extsb r0, r3 -/* 80364C44 2C 00 00 05 */ cmpwi r0, 5 -/* 80364C48 41 80 01 90 */ blt lbl_80364DD8 -/* 80364C4C 41 81 00 38 */ bgt lbl_80364C84 -/* 80364C50 38 66 00 01 */ addi r3, r6, 1 -/* 80364C54 48 00 00 14 */ b lbl_80364C68 -lbl_80364C58: -/* 80364C58 7C 80 07 74 */ extsb r0, r4 -/* 80364C5C 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80364C60 40 82 00 24 */ bne lbl_80364C84 -/* 80364C64 38 63 00 01 */ addi r3, r3, 1 -lbl_80364C68: -/* 80364C68 88 83 00 00 */ lbz r4, 0(r3) -/* 80364C6C 7C 80 07 75 */ extsb. r0, r4 -/* 80364C70 40 82 FF E8 */ bne lbl_80364C58 -/* 80364C74 38 61 00 38 */ addi r3, r1, 0x38 -/* 80364C78 7C 03 28 AE */ lbzx r0, r3, r5 -/* 80364C7C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364C80 41 82 01 58 */ beq lbl_80364DD8 -lbl_80364C84: -/* 80364C84 88 61 00 38 */ lbz r3, 0x38(r1) -/* 80364C88 38 A1 00 39 */ addi r5, r1, 0x39 -/* 80364C8C 38 00 00 00 */ li r0, 0 -/* 80364C90 38 83 FF FF */ addi r4, r3, -1 -/* 80364C94 7C 85 22 14 */ add r4, r5, r4 -lbl_80364C98: -/* 80364C98 88 64 00 00 */ lbz r3, 0(r4) -/* 80364C9C 28 03 00 09 */ cmplwi r3, 9 -/* 80364CA0 40 80 00 10 */ bge lbl_80364CB0 -/* 80364CA4 38 03 00 01 */ addi r0, r3, 1 -/* 80364CA8 98 04 00 00 */ stb r0, 0(r4) -/* 80364CAC 48 00 01 2C */ b lbl_80364DD8 -lbl_80364CB0: -/* 80364CB0 7C 04 28 40 */ cmplw r4, r5 -/* 80364CB4 40 82 00 1C */ bne lbl_80364CD0 -/* 80364CB8 38 00 00 01 */ li r0, 1 -/* 80364CBC 98 04 00 00 */ stb r0, 0(r4) -/* 80364CC0 A8 61 00 36 */ lha r3, 0x36(r1) -/* 80364CC4 38 03 00 01 */ addi r0, r3, 1 -/* 80364CC8 B0 01 00 36 */ sth r0, 0x36(r1) -/* 80364CCC 48 00 01 0C */ b lbl_80364DD8 -lbl_80364CD0: -/* 80364CD0 98 04 00 00 */ stb r0, 0(r4) -/* 80364CD4 38 84 FF FF */ addi r4, r4, -1 -/* 80364CD8 4B FF FF C0 */ b lbl_80364C98 -lbl_80364CDC: -/* 80364CDC 38 A0 00 00 */ li r5, 0 -/* 80364CE0 3C 60 80 3A */ lis r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@ha /* 0x803A2238@ha */ -/* 80364CE4 38 00 FF FF */ li r0, -1 -/* 80364CE8 98 A1 00 34 */ stb r5, 0x34(r1) -/* 80364CEC 38 63 22 38 */ addi r3, r3, MSL_Common_Embedded_Src_ansi_fp__stringBase0@l /* 0x803A2238@l */ -/* 80364CF0 38 C3 00 C2 */ addi r6, r3, 0xc2 -/* 80364CF4 B0 01 00 36 */ sth r0, 0x36(r1) -/* 80364CF8 38 61 00 34 */ addi r3, r1, 0x34 -/* 80364CFC 48 00 00 1C */ b lbl_80364D18 -lbl_80364D00: -/* 80364D00 88 86 00 00 */ lbz r4, 0(r6) -/* 80364D04 38 05 00 05 */ addi r0, r5, 5 -/* 80364D08 38 C6 00 01 */ addi r6, r6, 1 -/* 80364D0C 38 A5 00 01 */ addi r5, r5, 1 -/* 80364D10 38 84 FF D0 */ addi r4, r4, -48 -/* 80364D14 7C 83 01 AE */ stbx r4, r3, r0 -lbl_80364D18: -/* 80364D18 2C 05 00 24 */ cmpwi r5, 0x24 -/* 80364D1C 40 80 00 10 */ bge lbl_80364D2C -/* 80364D20 88 06 00 00 */ lbz r0, 0(r6) -/* 80364D24 7C 00 07 75 */ extsb. r0, r0 -/* 80364D28 40 82 FF D8 */ bne lbl_80364D00 -lbl_80364D2C: -/* 80364D2C 98 A1 00 38 */ stb r5, 0x38(r1) -/* 80364D30 88 66 00 00 */ lbz r3, 0(r6) -/* 80364D34 7C 60 07 75 */ extsb. r0, r3 -/* 80364D38 41 82 00 A0 */ beq lbl_80364DD8 -/* 80364D3C 7C 60 07 74 */ extsb r0, r3 -/* 80364D40 2C 00 00 05 */ cmpwi r0, 5 -/* 80364D44 41 80 00 94 */ blt lbl_80364DD8 -/* 80364D48 41 81 00 38 */ bgt lbl_80364D80 -/* 80364D4C 38 66 00 01 */ addi r3, r6, 1 -/* 80364D50 48 00 00 14 */ b lbl_80364D64 -lbl_80364D54: -/* 80364D54 7C 80 07 74 */ extsb r0, r4 -/* 80364D58 2C 00 00 30 */ cmpwi r0, 0x30 -/* 80364D5C 40 82 00 24 */ bne lbl_80364D80 -/* 80364D60 38 63 00 01 */ addi r3, r3, 1 -lbl_80364D64: -/* 80364D64 88 83 00 00 */ lbz r4, 0(r3) -/* 80364D68 7C 80 07 75 */ extsb. r0, r4 -/* 80364D6C 40 82 FF E8 */ bne lbl_80364D54 -/* 80364D70 38 61 00 38 */ addi r3, r1, 0x38 -/* 80364D74 7C 03 28 AE */ lbzx r0, r3, r5 -/* 80364D78 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80364D7C 41 82 00 5C */ beq lbl_80364DD8 -lbl_80364D80: -/* 80364D80 88 61 00 38 */ lbz r3, 0x38(r1) -/* 80364D84 38 A1 00 39 */ addi r5, r1, 0x39 -/* 80364D88 38 00 00 00 */ li r0, 0 -/* 80364D8C 38 83 FF FF */ addi r4, r3, -1 -/* 80364D90 7C 85 22 14 */ add r4, r5, r4 -lbl_80364D94: -/* 80364D94 88 64 00 00 */ lbz r3, 0(r4) -/* 80364D98 28 03 00 09 */ cmplwi r3, 9 -/* 80364D9C 40 80 00 10 */ bge lbl_80364DAC -/* 80364DA0 38 03 00 01 */ addi r0, r3, 1 -/* 80364DA4 98 04 00 00 */ stb r0, 0(r4) -/* 80364DA8 48 00 00 30 */ b lbl_80364DD8 -lbl_80364DAC: -/* 80364DAC 7C 04 28 40 */ cmplw r4, r5 -/* 80364DB0 40 82 00 1C */ bne lbl_80364DCC -/* 80364DB4 38 00 00 01 */ li r0, 1 -/* 80364DB8 98 04 00 00 */ stb r0, 0(r4) -/* 80364DBC A8 61 00 36 */ lha r3, 0x36(r1) -/* 80364DC0 38 03 00 01 */ addi r0, r3, 1 -/* 80364DC4 B0 01 00 36 */ sth r0, 0x36(r1) -/* 80364DC8 48 00 00 10 */ b lbl_80364DD8 -lbl_80364DCC: -/* 80364DCC 98 04 00 00 */ stb r0, 0(r4) -/* 80364DD0 38 84 FF FF */ addi r4, r4, -1 -/* 80364DD4 4B FF FF C0 */ b lbl_80364D94 -lbl_80364DD8: -/* 80364DD8 7F E3 FB 78 */ mr r3, r31 -/* 80364DDC 38 81 00 08 */ addi r4, r1, 8 -/* 80364DE0 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80364DE4 48 00 00 1D */ bl __timesdec -lbl_80364DE8: -/* 80364DE8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80364DEC 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 80364DF0 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 80364DF4 7C 08 03 A6 */ mtlr r0 -/* 80364DF8 38 21 00 70 */ addi r1, r1, 0x70 -/* 80364DFC 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_phase/cPhs_Do__FP30request_of_phase_process_classPv.s b/asm/SSystem/SComponent/c_phase/cPhs_Do__FP30request_of_phase_process_classPv.s deleted file mode 100644 index da3f827b57..0000000000 --- a/asm/SSystem/SComponent/c_phase/cPhs_Do__FP30request_of_phase_process_classPv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802666D8: -/* 802666D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802666DC 7C 08 02 A6 */ mflr r0 -/* 802666E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802666E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802666E8 7C 7F 1B 78 */ mr r31, r3 -/* 802666EC 80 A3 00 00 */ lwz r5, 0(r3) -/* 802666F0 28 05 00 00 */ cmplwi r5, 0 -/* 802666F4 41 82 00 A0 */ beq lbl_80266794 -/* 802666F8 80 1F 00 04 */ lwz r0, 4(r31) -/* 802666FC 54 00 10 3A */ slwi r0, r0, 2 -/* 80266700 7C 83 23 78 */ mr r3, r4 -/* 80266704 7D 85 00 2E */ lwzx r12, r5, r0 -/* 80266708 7D 89 03 A6 */ mtctr r12 -/* 8026670C 4E 80 04 21 */ bctrl -/* 80266710 2C 03 00 03 */ cmpwi r3, 3 -/* 80266714 41 82 00 5C */ beq lbl_80266770 -/* 80266718 40 80 00 14 */ bge lbl_8026672C -/* 8026671C 2C 03 00 01 */ cmpwi r3, 1 -/* 80266720 41 82 00 1C */ beq lbl_8026673C -/* 80266724 40 80 00 24 */ bge lbl_80266748 -/* 80266728 48 00 00 70 */ b lbl_80266798 -lbl_8026672C: -/* 8026672C 2C 03 00 05 */ cmpwi r3, 5 -/* 80266730 41 82 00 50 */ beq lbl_80266780 -/* 80266734 40 80 00 64 */ bge lbl_80266798 -/* 80266738 48 00 00 2C */ b lbl_80266764 -lbl_8026673C: -/* 8026673C 7F E3 FB 78 */ mr r3, r31 -/* 80266740 4B FF FF 39 */ bl cPhs_Next -/* 80266744 48 00 00 54 */ b lbl_80266798 -lbl_80266748: -/* 80266748 7F E3 FB 78 */ mr r3, r31 -/* 8026674C 4B FF FF 2D */ bl cPhs_Next -/* 80266750 2C 03 00 01 */ cmpwi r3, 1 -/* 80266754 38 60 00 04 */ li r3, 4 -/* 80266758 40 82 00 40 */ bne lbl_80266798 -/* 8026675C 38 60 00 02 */ li r3, 2 -/* 80266760 48 00 00 38 */ b lbl_80266798 -lbl_80266764: -/* 80266764 7F E3 FB 78 */ mr r3, r31 -/* 80266768 4B FF FF 01 */ bl cPhs_Compleate -/* 8026676C 48 00 00 2C */ b lbl_80266798 -lbl_80266770: -/* 80266770 7F E3 FB 78 */ mr r3, r31 -/* 80266774 4B FF FE CD */ bl cPhs_UnCompleate -/* 80266778 38 60 00 03 */ li r3, 3 -/* 8026677C 48 00 00 1C */ b lbl_80266798 -lbl_80266780: -/* 80266780 7F E3 FB 78 */ mr r3, r31 -/* 80266784 4B FF FE BD */ bl cPhs_UnCompleate -/* 80266788 38 60 00 05 */ li r3, 5 -/* 8026678C 48 00 00 0C */ b lbl_80266798 -/* 80266790 48 00 00 08 */ b lbl_80266798 -lbl_80266794: -/* 80266794 4B FF FE D5 */ bl cPhs_Compleate -lbl_80266798: -/* 80266798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026679C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802667A0 7C 08 03 A6 */ mtlr r0 -/* 802667A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802667A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/CreateHeap__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/CreateHeap__12daObjRgate_cFv.s deleted file mode 100644 index 79d6e444db..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/CreateHeap__12daObjRgate_cFv.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_80CBA654: -/* 80CBA654 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CBA658 7C 08 02 A6 */ mflr r0 -/* 80CBA65C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CBA660 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CBA664 4B 6A 7B 75 */ bl _savegpr_28 -/* 80CBA668 7C 7E 1B 78 */ mr r30, r3 -/* 80CBA66C 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA670 38 63 C4 C0 */ addi r3, r3, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA674 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBA678 38 80 00 05 */ li r4, 5 -/* 80CBA67C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBA680 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBA684 3F E5 00 02 */ addis r31, r5, 2 -/* 80CBA688 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80CBA68C 7F E5 FB 78 */ mr r5, r31 -/* 80CBA690 38 C0 00 80 */ li r6, 0x80 -/* 80CBA694 4B 38 1C 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CBA698 3C 80 00 08 */ lis r4, 8 -/* 80CBA69C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CBA6A0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CBA6A4 4B 35 A5 B1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CBA6A8 90 7E 05 A8 */ stw r3, 0x5a8(r30) -/* 80CBA6AC 80 1E 05 A8 */ lwz r0, 0x5a8(r30) -/* 80CBA6B0 28 00 00 00 */ cmplwi r0, 0 -/* 80CBA6B4 40 82 00 0C */ bne lbl_80CBA6C0 -/* 80CBA6B8 38 60 00 00 */ li r3, 0 -/* 80CBA6BC 48 00 01 54 */ b lbl_80CBA810 -lbl_80CBA6C0: -/* 80CBA6C0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80CBA6C4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CBA6C8 28 00 00 FF */ cmplwi r0, 0xff -/* 80CBA6CC 41 82 00 D0 */ beq lbl_80CBA79C -/* 80CBA6D0 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA6D4 38 63 C4 C0 */ addi r3, r3, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA6D8 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBA6DC 38 80 00 07 */ li r4, 7 -/* 80CBA6E0 7F E5 FB 78 */ mr r5, r31 -/* 80CBA6E4 38 C0 00 80 */ li r6, 0x80 -/* 80CBA6E8 4B 38 1C 05 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CBA6EC 7C 7D 1B 78 */ mr r29, r3 -/* 80CBA6F0 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA6F4 38 63 C4 C0 */ addi r3, r3, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA6F8 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBA6FC 38 80 00 05 */ li r4, 5 -/* 80CBA700 7F E5 FB 78 */ mr r5, r31 -/* 80CBA704 38 C0 00 80 */ li r6, 0x80 -/* 80CBA708 4B 38 1B E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CBA70C 7C 7C 1B 78 */ mr r28, r3 -/* 80CBA710 7F A3 EB 78 */ mr r3, r29 -/* 80CBA714 7F 84 E3 78 */ mr r4, r28 -/* 80CBA718 4B 35 41 1D */ bl mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData -/* 80CBA71C 7F A3 EB 78 */ mr r3, r29 -/* 80CBA720 3C 80 00 08 */ lis r4, 8 -/* 80CBA724 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CBA728 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CBA72C 4B 35 A5 29 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CBA730 90 7E 05 AC */ stw r3, 0x5ac(r30) -/* 80CBA734 80 1E 05 AC */ lwz r0, 0x5ac(r30) -/* 80CBA738 28 00 00 00 */ cmplwi r0, 0 -/* 80CBA73C 40 82 00 0C */ bne lbl_80CBA748 -/* 80CBA740 38 60 00 00 */ li r3, 0 -/* 80CBA744 48 00 00 CC */ b lbl_80CBA810 -lbl_80CBA748: -/* 80CBA748 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA74C 38 63 C4 C0 */ addi r3, r3, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA750 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBA754 38 80 00 06 */ li r4, 6 -/* 80CBA758 7F E5 FB 78 */ mr r5, r31 -/* 80CBA75C 38 C0 00 80 */ li r6, 0x80 -/* 80CBA760 4B 38 1B 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CBA764 7C 7D 1B 78 */ mr r29, r3 -/* 80CBA768 7F 84 E3 78 */ mr r4, r28 -/* 80CBA76C 4B 35 40 C9 */ bl mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData -/* 80CBA770 7F A3 EB 78 */ mr r3, r29 -/* 80CBA774 3C 80 00 08 */ lis r4, 8 -/* 80CBA778 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CBA77C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CBA780 4B 35 A4 D5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CBA784 90 7E 05 B0 */ stw r3, 0x5b0(r30) -/* 80CBA788 80 1E 05 B0 */ lwz r0, 0x5b0(r30) -/* 80CBA78C 28 00 00 00 */ cmplwi r0, 0 -/* 80CBA790 40 82 00 0C */ bne lbl_80CBA79C -/* 80CBA794 38 60 00 00 */ li r3, 0 -/* 80CBA798 48 00 00 78 */ b lbl_80CBA810 -lbl_80CBA79C: -/* 80CBA79C 38 60 00 C0 */ li r3, 0xc0 -/* 80CBA7A0 4B 61 44 AD */ bl __nw__FUl -/* 80CBA7A4 7C 60 1B 79 */ or. r0, r3, r3 -/* 80CBA7A8 41 82 00 0C */ beq lbl_80CBA7B4 -/* 80CBA7AC 4B 3C 11 C5 */ bl __ct__4dBgWFv -/* 80CBA7B0 7C 60 1B 78 */ mr r0, r3 -lbl_80CBA7B4: -/* 80CBA7B4 90 1E 0A E0 */ stw r0, 0xae0(r30) -/* 80CBA7B8 80 1E 0A E0 */ lwz r0, 0xae0(r30) -/* 80CBA7BC 28 00 00 00 */ cmplwi r0, 0 -/* 80CBA7C0 41 82 00 3C */ beq lbl_80CBA7FC -/* 80CBA7C4 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA7C8 38 63 C4 C0 */ addi r3, r3, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA7CC 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBA7D0 38 80 00 0A */ li r4, 0xa -/* 80CBA7D4 7F E5 FB 78 */ mr r5, r31 -/* 80CBA7D8 38 C0 00 80 */ li r6, 0x80 -/* 80CBA7DC 4B 38 1B 11 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CBA7E0 7C 64 1B 78 */ mr r4, r3 -/* 80CBA7E4 80 7E 0A E0 */ lwz r3, 0xae0(r30) -/* 80CBA7E8 38 A0 00 01 */ li r5, 1 -/* 80CBA7EC 38 DE 0A E4 */ addi r6, r30, 0xae4 -/* 80CBA7F0 4B 3B F7 49 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80CBA7F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CBA7F8 41 82 00 14 */ beq lbl_80CBA80C -lbl_80CBA7FC: -/* 80CBA7FC 38 00 00 00 */ li r0, 0 -/* 80CBA800 90 1E 0A E0 */ stw r0, 0xae0(r30) -/* 80CBA804 38 60 00 00 */ li r3, 0 -/* 80CBA808 48 00 00 08 */ b lbl_80CBA810 -lbl_80CBA80C: -/* 80CBA80C 38 60 00 01 */ li r3, 1 -lbl_80CBA810: -/* 80CBA810 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CBA814 4B 6A 7A 11 */ bl _restgpr_28 -/* 80CBA818 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CBA81C 7C 08 03 A6 */ mtlr r0 -/* 80CBA820 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CBA824 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Create__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Create__12daObjRgate_cFv.s deleted file mode 100644 index dd9cc6ace3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Create__12daObjRgate_cFv.s +++ /dev/null @@ -1,133 +0,0 @@ -lbl_80CBA468: -/* 80CBA468 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBA46C 7C 08 02 A6 */ mflr r0 -/* 80CBA470 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBA474 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBA478 7C 7F 1B 78 */ mr r31, r3 -/* 80CBA47C 3C 60 80 CC */ lis r3, struct_80CBC5CC+0x0@ha /* 0x80CBC5CC@ha */ -/* 80CBA480 38 83 C5 CC */ addi r4, r3, struct_80CBC5CC+0x0@l /* 0x80CBC5CC@l */ -/* 80CBA484 88 04 00 00 */ lbz r0, 0(r4) -/* 80CBA488 7C 00 07 75 */ extsb. r0, r0 -/* 80CBA48C 40 82 00 20 */ bne lbl_80CBA4AC -/* 80CBA490 3C 60 80 CC */ lis r3, d_a_obj_rgate__stringBase0@ha /* 0x80CBC458@ha */ -/* 80CBA494 38 63 C4 58 */ addi r3, r3, d_a_obj_rgate__stringBase0@l /* 0x80CBC458@l */ -/* 80CBA498 38 03 00 0A */ addi r0, r3, 0xa -/* 80CBA49C 3C 60 80 CC */ lis r3, l_evName@ha /* 0x80CBC5C8@ha */ -/* 80CBA4A0 90 03 C5 C8 */ stw r0, l_evName@l(r3) /* 0x80CBC5C8@l */ -/* 80CBA4A4 38 00 00 01 */ li r0, 1 -/* 80CBA4A8 98 04 00 00 */ stb r0, 0(r4) -lbl_80CBA4AC: -/* 80CBA4AC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CBA4B0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CBA4B4 28 04 00 FF */ cmplwi r4, 0xff -/* 80CBA4B8 41 82 00 90 */ beq lbl_80CBA548 -/* 80CBA4BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBA4C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBA4C4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CBA4C8 7C 05 07 74 */ extsb r5, r0 -/* 80CBA4CC 4B 37 AE 95 */ bl isSwitch__10dSv_info_cCFii -/* 80CBA4D0 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBA4D4 40 82 00 74 */ bne lbl_80CBA548 -/* 80CBA4D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBA4DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBA4E0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80CBA4E4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80CBA4E8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80CBA4EC A0 84 00 88 */ lhz r4, 0x88(r4) -/* 80CBA4F0 4B 37 A4 CD */ bl isEventBit__11dSv_event_cCFUs -/* 80CBA4F4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBA4F8 40 82 00 50 */ bne lbl_80CBA548 -/* 80CBA4FC 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA500 80 03 C4 C0 */ lwz r0, l_arcName@l(r3) /* 0x80CBC4C0@l */ -/* 80CBA504 90 1F 01 00 */ stw r0, 0x100(r31) -/* 80CBA508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBA50C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBA510 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80CBA514 7F E4 FB 78 */ mr r4, r31 -/* 80CBA518 3C A0 80 CC */ lis r5, l_evName@ha /* 0x80CBC5C8@ha */ -/* 80CBA51C 38 A5 C5 C8 */ addi r5, r5, l_evName@l /* 0x80CBC5C8@l */ -/* 80CBA520 80 A5 00 00 */ lwz r5, 0(r5) -/* 80CBA524 38 C0 00 FF */ li r6, 0xff -/* 80CBA528 4B 38 D2 31 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80CBA52C B0 7F 0B A2 */ sth r3, 0xba2(r31) -/* 80CBA530 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CBA534 54 00 66 3E */ rlwinm r0, r0, 0xc, 0x18, 0x1f -/* 80CBA538 98 1F 0B A1 */ stb r0, 0xba1(r31) -/* 80CBA53C 38 00 00 00 */ li r0, 0 -/* 80CBA540 98 1F 0B A0 */ stb r0, 0xba0(r31) -/* 80CBA544 48 00 00 1C */ b lbl_80CBA560 -lbl_80CBA548: -/* 80CBA548 38 00 FF FF */ li r0, -1 -/* 80CBA54C B0 1F 0B A2 */ sth r0, 0xba2(r31) -/* 80CBA550 38 00 00 FF */ li r0, 0xff -/* 80CBA554 98 1F 0B A1 */ stb r0, 0xba1(r31) -/* 80CBA558 38 00 00 02 */ li r0, 2 -/* 80CBA55C 98 1F 0B A0 */ stb r0, 0xba0(r31) -lbl_80CBA560: -/* 80CBA560 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 80CBA564 3C 60 80 CC */ lis r3, lit_4114@ha /* 0x80CBC400@ha */ -/* 80CBA568 C0 23 C4 00 */ lfs f1, lit_4114@l(r3) /* 0x80CBC400@l */ -/* 80CBA56C EC 00 08 2A */ fadds f0, f0, f1 -/* 80CBA570 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80CBA574 C0 1F 05 3C */ lfs f0, 0x53c(r31) -/* 80CBA578 EC 00 08 2A */ fadds f0, f0, f1 -/* 80CBA57C D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80CBA580 38 00 00 20 */ li r0, 0x20 -/* 80CBA584 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80CBA588 7F E3 FB 78 */ mr r3, r31 -/* 80CBA58C 4B FF F8 6D */ bl initBaseMtx__12daObjRgate_cFv -/* 80CBA590 38 1F 0B 14 */ addi r0, r31, 0xb14 -/* 80CBA594 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CBA598 7F E3 FB 78 */ mr r3, r31 -/* 80CBA59C 3C 80 80 CC */ lis r4, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CBA5A0 C4 24 C3 68 */ lfsu f1, l_cull_box@l(r4) /* 0x80CBC368@l */ -/* 80CBA5A4 C0 44 00 04 */ lfs f2, 4(r4) -/* 80CBA5A8 C0 64 00 08 */ lfs f3, 8(r4) -/* 80CBA5AC C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80CBA5B0 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 80CBA5B4 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80CBA5B8 4B 35 FF 91 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80CBA5BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBA5C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBA5C4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CBA5C8 80 9F 0A E0 */ lwz r4, 0xae0(r31) -/* 80CBA5CC 7F E5 FB 78 */ mr r5, r31 -/* 80CBA5D0 4B 3B A4 39 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80CBA5D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CBA5D8 41 82 00 0C */ beq lbl_80CBA5E4 -/* 80CBA5DC 38 60 00 00 */ li r3, 0 -/* 80CBA5E0 48 00 00 60 */ b lbl_80CBA640 -lbl_80CBA5E4: -/* 80CBA5E4 38 C0 00 00 */ li r6, 0 -/* 80CBA5E8 3C 60 80 CC */ lis r3, nodeCallBack__FP8J3DJointi@ha /* 0x80CB9CE8@ha */ -/* 80CBA5EC 38 83 9C E8 */ addi r4, r3, nodeCallBack__FP8J3DJointi@l /* 0x80CB9CE8@l */ -/* 80CBA5F0 48 00 00 34 */ b lbl_80CBA624 -lbl_80CBA5F4: -/* 80CBA5F4 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80CBA5F8 2C 00 00 01 */ cmpwi r0, 1 -/* 80CBA5FC 41 82 00 0C */ beq lbl_80CBA608 -/* 80CBA600 2C 00 00 02 */ cmpwi r0, 2 -/* 80CBA604 40 82 00 1C */ bne lbl_80CBA620 -lbl_80CBA608: -/* 80CBA608 80 65 00 28 */ lwz r3, 0x28(r5) -/* 80CBA60C 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 80CBA610 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80CBA614 90 83 00 04 */ stw r4, 4(r3) -/* 80CBA618 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CBA61C 93 E3 00 14 */ stw r31, 0x14(r3) -lbl_80CBA620: -/* 80CBA620 38 C6 00 01 */ addi r6, r6, 1 -lbl_80CBA624: -/* 80CBA624 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CBA628 80 A3 00 04 */ lwz r5, 4(r3) -/* 80CBA62C A0 65 00 2C */ lhz r3, 0x2c(r5) -/* 80CBA630 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80CBA634 7C 00 18 40 */ cmplw r0, r3 -/* 80CBA638 41 80 FF BC */ blt lbl_80CBA5F4 -/* 80CBA63C 38 60 00 01 */ li r3, 1 -lbl_80CBA640: -/* 80CBA640 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBA644 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBA648 7C 08 03 A6 */ mtlr r0 -/* 80CBA64C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBA650 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Delete__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Delete__12daObjRgate_cFv.s deleted file mode 100644 index 67c91b1846..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Delete__12daObjRgate_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CBBF34: -/* 80CBBF34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBF38 7C 08 02 A6 */ mflr r0 -/* 80CBBF3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBF40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBBF44 7C 7F 1B 78 */ mr r31, r3 -/* 80CBBF48 80 63 0A E0 */ lwz r3, 0xae0(r3) -/* 80CBBF4C 28 03 00 00 */ cmplwi r3, 0 -/* 80CBBF50 41 82 00 24 */ beq lbl_80CBBF74 -/* 80CBBF54 4B 5A C2 81 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80CBBF58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CBBF5C 41 82 00 18 */ beq lbl_80CBBF74 -/* 80CBBF60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBF64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBF68 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CBBF6C 80 9F 0A E0 */ lwz r4, 0xae0(r31) -/* 80CBBF70 4B 3B 82 E1 */ bl Release__4cBgSFP9dBgW_Base -lbl_80CBBF74: -/* 80CBBF74 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80CBBF78 3C 80 80 CC */ lis r4, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBBF7C 38 84 C4 C0 */ addi r4, r4, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBBF80 80 84 00 00 */ lwz r4, 0(r4) -/* 80CBBF84 4B 37 10 85 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CBBF88 38 60 00 01 */ li r3, 1 -/* 80CBBF8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBBF90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBBF94 7C 08 03 A6 */ mtlr r0 -/* 80CBBF98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBBF9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Draw__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Draw__12daObjRgate_cFv.s deleted file mode 100644 index 0c00f2003b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Draw__12daObjRgate_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80CBBE18: -/* 80CBBE18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBE1C 7C 08 02 A6 */ mflr r0 -/* 80CBBE20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBE24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBBE28 93 C1 00 08 */ stw r30, 8(r1) -/* 80CBBE2C 7C 7F 1B 78 */ mr r31, r3 -/* 80CBBE30 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CBBE34 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CBBE38 38 80 00 10 */ li r4, 0x10 -/* 80CBBE3C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CBBE40 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80CBBE44 4B 4E 79 81 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CBBE48 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CBBE4C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CBBE50 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80CBBE54 80 84 00 04 */ lwz r4, 4(r4) -/* 80CBBE58 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80CBBE5C 4B 4E 8F 45 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CBBE60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBE64 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBE68 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80CBBE6C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CBBE70 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CBBE74 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80CBBE78 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80CBBE7C 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80CBBE80 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CBBE84 4B 35 1E 41 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CBBE88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBE8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBE90 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CBBE94 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80CBBE98 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CBBE9C 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80CBBEA0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CBBEA4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CBBEA8 28 00 00 FF */ cmplwi r0, 0xff -/* 80CBBEAC 41 82 00 6C */ beq lbl_80CBBF18 -/* 80CBBEB0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CBBEB4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CBBEB8 38 80 00 10 */ li r4, 0x10 -/* 80CBBEBC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CBBEC0 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80CBBEC4 4B 4E 79 01 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CBBEC8 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80CBBECC 28 04 00 00 */ cmplwi r4, 0 -/* 80CBBED0 41 82 00 20 */ beq lbl_80CBBEF0 -/* 80CBBED4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CBBED8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CBBEDC 80 84 00 04 */ lwz r4, 4(r4) -/* 80CBBEE0 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80CBBEE4 4B 4E 8E BD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CBBEE8 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80CBBEEC 4B 35 1D D9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80CBBEF0: -/* 80CBBEF0 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80CBBEF4 28 04 00 00 */ cmplwi r4, 0 -/* 80CBBEF8 41 82 00 20 */ beq lbl_80CBBF18 -/* 80CBBEFC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CBBF00 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CBBF04 80 84 00 04 */ lwz r4, 4(r4) -/* 80CBBF08 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80CBBF0C 4B 4E 8E 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CBBF10 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80CBBF14 4B 35 1D B1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80CBBF18: -/* 80CBBF18 38 60 00 01 */ li r3, 1 -/* 80CBBF1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBBF20 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CBBF24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBBF28 7C 08 03 A6 */ mtlr r0 -/* 80CBBF2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBBF30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Execute__12daObjRgate_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Execute__12daObjRgate_cFPPA3_A4_f.s deleted file mode 100644 index e2151ad594..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Execute__12daObjRgate_cFPPA3_A4_f.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80CBBDB0: -/* 80CBBDB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBDB4 7C 08 02 A6 */ mflr r0 -/* 80CBBDB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBDBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBBDC0 93 C1 00 08 */ stw r30, 8(r1) -/* 80CBBDC4 7C 7E 1B 78 */ mr r30, r3 -/* 80CBBDC8 7C 9F 23 78 */ mr r31, r4 -/* 80CBBDCC 4B FF FD 95 */ bl event_proc_call__12daObjRgate_cFv -/* 80CBBDD0 7F C3 F3 78 */ mr r3, r30 -/* 80CBBDD4 4B FF F5 35 */ bl action__12daObjRgate_cFv -/* 80CBBDD8 80 7E 0B 98 */ lwz r3, 0xb98(r30) -/* 80CBBDDC 38 03 00 01 */ addi r0, r3, 1 -/* 80CBBDE0 90 1E 0B 98 */ stw r0, 0xb98(r30) -/* 80CBBDE4 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80CBBDE8 90 1F 00 00 */ stw r0, 0(r31) -/* 80CBBDEC 7F C3 F3 78 */ mr r3, r30 -/* 80CBBDF0 4B FF E1 5D */ bl setBaseMtx__12daObjRgate_cFv -/* 80CBBDF4 80 7E 0A E0 */ lwz r3, 0xae0(r30) -/* 80CBBDF8 4B 3B FB C9 */ bl Move__4dBgWFv -/* 80CBBDFC 38 60 00 01 */ li r3, 1 -/* 80CBBE00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBBE04 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CBBE08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBBE0C 7C 08 03 A6 */ mtlr r0 -/* 80CBBE10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBBE14 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__ct__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__ct__8dCcD_CylFv.s deleted file mode 100644 index afccf8fa36..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__ct__8dCcD_CylFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80CBC120: -/* 80CBC120 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC124 7C 08 02 A6 */ mflr r0 -/* 80CBC128 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC12C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBC130 7C 7F 1B 78 */ mr r31, r3 -/* 80CBC134 4B 3C 78 F5 */ bl __ct__12dCcD_GObjInfFv -/* 80CBC138 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CBC13C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CBC140 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80CBC144 3C 60 80 CC */ lis r3, __vt__8cM3dGAab@ha /* 0x80CBC584@ha */ -/* 80CBC148 38 03 C5 84 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CBC584@l */ -/* 80CBC14C 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80CBC150 3C 60 80 CC */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CBC590@ha */ -/* 80CBC154 38 03 C5 90 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CBC590@l */ -/* 80CBC158 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80CBC15C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CBC160 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CBC164 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80CBC168 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CBC16C 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80CBC170 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CBC174 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CBC178 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80CBC17C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CBC180 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80CBC184 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CBC188 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80CBC18C 7F E3 FB 78 */ mr r3, r31 -/* 80CBC190 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC194 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC198 7C 08 03 A6 */ mtlr r0 -/* 80CBC19C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC1A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 6bf6d25303..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CBC2FC: -/* 80CBC2FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC300 7C 08 02 A6 */ mflr r0 -/* 80CBC304 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC308 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBC30C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CBC310 41 82 00 1C */ beq lbl_80CBC32C -/* 80CBC314 3C A0 80 CC */ lis r5, __vt__10cCcD_GStts@ha /* 0x80CBC56C@ha */ -/* 80CBC318 38 05 C5 6C */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80CBC56C@l */ -/* 80CBC31C 90 1F 00 00 */ stw r0, 0(r31) -/* 80CBC320 7C 80 07 35 */ extsh. r0, r4 -/* 80CBC324 40 81 00 08 */ ble lbl_80CBC32C -/* 80CBC328 4B 61 2A 15 */ bl __dl__FPv -lbl_80CBC32C: -/* 80CBC32C 7F E3 FB 78 */ mr r3, r31 -/* 80CBC330 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC334 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC338 7C 08 03 A6 */ mtlr r0 -/* 80CBC33C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC340 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 2802875c17..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CBC234: -/* 80CBC234 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC238 7C 08 02 A6 */ mflr r0 -/* 80CBC23C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC240 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBC244 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CBC248 41 82 00 30 */ beq lbl_80CBC278 -/* 80CBC24C 3C 60 80 CC */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CBC578@ha */ -/* 80CBC250 38 03 C5 78 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CBC578@l */ -/* 80CBC254 90 1F 00 00 */ stw r0, 0(r31) -/* 80CBC258 41 82 00 10 */ beq lbl_80CBC268 -/* 80CBC25C 3C 60 80 CC */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CBC56C@ha */ -/* 80CBC260 38 03 C5 6C */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CBC56C@l */ -/* 80CBC264 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CBC268: -/* 80CBC268 7C 80 07 35 */ extsh. r0, r4 -/* 80CBC26C 40 81 00 0C */ ble lbl_80CBC278 -/* 80CBC270 7F E3 FB 78 */ mr r3, r31 -/* 80CBC274 4B 61 2A C9 */ bl __dl__FPv -lbl_80CBC278: -/* 80CBC278 7F E3 FB 78 */ mr r3, r31 -/* 80CBC27C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC280 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC284 7C 08 03 A6 */ mtlr r0 -/* 80CBC288 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC28C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGAabFv.s deleted file mode 100644 index 435e80d804..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CBC1EC: -/* 80CBC1EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC1F0 7C 08 02 A6 */ mflr r0 -/* 80CBC1F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC1F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBC1FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CBC200 41 82 00 1C */ beq lbl_80CBC21C -/* 80CBC204 3C A0 80 CC */ lis r5, __vt__8cM3dGAab@ha /* 0x80CBC584@ha */ -/* 80CBC208 38 05 C5 84 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80CBC584@l */ -/* 80CBC20C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80CBC210 7C 80 07 35 */ extsh. r0, r4 -/* 80CBC214 40 81 00 08 */ ble lbl_80CBC21C -/* 80CBC218 4B 61 2B 25 */ bl __dl__FPv -lbl_80CBC21C: -/* 80CBC21C 7F E3 FB 78 */ mr r3, r31 -/* 80CBC220 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC224 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC228 7C 08 03 A6 */ mtlr r0 -/* 80CBC22C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC230 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGCylFv.s deleted file mode 100644 index 4fd6f7b2fb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CBC1A4: -/* 80CBC1A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC1A8 7C 08 02 A6 */ mflr r0 -/* 80CBC1AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC1B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBC1B4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CBC1B8 41 82 00 1C */ beq lbl_80CBC1D4 -/* 80CBC1BC 3C A0 80 CC */ lis r5, __vt__8cM3dGCyl@ha /* 0x80CBC590@ha */ -/* 80CBC1C0 38 05 C5 90 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80CBC590@l */ -/* 80CBC1C4 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80CBC1C8 7C 80 07 35 */ extsh. r0, r4 -/* 80CBC1CC 40 81 00 08 */ ble lbl_80CBC1D4 -/* 80CBC1D0 4B 61 2B 6D */ bl __dl__FPv -lbl_80CBC1D4: -/* 80CBC1D4 7F E3 FB 78 */ mr r3, r31 -/* 80CBC1D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC1DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC1E0 7C 08 03 A6 */ mtlr r0 -/* 80CBC1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC1E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8dCcD_CylFv.s deleted file mode 100644 index 9d5f2b693b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8dCcD_CylFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80CBC054: -/* 80CBC054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC058 7C 08 02 A6 */ mflr r0 -/* 80CBC05C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC060 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBC064 93 C1 00 08 */ stw r30, 8(r1) -/* 80CBC068 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CBC06C 7C 9F 23 78 */ mr r31, r4 -/* 80CBC070 41 82 00 94 */ beq lbl_80CBC104 -/* 80CBC074 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CBC078 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CBC07C 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80CBC080 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CBC084 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80CBC088 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CBC08C 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80CBC090 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80CBC094 41 82 00 54 */ beq lbl_80CBC0E8 -/* 80CBC098 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CBC09C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CBC0A0 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80CBC0A4 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CBC0A8 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80CBC0AC 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80CBC0B0 41 82 00 10 */ beq lbl_80CBC0C0 -/* 80CBC0B4 3C 60 80 CC */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CBC590@ha */ -/* 80CBC0B8 38 03 C5 90 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CBC590@l */ -/* 80CBC0BC 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80CBC0C0: -/* 80CBC0C0 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80CBC0C4 41 82 00 24 */ beq lbl_80CBC0E8 -/* 80CBC0C8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CBC0CC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CBC0D0 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80CBC0D4 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80CBC0D8 41 82 00 10 */ beq lbl_80CBC0E8 -/* 80CBC0DC 3C 60 80 CC */ lis r3, __vt__8cM3dGAab@ha /* 0x80CBC584@ha */ -/* 80CBC0E0 38 03 C5 84 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CBC584@l */ -/* 80CBC0E4 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80CBC0E8: -/* 80CBC0E8 7F C3 F3 78 */ mr r3, r30 -/* 80CBC0EC 38 80 00 00 */ li r4, 0 -/* 80CBC0F0 4B 3C 7F F5 */ bl __dt__12dCcD_GObjInfFv -/* 80CBC0F4 7F E0 07 35 */ extsh. r0, r31 -/* 80CBC0F8 40 81 00 0C */ ble lbl_80CBC104 -/* 80CBC0FC 7F C3 F3 78 */ mr r3, r30 -/* 80CBC100 4B 61 2C 3D */ bl __dl__FPv -lbl_80CBC104: -/* 80CBC104 7F C3 F3 78 */ mr r3, r30 -/* 80CBC108 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC10C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CBC110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC114 7C 08 03 A6 */ mtlr r0 -/* 80CBC118 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC11C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionEvent__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionEvent__12daObjRgate_cFv.s deleted file mode 100644 index 61b81f4b11..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionEvent__12daObjRgate_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CBBAF4: -/* 80CBBAF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBAF8 7C 08 02 A6 */ mflr r0 -/* 80CBBAFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBB00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBBB04 93 C1 00 08 */ stw r30, 8(r1) -/* 80CBBB08 7C 7E 1B 78 */ mr r30, r3 -/* 80CBBB0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBB10 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBB14 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80CBBB18 A8 9E 0B A2 */ lha r4, 0xba2(r30) -/* 80CBBB1C 4B 38 BF 5D */ bl endCheck__16dEvent_manager_cFs -/* 80CBBB20 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBBB24 41 82 00 18 */ beq lbl_80CBBB3C -/* 80CBBB28 38 00 00 02 */ li r0, 2 -/* 80CBBB2C 98 1E 0B A0 */ stb r0, 0xba0(r30) -/* 80CBBB30 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80CBBB34 4B 38 69 35 */ bl reset__14dEvt_control_cFv -/* 80CBBB38 48 00 00 0C */ b lbl_80CBBB44 -lbl_80CBBB3C: -/* 80CBBB3C 7F C3 F3 78 */ mr r3, r30 -/* 80CBBB40 48 00 00 C5 */ bl demoProc__12daObjRgate_cFv -lbl_80CBBB44: -/* 80CBBB44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBBB48 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CBBB4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBBB50 7C 08 03 A6 */ mtlr r0 -/* 80CBBB54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBBB58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionWaitEvent__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionWaitEvent__12daObjRgate_cFv.s deleted file mode 100644 index a2879ba562..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionWaitEvent__12daObjRgate_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80CBBA10: -/* 80CBBA10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CBBA14 7C 08 02 A6 */ mflr r0 -/* 80CBBA18 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CBBA1C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CBBA20 7C 7F 1B 78 */ mr r31, r3 -/* 80CBBA24 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80CBBA28 28 00 00 03 */ cmplwi r0, 3 -/* 80CBBA2C 40 82 00 8C */ bne lbl_80CBBAB8 -/* 80CBBA30 38 00 00 01 */ li r0, 1 -/* 80CBBA34 98 1F 0B A0 */ stb r0, 0xba0(r31) -/* 80CBBA38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBA3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBA40 A8 83 5D C8 */ lha r4, 0x5dc8(r3) -/* 80CBBA44 38 04 FF FF */ addi r0, r4, -1 -/* 80CBBA48 B0 03 5D C8 */ sth r0, 0x5dc8(r3) -/* 80CBBA4C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CBBA50 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CBBA54 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CBBA58 7C 05 07 74 */ extsb r5, r0 -/* 80CBBA5C 4B 37 97 A5 */ bl onSwitch__10dSv_info_cFii -/* 80CBBA60 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80CBBA64 7C 03 07 74 */ extsb r3, r0 -/* 80CBBA68 4B 37 16 05 */ bl dComIfGp_getReverb__Fi -/* 80CBBA6C 7C 67 1B 78 */ mr r7, r3 -/* 80CBBA70 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008022A@ha */ -/* 80CBBA74 38 03 02 2A */ addi r0, r3, 0x022A /* 0x0008022A@l */ -/* 80CBBA78 90 01 00 08 */ stw r0, 8(r1) -/* 80CBBA7C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CBBA80 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CBBA84 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBBA88 38 81 00 08 */ addi r4, r1, 8 -/* 80CBBA8C 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80CBBA90 38 C0 00 00 */ li r6, 0 -/* 80CBBA94 3D 00 80 CC */ lis r8, lit_4513@ha /* 0x80CBC420@ha */ -/* 80CBBA98 C0 28 C4 20 */ lfs f1, lit_4513@l(r8) /* 0x80CBC420@l */ -/* 80CBBA9C FC 40 08 90 */ fmr f2, f1 -/* 80CBBAA0 3D 00 80 CC */ lis r8, lit_4514@ha /* 0x80CBC424@ha */ -/* 80CBBAA4 C0 68 C4 24 */ lfs f3, lit_4514@l(r8) /* 0x80CBC424@l */ -/* 80CBBAA8 FC 80 18 90 */ fmr f4, f3 -/* 80CBBAAC 39 00 00 00 */ li r8, 0 -/* 80CBBAB0 4B 5E FE D5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CBBAB4 48 00 00 2C */ b lbl_80CBBAE0 -lbl_80CBBAB8: -/* 80CBBAB8 4B FF F5 0D */ bl checkOpen__12daObjRgate_cFv -/* 80CBBABC 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBBAC0 41 82 00 20 */ beq lbl_80CBBAE0 -/* 80CBBAC4 A8 1F 0B A2 */ lha r0, 0xba2(r31) -/* 80CBBAC8 B0 1F 00 FC */ sth r0, 0xfc(r31) -/* 80CBBACC 88 1F 0B A1 */ lbz r0, 0xba1(r31) -/* 80CBBAD0 98 1F 00 FE */ stb r0, 0xfe(r31) -/* 80CBBAD4 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80CBBAD8 60 00 00 04 */ ori r0, r0, 4 -/* 80CBBADC B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80CBBAE0: -/* 80CBBAE0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CBBAE4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CBBAE8 7C 08 03 A6 */ mtlr r0 -/* 80CBBAEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CBBAF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action__12daObjRgate_cFv.s deleted file mode 100644 index cb28c4c3e4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action__12daObjRgate_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CBB308: -/* 80CBB308 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBB30C 7C 08 02 A6 */ mflr r0 -/* 80CBB310 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBB314 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBB318 7C 7F 1B 78 */ mr r31, r3 -/* 80CBB31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBB320 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBB324 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80CBB328 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80CBB32C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80CBB330 A0 84 00 88 */ lhz r4, 0x88(r4) -/* 80CBB334 4B 37 96 89 */ bl isEventBit__11dSv_event_cCFUs -/* 80CBB338 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB33C 41 82 00 18 */ beq lbl_80CBB354 -/* 80CBB340 38 00 40 00 */ li r0, 0x4000 -/* 80CBB344 B0 1F 0B 76 */ sth r0, 0xb76(r31) -/* 80CBB348 38 00 C0 00 */ li r0, -16384 -/* 80CBB34C B0 1F 0B 74 */ sth r0, 0xb74(r31) -/* 80CBB350 48 00 00 0C */ b lbl_80CBB35C -lbl_80CBB354: -/* 80CBB354 7F E3 FB 78 */ mr r3, r31 -/* 80CBB358 48 00 00 19 */ bl action_typeA__12daObjRgate_cFv -lbl_80CBB35C: -/* 80CBB35C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBB360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBB364 7C 08 03 A6 */ mtlr r0 -/* 80CBB368 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBB36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action_typeA__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action_typeA__12daObjRgate_cFv.s deleted file mode 100644 index a288433495..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action_typeA__12daObjRgate_cFv.s +++ /dev/null @@ -1,463 +0,0 @@ -lbl_80CBB370: -/* 80CBB370 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80CBB374 7C 08 02 A6 */ mflr r0 -/* 80CBB378 90 01 00 74 */ stw r0, 0x74(r1) -/* 80CBB37C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80CBB380 4B 6A 6E 4D */ bl _savegpr_25 -/* 80CBB384 7C 7A 1B 78 */ mr r26, r3 -/* 80CBB388 3C 60 80 CC */ lis r3, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CBB38C 3B A3 C3 68 */ addi r29, r3, l_cull_box@l /* 0x80CBC368@l */ -/* 80CBB390 80 1A 00 B0 */ lwz r0, 0xb0(r26) -/* 80CBB394 54 1B 06 3E */ clrlwi r27, r0, 0x18 -/* 80CBB398 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBB39C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBB3A0 83 3C 5D AC */ lwz r25, 0x5dac(r28) -/* 80CBB3A4 7F 83 E3 78 */ mr r3, r28 -/* 80CBB3A8 7F 64 DB 78 */ mr r4, r27 -/* 80CBB3AC 88 1A 04 BA */ lbz r0, 0x4ba(r26) -/* 80CBB3B0 7C 05 07 74 */ extsb r5, r0 -/* 80CBB3B4 4B 37 9F AD */ bl isSwitch__10dSv_info_cCFii -/* 80CBB3B8 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB3BC 40 82 00 0C */ bne lbl_80CBB3C8 -/* 80CBB3C0 28 1B 00 FF */ cmplwi r27, 0xff -/* 80CBB3C4 40 82 04 9C */ bne lbl_80CBB860 -lbl_80CBB3C8: -/* 80CBB3C8 7F 43 D3 78 */ mr r3, r26 -/* 80CBB3CC 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBB3D0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80CBB3D4 4B FF F4 D5 */ bl checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz -/* 80CBB3D8 7C 7E 1B 78 */ mr r30, r3 -/* 80CBB3DC 7F 43 D3 78 */ mr r3, r26 -/* 80CBB3E0 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBB3E4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80CBB3E8 4B FF F8 51 */ bl checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz -/* 80CBB3EC 7C 7F 1B 78 */ mr r31, r3 -/* 80CBB3F0 AB 9A 0B 9C */ lha r28, 0xb9c(r26) -/* 80CBB3F4 AB 7A 0B 9E */ lha r27, 0xb9e(r26) -/* 80CBB3F8 C0 3D 00 5C */ lfs f1, 0x5c(r29) -/* 80CBB3FC C0 19 05 2C */ lfs f0, 0x52c(r25) -/* 80CBB400 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CBB404 41 82 00 8C */ beq lbl_80CBB490 -/* 80CBB408 2C 1E 00 01 */ cmpwi r30, 1 -/* 80CBB40C 40 82 00 44 */ bne lbl_80CBB450 -/* 80CBB410 7F 43 D3 78 */ mr r3, r26 -/* 80CBB414 7F 24 CB 78 */ mr r4, r25 -/* 80CBB418 4B FF FC D9 */ bl checkDirL__12daObjRgate_cFP10fopAc_ac_c -/* 80CBB41C 2C 03 00 01 */ cmpwi r3, 1 -/* 80CBB420 41 82 00 20 */ beq lbl_80CBB440 -/* 80CBB424 40 80 00 24 */ bge lbl_80CBB448 -/* 80CBB428 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB42C 40 80 00 08 */ bge lbl_80CBB434 -/* 80CBB430 48 00 00 18 */ b lbl_80CBB448 -lbl_80CBB434: -/* 80CBB434 38 00 01 F4 */ li r0, 0x1f4 -/* 80CBB438 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -/* 80CBB43C 48 00 00 0C */ b lbl_80CBB448 -lbl_80CBB440: -/* 80CBB440 38 00 FE 0C */ li r0, -500 -/* 80CBB444 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB448: -/* 80CBB448 C0 1D 00 C0 */ lfs f0, 0xc0(r29) -/* 80CBB44C D0 1A 0B B0 */ stfs f0, 0xbb0(r26) -lbl_80CBB450: -/* 80CBB450 2C 1F 00 01 */ cmpwi r31, 1 -/* 80CBB454 40 82 00 3C */ bne lbl_80CBB490 -/* 80CBB458 7F 43 D3 78 */ mr r3, r26 -/* 80CBB45C 7F 24 CB 78 */ mr r4, r25 -/* 80CBB460 4B FF FD 21 */ bl checkDirR__12daObjRgate_cFP10fopAc_ac_c -/* 80CBB464 2C 03 00 01 */ cmpwi r3, 1 -/* 80CBB468 41 82 00 20 */ beq lbl_80CBB488 -/* 80CBB46C 40 80 00 24 */ bge lbl_80CBB490 -/* 80CBB470 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB474 40 80 00 08 */ bge lbl_80CBB47C -/* 80CBB478 48 00 00 18 */ b lbl_80CBB490 -lbl_80CBB47C: -/* 80CBB47C 38 00 FE 0C */ li r0, -500 -/* 80CBB480 B0 1A 0B 9E */ sth r0, 0xb9e(r26) -/* 80CBB484 48 00 00 0C */ b lbl_80CBB490 -lbl_80CBB488: -/* 80CBB488 38 00 01 F4 */ li r0, 0x1f4 -/* 80CBB48C B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB490: -/* 80CBB490 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBB494 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBB498 83 23 5D B8 */ lwz r25, 0x5db8(r3) -/* 80CBB49C 28 19 00 00 */ cmplwi r25, 0 -/* 80CBB4A0 41 82 00 9C */ beq lbl_80CBB53C -/* 80CBB4A4 C0 3D 00 5C */ lfs f1, 0x5c(r29) -/* 80CBB4A8 C0 19 05 2C */ lfs f0, 0x52c(r25) -/* 80CBB4AC FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CBB4B0 41 82 00 8C */ beq lbl_80CBB53C -/* 80CBB4B4 2C 1E 00 03 */ cmpwi r30, 3 -/* 80CBB4B8 40 82 00 44 */ bne lbl_80CBB4FC -/* 80CBB4BC 7F 43 D3 78 */ mr r3, r26 -/* 80CBB4C0 7F 24 CB 78 */ mr r4, r25 -/* 80CBB4C4 4B FF FC 2D */ bl checkDirL__12daObjRgate_cFP10fopAc_ac_c -/* 80CBB4C8 2C 03 00 01 */ cmpwi r3, 1 -/* 80CBB4CC 41 82 00 20 */ beq lbl_80CBB4EC -/* 80CBB4D0 40 80 00 24 */ bge lbl_80CBB4F4 -/* 80CBB4D4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB4D8 40 80 00 08 */ bge lbl_80CBB4E0 -/* 80CBB4DC 48 00 00 18 */ b lbl_80CBB4F4 -lbl_80CBB4E0: -/* 80CBB4E0 38 00 03 20 */ li r0, 0x320 -/* 80CBB4E4 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -/* 80CBB4E8 48 00 00 0C */ b lbl_80CBB4F4 -lbl_80CBB4EC: -/* 80CBB4EC 38 00 FC E0 */ li r0, -800 -/* 80CBB4F0 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB4F4: -/* 80CBB4F4 C0 1D 00 C4 */ lfs f0, 0xc4(r29) -/* 80CBB4F8 D0 1A 0B B0 */ stfs f0, 0xbb0(r26) -lbl_80CBB4FC: -/* 80CBB4FC 2C 1F 00 03 */ cmpwi r31, 3 -/* 80CBB500 40 82 00 3C */ bne lbl_80CBB53C -/* 80CBB504 7F 43 D3 78 */ mr r3, r26 -/* 80CBB508 7F 24 CB 78 */ mr r4, r25 -/* 80CBB50C 4B FF FC 75 */ bl checkDirR__12daObjRgate_cFP10fopAc_ac_c -/* 80CBB510 2C 03 00 01 */ cmpwi r3, 1 -/* 80CBB514 41 82 00 20 */ beq lbl_80CBB534 -/* 80CBB518 40 80 00 24 */ bge lbl_80CBB53C -/* 80CBB51C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB520 40 80 00 08 */ bge lbl_80CBB528 -/* 80CBB524 48 00 00 18 */ b lbl_80CBB53C -lbl_80CBB528: -/* 80CBB528 38 00 FC E0 */ li r0, -800 -/* 80CBB52C B0 1A 0B 9E */ sth r0, 0xb9e(r26) -/* 80CBB530 48 00 00 0C */ b lbl_80CBB53C -lbl_80CBB534: -/* 80CBB534 38 00 03 20 */ li r0, 0x320 -/* 80CBB538 B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB53C: -/* 80CBB53C 3C 60 80 CC */ lis r3, search_coach__FPvPv@ha /* 0x80CB9C98@ha */ -/* 80CBB540 38 63 9C 98 */ addi r3, r3, search_coach__FPvPv@l /* 0x80CB9C98@l */ -/* 80CBB544 7F 44 D3 78 */ mr r4, r26 -/* 80CBB548 4B 35 E2 B1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80CBB54C 7C 79 1B 79 */ or. r25, r3, r3 -/* 80CBB550 41 82 00 9C */ beq lbl_80CBB5EC -/* 80CBB554 C0 3D 00 5C */ lfs f1, 0x5c(r29) -/* 80CBB558 C0 19 05 2C */ lfs f0, 0x52c(r25) -/* 80CBB55C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CBB560 41 82 00 8C */ beq lbl_80CBB5EC -/* 80CBB564 2C 1E 00 02 */ cmpwi r30, 2 -/* 80CBB568 40 82 00 44 */ bne lbl_80CBB5AC -/* 80CBB56C 7F 43 D3 78 */ mr r3, r26 -/* 80CBB570 7F 24 CB 78 */ mr r4, r25 -/* 80CBB574 4B FF FB 7D */ bl checkDirL__12daObjRgate_cFP10fopAc_ac_c -/* 80CBB578 2C 03 00 01 */ cmpwi r3, 1 -/* 80CBB57C 41 82 00 20 */ beq lbl_80CBB59C -/* 80CBB580 40 80 00 24 */ bge lbl_80CBB5A4 -/* 80CBB584 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB588 40 80 00 08 */ bge lbl_80CBB590 -/* 80CBB58C 48 00 00 18 */ b lbl_80CBB5A4 -lbl_80CBB590: -/* 80CBB590 38 00 03 84 */ li r0, 0x384 -/* 80CBB594 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -/* 80CBB598 48 00 00 0C */ b lbl_80CBB5A4 -lbl_80CBB59C: -/* 80CBB59C 38 00 FC 7C */ li r0, -900 -/* 80CBB5A0 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB5A4: -/* 80CBB5A4 C0 1D 00 C4 */ lfs f0, 0xc4(r29) -/* 80CBB5A8 D0 1A 0B B0 */ stfs f0, 0xbb0(r26) -lbl_80CBB5AC: -/* 80CBB5AC 2C 1F 00 02 */ cmpwi r31, 2 -/* 80CBB5B0 40 82 00 3C */ bne lbl_80CBB5EC -/* 80CBB5B4 7F 43 D3 78 */ mr r3, r26 -/* 80CBB5B8 7F 24 CB 78 */ mr r4, r25 -/* 80CBB5BC 4B FF FB C5 */ bl checkDirR__12daObjRgate_cFP10fopAc_ac_c -/* 80CBB5C0 2C 03 00 01 */ cmpwi r3, 1 -/* 80CBB5C4 41 82 00 20 */ beq lbl_80CBB5E4 -/* 80CBB5C8 40 80 00 24 */ bge lbl_80CBB5EC -/* 80CBB5CC 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB5D0 40 80 00 08 */ bge lbl_80CBB5D8 -/* 80CBB5D4 48 00 00 18 */ b lbl_80CBB5EC -lbl_80CBB5D8: -/* 80CBB5D8 38 00 FC 7C */ li r0, -900 -/* 80CBB5DC B0 1A 0B 9E */ sth r0, 0xb9e(r26) -/* 80CBB5E0 48 00 00 0C */ b lbl_80CBB5EC -lbl_80CBB5E4: -/* 80CBB5E4 38 00 03 84 */ li r0, 0x384 -/* 80CBB5E8 B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB5EC: -/* 80CBB5EC 7F 83 E3 78 */ mr r3, r28 -/* 80CBB5F0 4B 6A 9A E1 */ bl abs -/* 80CBB5F4 7C 7C 1B 78 */ mr r28, r3 -/* 80CBB5F8 A8 7A 0B 9C */ lha r3, 0xb9c(r26) -/* 80CBB5FC 4B 6A 9A D5 */ bl abs -/* 80CBB600 7C 63 E0 50 */ subf r3, r3, r28 -/* 80CBB604 4B 6A 9A CD */ bl abs -/* 80CBB608 2C 03 01 90 */ cmpwi r3, 0x190 -/* 80CBB60C 41 81 00 28 */ bgt lbl_80CBB634 -/* 80CBB610 7F 63 DB 78 */ mr r3, r27 -/* 80CBB614 4B 6A 9A BD */ bl abs -/* 80CBB618 7C 7B 1B 78 */ mr r27, r3 -/* 80CBB61C A8 7A 0B 9E */ lha r3, 0xb9e(r26) -/* 80CBB620 4B 6A 9A B1 */ bl abs -/* 80CBB624 7C 63 D8 50 */ subf r3, r3, r27 -/* 80CBB628 4B 6A 9A A9 */ bl abs -/* 80CBB62C 2C 03 01 90 */ cmpwi r3, 0x190 -/* 80CBB630 40 81 00 0C */ ble lbl_80CBB63C -lbl_80CBB634: -/* 80CBB634 7F 43 D3 78 */ mr r3, r26 -/* 80CBB638 4B FF FC 55 */ bl setCrkSE__12daObjRgate_cFv -lbl_80CBB63C: -/* 80CBB63C A8 1A 0B 9C */ lha r0, 0xb9c(r26) -/* 80CBB640 2C 00 05 DC */ cmpwi r0, 0x5dc -/* 80CBB644 40 81 00 0C */ ble lbl_80CBB650 -/* 80CBB648 38 00 05 DC */ li r0, 0x5dc -/* 80CBB64C B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB650: -/* 80CBB650 A8 1A 0B 9C */ lha r0, 0xb9c(r26) -/* 80CBB654 2C 00 FA 24 */ cmpwi r0, -1500 -/* 80CBB658 40 80 00 0C */ bge lbl_80CBB664 -/* 80CBB65C 38 00 FA 24 */ li r0, -1500 -/* 80CBB660 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB664: -/* 80CBB664 A8 1A 0B 9E */ lha r0, 0xb9e(r26) -/* 80CBB668 2C 00 05 DC */ cmpwi r0, 0x5dc -/* 80CBB66C 40 81 00 0C */ ble lbl_80CBB678 -/* 80CBB670 38 00 05 DC */ li r0, 0x5dc -/* 80CBB674 B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB678: -/* 80CBB678 A8 1A 0B 9E */ lha r0, 0xb9e(r26) -/* 80CBB67C 2C 00 FA 24 */ cmpwi r0, -1500 -/* 80CBB680 40 80 00 0C */ bge lbl_80CBB68C -/* 80CBB684 38 00 FA 24 */ li r0, -1500 -/* 80CBB688 B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB68C: -/* 80CBB68C A8 7A 0B 76 */ lha r3, 0xb76(r26) -/* 80CBB690 A8 1A 0B 9C */ lha r0, 0xb9c(r26) -/* 80CBB694 7C 03 02 14 */ add r0, r3, r0 -/* 80CBB698 B0 1A 0B 76 */ sth r0, 0xb76(r26) -/* 80CBB69C A8 1A 0B 76 */ lha r0, 0xb76(r26) -/* 80CBB6A0 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 80CBB6A4 40 81 00 44 */ ble lbl_80CBB6E8 -/* 80CBB6A8 38 00 40 00 */ li r0, 0x4000 -/* 80CBB6AC B0 1A 0B 76 */ sth r0, 0xb76(r26) -/* 80CBB6B0 A8 1A 0B 9C */ lha r0, 0xb9c(r26) -/* 80CBB6B4 C8 3D 00 E8 */ lfd f1, 0xe8(r29) -/* 80CBB6B8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CBB6BC 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80CBB6C0 3C 00 43 30 */ lis r0, 0x4330 -/* 80CBB6C4 90 01 00 38 */ stw r0, 0x38(r1) -/* 80CBB6C8 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 80CBB6CC EC 20 08 28 */ fsubs f1, f0, f1 -/* 80CBB6D0 C0 1D 00 C8 */ lfs f0, 0xc8(r29) -/* 80CBB6D4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CBB6D8 FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB6DC D8 01 00 40 */ stfd f0, 0x40(r1) -/* 80CBB6E0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80CBB6E4 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB6E8: -/* 80CBB6E8 A8 1A 0B 76 */ lha r0, 0xb76(r26) -/* 80CBB6EC 2C 00 C0 00 */ cmpwi r0, -16384 -/* 80CBB6F0 40 80 00 44 */ bge lbl_80CBB734 -/* 80CBB6F4 38 00 C0 00 */ li r0, -16384 -/* 80CBB6F8 B0 1A 0B 76 */ sth r0, 0xb76(r26) -/* 80CBB6FC A8 1A 0B 9C */ lha r0, 0xb9c(r26) -/* 80CBB700 C8 3D 00 E8 */ lfd f1, 0xe8(r29) -/* 80CBB704 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CBB708 90 01 00 44 */ stw r0, 0x44(r1) -/* 80CBB70C 3C 00 43 30 */ lis r0, 0x4330 -/* 80CBB710 90 01 00 40 */ stw r0, 0x40(r1) -/* 80CBB714 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 80CBB718 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80CBB71C C0 1D 00 C8 */ lfs f0, 0xc8(r29) -/* 80CBB720 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CBB724 FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB728 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80CBB72C 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80CBB730 B0 1A 0B 9C */ sth r0, 0xb9c(r26) -lbl_80CBB734: -/* 80CBB734 A8 7A 0B 74 */ lha r3, 0xb74(r26) -/* 80CBB738 A8 1A 0B 9E */ lha r0, 0xb9e(r26) -/* 80CBB73C 7C 03 02 14 */ add r0, r3, r0 -/* 80CBB740 B0 1A 0B 74 */ sth r0, 0xb74(r26) -/* 80CBB744 A8 1A 0B 74 */ lha r0, 0xb74(r26) -/* 80CBB748 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 80CBB74C 40 81 00 44 */ ble lbl_80CBB790 -/* 80CBB750 38 00 40 00 */ li r0, 0x4000 -/* 80CBB754 B0 1A 0B 74 */ sth r0, 0xb74(r26) -/* 80CBB758 A8 1A 0B 9E */ lha r0, 0xb9e(r26) -/* 80CBB75C C8 3D 00 E8 */ lfd f1, 0xe8(r29) -/* 80CBB760 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CBB764 90 01 00 44 */ stw r0, 0x44(r1) -/* 80CBB768 3C 00 43 30 */ lis r0, 0x4330 -/* 80CBB76C 90 01 00 40 */ stw r0, 0x40(r1) -/* 80CBB770 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 80CBB774 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80CBB778 C0 1D 00 C8 */ lfs f0, 0xc8(r29) -/* 80CBB77C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CBB780 FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB784 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80CBB788 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80CBB78C B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB790: -/* 80CBB790 A8 1A 0B 74 */ lha r0, 0xb74(r26) -/* 80CBB794 2C 00 C0 00 */ cmpwi r0, -16384 -/* 80CBB798 40 80 00 44 */ bge lbl_80CBB7DC -/* 80CBB79C 38 00 C0 00 */ li r0, -16384 -/* 80CBB7A0 B0 1A 0B 74 */ sth r0, 0xb74(r26) -/* 80CBB7A4 A8 1A 0B 9E */ lha r0, 0xb9e(r26) -/* 80CBB7A8 C8 3D 00 E8 */ lfd f1, 0xe8(r29) -/* 80CBB7AC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CBB7B0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80CBB7B4 3C 00 43 30 */ lis r0, 0x4330 -/* 80CBB7B8 90 01 00 40 */ stw r0, 0x40(r1) -/* 80CBB7BC C8 01 00 40 */ lfd f0, 0x40(r1) -/* 80CBB7C0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80CBB7C4 C0 1D 00 C8 */ lfs f0, 0xc8(r29) -/* 80CBB7C8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CBB7CC FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB7D0 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80CBB7D4 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80CBB7D8 B0 1A 0B 9E */ sth r0, 0xb9e(r26) -lbl_80CBB7DC: -/* 80CBB7DC 38 7A 0B 9C */ addi r3, r26, 0xb9c -/* 80CBB7E0 38 80 00 00 */ li r4, 0 -/* 80CBB7E4 38 A0 00 0A */ li r5, 0xa -/* 80CBB7E8 38 C0 00 64 */ li r6, 0x64 -/* 80CBB7EC 38 E0 00 0A */ li r7, 0xa -/* 80CBB7F0 4B 5B 4D 51 */ bl cLib_addCalcAngleS__FPsssss -/* 80CBB7F4 38 7A 0B 9E */ addi r3, r26, 0xb9e -/* 80CBB7F8 38 80 00 00 */ li r4, 0 -/* 80CBB7FC 38 A0 00 0A */ li r5, 0xa -/* 80CBB800 38 C0 00 64 */ li r6, 0x64 -/* 80CBB804 38 E0 00 0A */ li r7, 0xa -/* 80CBB808 4B 5B 4D 39 */ bl cLib_addCalcAngleS__FPsssss -/* 80CBB80C 38 7A 0B AE */ addi r3, r26, 0xbae -/* 80CBB810 38 80 30 00 */ li r4, 0x3000 -/* 80CBB814 38 A0 00 0A */ li r5, 0xa -/* 80CBB818 38 C0 04 00 */ li r6, 0x400 -/* 80CBB81C 38 E0 01 00 */ li r7, 0x100 -/* 80CBB820 4B 5B 4D 21 */ bl cLib_addCalcAngleS__FPsssss -/* 80CBB824 38 7A 0B B4 */ addi r3, r26, 0xbb4 -/* 80CBB828 C0 3D 00 CC */ lfs f1, 0xcc(r29) -/* 80CBB82C C0 5D 00 B8 */ lfs f2, 0xb8(r29) -/* 80CBB830 4B 5B 4F 11 */ bl cLib_chaseF__FPfff -/* 80CBB834 38 7A 0B C0 */ addi r3, r26, 0xbc0 -/* 80CBB838 C0 3D 00 D0 */ lfs f1, 0xd0(r29) -/* 80CBB83C C0 5D 00 B8 */ lfs f2, 0xb8(r29) -/* 80CBB840 4B 5B 4F 01 */ bl cLib_chaseF__FPfff -/* 80CBB844 38 7A 0B CC */ addi r3, r26, 0xbcc -/* 80CBB848 38 80 7F FF */ li r4, 0x7fff -/* 80CBB84C 38 A0 00 0A */ li r5, 0xa -/* 80CBB850 38 C0 04 00 */ li r6, 0x400 -/* 80CBB854 38 E0 01 00 */ li r7, 0x100 -/* 80CBB858 4B 5B 4C E9 */ bl cLib_addCalcAngleS__FPsssss -/* 80CBB85C 48 00 01 9C */ b lbl_80CBB9F8 -lbl_80CBB860: -/* 80CBB860 7F 43 D3 78 */ mr r3, r26 -/* 80CBB864 38 81 00 14 */ addi r4, r1, 0x14 -/* 80CBB868 38 A1 00 08 */ addi r5, r1, 8 -/* 80CBB86C 4B FF F0 3D */ bl checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz -/* 80CBB870 7C 7B 1B 78 */ mr r27, r3 -/* 80CBB874 7F 43 D3 78 */ mr r3, r26 -/* 80CBB878 38 81 00 14 */ addi r4, r1, 0x14 -/* 80CBB87C 38 A1 00 08 */ addi r5, r1, 8 -/* 80CBB880 4B FF F3 B9 */ bl checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz -/* 80CBB884 2C 1B 00 00 */ cmpwi r27, 0 -/* 80CBB888 40 82 00 0C */ bne lbl_80CBB894 -/* 80CBB88C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBB890 41 82 00 80 */ beq lbl_80CBB910 -lbl_80CBB894: -/* 80CBB894 80 9C 5D AC */ lwz r4, 0x5dac(r28) -/* 80CBB898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBB89C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBB8A0 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80CBB8A4 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80CBB8A8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80CBB8AC 41 82 00 3C */ beq lbl_80CBB8E8 -/* 80CBB8B0 80 04 05 84 */ lwz r0, 0x584(r4) -/* 80CBB8B4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80CBB8B8 40 82 00 10 */ bne lbl_80CBB8C8 -/* 80CBB8BC 80 04 05 80 */ lwz r0, 0x580(r4) -/* 80CBB8C0 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80CBB8C4 41 82 00 4C */ beq lbl_80CBB910 -lbl_80CBB8C8: -/* 80CBB8C8 C0 1D 00 D4 */ lfs f0, 0xd4(r29) -/* 80CBB8CC D0 1A 0B 94 */ stfs f0, 0xb94(r26) -/* 80CBB8D0 D0 1A 0B 90 */ stfs f0, 0xb90(r26) -/* 80CBB8D4 38 00 08 00 */ li r0, 0x800 -/* 80CBB8D8 B0 1A 0B AC */ sth r0, 0xbac(r26) -/* 80CBB8DC 7F 43 D3 78 */ mr r3, r26 -/* 80CBB8E0 4B FF F9 31 */ bl setAtkSE__12daObjRgate_cFv -/* 80CBB8E4 48 00 00 2C */ b lbl_80CBB910 -lbl_80CBB8E8: -/* 80CBB8E8 80 04 05 80 */ lwz r0, 0x580(r4) -/* 80CBB8EC 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80CBB8F0 41 82 00 20 */ beq lbl_80CBB910 -/* 80CBB8F4 C0 1D 00 D8 */ lfs f0, 0xd8(r29) -/* 80CBB8F8 D0 1A 0B 94 */ stfs f0, 0xb94(r26) -/* 80CBB8FC D0 1A 0B 90 */ stfs f0, 0xb90(r26) -/* 80CBB900 38 00 08 00 */ li r0, 0x800 -/* 80CBB904 B0 1A 0B AC */ sth r0, 0xbac(r26) -/* 80CBB908 7F 43 D3 78 */ mr r3, r26 -/* 80CBB90C 4B FF F9 05 */ bl setAtkSE__12daObjRgate_cFv -lbl_80CBB910: -/* 80CBB910 80 1A 0B 98 */ lwz r0, 0xb98(r26) -/* 80CBB914 1C 00 0F A0 */ mulli r0, r0, 0xfa0 -/* 80CBB918 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80CBB91C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80CBB920 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80CBB924 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80CBB928 C0 1A 0B 90 */ lfs f0, 0xb90(r26) -/* 80CBB92C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80CBB930 FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB934 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 80CBB938 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80CBB93C B0 1A 0B 76 */ sth r0, 0xb76(r26) -/* 80CBB940 80 1A 0B 98 */ lwz r0, 0xb98(r26) -/* 80CBB944 1C 00 0F A0 */ mulli r0, r0, 0xfa0 -/* 80CBB948 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80CBB94C 7C 03 04 2E */ lfsx f0, r3, r0 -/* 80CBB950 C0 3A 0B 94 */ lfs f1, 0xb94(r26) -/* 80CBB954 FC 00 00 50 */ fneg f0, f0 -/* 80CBB958 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CBB95C FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB960 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80CBB964 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80CBB968 B0 1A 0B 74 */ sth r0, 0xb74(r26) -/* 80CBB96C 38 7A 0B 90 */ addi r3, r26, 0xb90 -/* 80CBB970 C0 3D 00 DC */ lfs f1, 0xdc(r29) -/* 80CBB974 C0 5D 00 E0 */ lfs f2, 0xe0(r29) -/* 80CBB978 4B 5B 41 09 */ bl cLib_addCalc0__FPfff -/* 80CBB97C 38 7A 0B 94 */ addi r3, r26, 0xb94 -/* 80CBB980 C0 3D 00 DC */ lfs f1, 0xdc(r29) -/* 80CBB984 C0 5D 00 E0 */ lfs f2, 0xe0(r29) -/* 80CBB988 4B 5B 40 F9 */ bl cLib_addCalc0__FPfff -/* 80CBB98C A8 7A 0B AC */ lha r3, 0xbac(r26) -/* 80CBB990 38 03 FE A0 */ addi r0, r3, -352 -/* 80CBB994 B0 1A 0B AC */ sth r0, 0xbac(r26) -/* 80CBB998 A8 7A 0B AA */ lha r3, 0xbaa(r26) -/* 80CBB99C A8 1A 0B AC */ lha r0, 0xbac(r26) -/* 80CBB9A0 7C 03 02 14 */ add r0, r3, r0 -/* 80CBB9A4 B0 1A 0B AA */ sth r0, 0xbaa(r26) -/* 80CBB9A8 A8 1A 0B AA */ lha r0, 0xbaa(r26) -/* 80CBB9AC 2C 00 00 00 */ cmpwi r0, 0 -/* 80CBB9B0 40 80 00 48 */ bge lbl_80CBB9F8 -/* 80CBB9B4 38 00 00 00 */ li r0, 0 -/* 80CBB9B8 B0 1A 0B AA */ sth r0, 0xbaa(r26) -/* 80CBB9BC C0 5D 00 E4 */ lfs f2, 0xe4(r29) -/* 80CBB9C0 A8 1A 0B AC */ lha r0, 0xbac(r26) -/* 80CBB9C4 7C 00 00 D0 */ neg r0, r0 -/* 80CBB9C8 C8 3D 00 E8 */ lfd f1, 0xe8(r29) -/* 80CBB9CC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80CBB9D0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80CBB9D4 3C 00 43 30 */ lis r0, 0x4330 -/* 80CBB9D8 90 01 00 40 */ stw r0, 0x40(r1) -/* 80CBB9DC C8 01 00 40 */ lfd f0, 0x40(r1) -/* 80CBB9E0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80CBB9E4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80CBB9E8 FC 00 00 1E */ fctiwz f0, f0 -/* 80CBB9EC D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80CBB9F0 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80CBB9F4 B0 1A 0B AC */ sth r0, 0xbac(r26) -lbl_80CBB9F8: -/* 80CBB9F8 39 61 00 70 */ addi r11, r1, 0x70 -/* 80CBB9FC 4B 6A 68 1D */ bl _restgpr_25 -/* 80CBBA00 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80CBBA04 7C 08 03 A6 */ mtlr r0 -/* 80CBBA08 38 21 00 70 */ addi r1, r1, 0x70 -/* 80CBBA0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz.s deleted file mode 100644 index eb7d8a49ac..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz.s +++ /dev/null @@ -1,235 +0,0 @@ -lbl_80CBA8A8: -/* 80CBA8A8 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80CBA8AC 7C 08 02 A6 */ mflr r0 -/* 80CBA8B0 90 01 00 84 */ stw r0, 0x84(r1) -/* 80CBA8B4 39 61 00 80 */ addi r11, r1, 0x80 -/* 80CBA8B8 4B 6A 79 1D */ bl _savegpr_27 -/* 80CBA8BC 7C 7D 1B 78 */ mr r29, r3 -/* 80CBA8C0 3C 60 80 CC */ lis r3, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CBA8C4 3B E3 C3 68 */ addi r31, r3, l_cull_box@l /* 0x80CBC368@l */ -/* 80CBA8C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBA8CC 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBA8D0 83 DB 5D AC */ lwz r30, 0x5dac(r27) -/* 80CBA8D4 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80CBA8D8 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80CBA8DC D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CBA8E0 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80CBA8E4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CBA8E8 C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 80CBA8EC D0 01 00 08 */ stfs f0, 8(r1) -/* 80CBA8F0 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CBA8F4 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 80CBA8F8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBA8FC D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80CBA900 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80CBA904 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80CBA908 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CBA90C 3C 60 80 CC */ lis r3, search_coach__FPvPv@ha /* 0x80CB9C98@ha */ -/* 80CBA910 38 63 9C 98 */ addi r3, r3, search_coach__FPvPv@l /* 0x80CB9C98@l */ -/* 80CBA914 7F A4 EB 78 */ mr r4, r29 -/* 80CBA918 4B 35 EE E1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80CBA91C 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80CBA920 41 82 00 C8 */ beq lbl_80CBA9E8 -/* 80CBA924 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80CBA928 4B 35 24 3D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBA92C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA930 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA934 A8 9C 04 E6 */ lha r4, 0x4e6(r28) -/* 80CBA938 4B 35 1A FD */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA93C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA940 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA944 38 81 00 20 */ addi r4, r1, 0x20 -/* 80CBA948 7C 85 23 78 */ mr r5, r4 -/* 80CBA94C 4B 68 C4 21 */ bl PSMTXMultVec -/* 80CBA950 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CBA954 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CBA958 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80CBA95C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CBA960 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CBA964 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CBA968 38 7D 0C 30 */ addi r3, r29, 0xc30 -/* 80CBA96C 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CBA970 4B 68 BC 41 */ bl PSMTXInverse -/* 80CBA974 38 61 00 38 */ addi r3, r1, 0x38 -/* 80CBA978 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA97C 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA980 4B 68 BB 31 */ bl PSMTXCopy -/* 80CBA984 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA988 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA98C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBA990 7C 85 23 78 */ mr r5, r4 -/* 80CBA994 4B 68 C3 D9 */ bl PSMTXMultVec -/* 80CBA998 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBA99C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80CBA9A0 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBA9A4 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBA9A8 40 82 00 40 */ bne lbl_80CBA9E8 -/* 80CBA9AC C0 01 00 08 */ lfs f0, 8(r1) -/* 80CBA9B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBA9B4 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBA9B8 40 82 00 30 */ bne lbl_80CBA9E8 -/* 80CBA9BC C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBA9C0 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 80CBA9C4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBA9C8 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBA9CC 40 82 00 1C */ bne lbl_80CBA9E8 -/* 80CBA9D0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80CBA9D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBA9D8 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBA9DC 40 82 00 0C */ bne lbl_80CBA9E8 -/* 80CBA9E0 38 60 00 02 */ li r3, 2 -/* 80CBA9E4 48 00 02 3C */ b lbl_80CBAC20 -lbl_80CBA9E8: -/* 80CBA9E8 80 7B 5D AC */ lwz r3, 0x5dac(r27) -/* 80CBA9EC 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80CBA9F0 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 80CBA9F4 7D 89 03 A6 */ mtctr r12 -/* 80CBA9F8 4E 80 04 21 */ bctrl -/* 80CBA9FC 28 03 00 00 */ cmplwi r3, 0 -/* 80CBAA00 41 82 00 F0 */ beq lbl_80CBAAF0 -/* 80CBAA04 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80CBAA08 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80CBAA0C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80CBAA10 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80CBAA14 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CBAA18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBAA1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBAA20 83 63 5D B8 */ lwz r27, 0x5db8(r3) -/* 80CBAA24 28 1B 00 00 */ cmplwi r27, 0 -/* 80CBAA28 41 82 00 C8 */ beq lbl_80CBAAF0 -/* 80CBAA2C 38 7B 04 D0 */ addi r3, r27, 0x4d0 -/* 80CBAA30 4B 35 23 35 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBAA34 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAA38 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAA3C A8 9B 04 E6 */ lha r4, 0x4e6(r27) -/* 80CBAA40 4B 35 19 F5 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBAA44 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAA48 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAA4C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80CBAA50 7C 85 23 78 */ mr r5, r4 -/* 80CBAA54 4B 68 C3 19 */ bl PSMTXMultVec -/* 80CBAA58 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CBAA5C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CBAA60 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80CBAA64 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CBAA68 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CBAA6C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CBAA70 38 7D 0C 30 */ addi r3, r29, 0xc30 -/* 80CBAA74 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CBAA78 4B 68 BB 39 */ bl PSMTXInverse -/* 80CBAA7C 38 61 00 38 */ addi r3, r1, 0x38 -/* 80CBAA80 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAA84 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAA88 4B 68 BA 29 */ bl PSMTXCopy -/* 80CBAA8C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAA90 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAA94 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBAA98 7C 85 23 78 */ mr r5, r4 -/* 80CBAA9C 4B 68 C2 D1 */ bl PSMTXMultVec -/* 80CBAAA0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBAAA4 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80CBAAA8 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAAAC 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAAB0 40 82 00 40 */ bne lbl_80CBAAF0 -/* 80CBAAB4 C0 01 00 08 */ lfs f0, 8(r1) -/* 80CBAAB8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAABC 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAAC0 40 82 00 30 */ bne lbl_80CBAAF0 -/* 80CBAAC4 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBAAC8 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 80CBAACC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAAD0 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAAD4 40 82 00 1C */ bne lbl_80CBAAF0 -/* 80CBAAD8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80CBAADC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAAE0 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAAE4 40 82 00 0C */ bne lbl_80CBAAF0 -/* 80CBAAE8 38 60 00 03 */ li r3, 3 -/* 80CBAAEC 48 00 01 34 */ b lbl_80CBAC20 -lbl_80CBAAF0: -/* 80CBAAF0 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80CBAAF4 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80CBAAF8 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CBAAFC C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80CBAB00 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CBAB04 C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 80CBAB08 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CBAB0C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CBAB10 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80CBAB14 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBAB18 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CBAB1C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CBAB20 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CBAB24 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CBAB28 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CBAB2C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CBAB30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBAB34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBAB38 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80CBAB3C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80CBAB40 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80CBAB44 41 82 00 18 */ beq lbl_80CBAB5C -/* 80CBAB48 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80CBAB4C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80CBAB50 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 80CBAB54 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CBAB58 48 00 00 10 */ b lbl_80CBAB68 -lbl_80CBAB5C: -/* 80CBAB5C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80CBAB60 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80CBAB64 D0 21 00 28 */ stfs f1, 0x28(r1) -lbl_80CBAB68: -/* 80CBAB68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAB6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAB70 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80CBAB74 4B 35 18 69 */ bl mDoMtx_YrotS__FPA4_fs -/* 80CBAB78 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAB7C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAB80 38 81 00 20 */ addi r4, r1, 0x20 -/* 80CBAB84 7C 85 23 78 */ mr r5, r4 -/* 80CBAB88 4B 68 C1 E5 */ bl PSMTXMultVec -/* 80CBAB8C 38 61 00 2C */ addi r3, r1, 0x2c -/* 80CBAB90 38 81 00 20 */ addi r4, r1, 0x20 -/* 80CBAB94 7C 65 1B 78 */ mr r5, r3 -/* 80CBAB98 4B 68 C4 F9 */ bl PSVECAdd -/* 80CBAB9C 38 7D 0C 30 */ addi r3, r29, 0xc30 -/* 80CBABA0 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CBABA4 4B 68 BA 0D */ bl PSMTXInverse -/* 80CBABA8 38 61 00 38 */ addi r3, r1, 0x38 -/* 80CBABAC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBABB0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBABB4 4B 68 B8 FD */ bl PSMTXCopy -/* 80CBABB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBABBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBABC0 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBABC4 7C 85 23 78 */ mr r5, r4 -/* 80CBABC8 4B 68 C1 A5 */ bl PSMTXMultVec -/* 80CBABCC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBABD0 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80CBABD4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBABD8 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBABDC 40 82 00 40 */ bne lbl_80CBAC1C -/* 80CBABE0 C0 01 00 08 */ lfs f0, 8(r1) -/* 80CBABE4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBABE8 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBABEC 40 82 00 30 */ bne lbl_80CBAC1C -/* 80CBABF0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBABF4 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 80CBABF8 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBABFC 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAC00 40 82 00 1C */ bne lbl_80CBAC1C -/* 80CBAC04 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80CBAC08 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAC0C 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAC10 40 82 00 0C */ bne lbl_80CBAC1C -/* 80CBAC14 38 60 00 01 */ li r3, 1 -/* 80CBAC18 48 00 00 08 */ b lbl_80CBAC20 -lbl_80CBAC1C: -/* 80CBAC1C 38 60 00 00 */ li r3, 0 -lbl_80CBAC20: -/* 80CBAC20 39 61 00 80 */ addi r11, r1, 0x80 -/* 80CBAC24 4B 6A 75 FD */ bl _restgpr_27 -/* 80CBAC28 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80CBAC2C 7C 08 03 A6 */ mtlr r0 -/* 80CBAC30 38 21 00 80 */ addi r1, r1, 0x80 -/* 80CBAC34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz.s deleted file mode 100644 index 71562c99aa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz.s +++ /dev/null @@ -1,234 +0,0 @@ -lbl_80CBAC38: -/* 80CBAC38 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 80CBAC3C 7C 08 02 A6 */ mflr r0 -/* 80CBAC40 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 80CBAC44 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80CBAC48 4B 6A 75 8D */ bl _savegpr_27 -/* 80CBAC4C 7C 7D 1B 78 */ mr r29, r3 -/* 80CBAC50 3C 60 80 CC */ lis r3, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CBAC54 3B E3 C3 68 */ addi r31, r3, l_cull_box@l /* 0x80CBC368@l */ -/* 80CBAC58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBAC5C 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBAC60 83 DB 5D AC */ lwz r30, 0x5dac(r27) -/* 80CBAC64 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80CBAC68 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80CBAC6C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80CBAC70 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 80CBAC74 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CBAC78 C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 80CBAC7C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CBAC80 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CBAC84 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80CBAC88 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CBAC8C D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80CBAC90 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 80CBAC94 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CBAC98 3C 60 80 CC */ lis r3, search_coach__FPvPv@ha /* 0x80CB9C98@ha */ -/* 80CBAC9C 38 63 9C 98 */ addi r3, r3, search_coach__FPvPv@l /* 0x80CB9C98@l */ -/* 80CBACA0 7F A4 EB 78 */ mr r4, r29 -/* 80CBACA4 4B 35 EB 55 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80CBACA8 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80CBACAC 41 82 00 C8 */ beq lbl_80CBAD74 -/* 80CBACB0 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80CBACB4 4B 35 20 B1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBACB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBACBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBACC0 A8 9C 04 E6 */ lha r4, 0x4e6(r28) -/* 80CBACC4 4B 35 17 71 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBACC8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBACCC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBACD0 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBACD4 7C 85 23 78 */ mr r5, r4 -/* 80CBACD8 4B 68 C0 95 */ bl PSMTXMultVec -/* 80CBACDC C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80CBACE0 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CBACE4 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80CBACE8 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CBACEC C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80CBACF0 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80CBACF4 38 7D 0C 00 */ addi r3, r29, 0xc00 -/* 80CBACF8 38 81 00 74 */ addi r4, r1, 0x74 -/* 80CBACFC 4B 68 B8 B5 */ bl PSMTXInverse -/* 80CBAD00 38 61 00 74 */ addi r3, r1, 0x74 -/* 80CBAD04 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAD08 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAD0C 4B 68 B7 A5 */ bl PSMTXCopy -/* 80CBAD10 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAD14 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAD18 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CBAD1C 7C 85 23 78 */ mr r5, r4 -/* 80CBAD20 4B 68 C0 4D */ bl PSMTXMultVec -/* 80CBAD24 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CBAD28 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 80CBAD2C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAD30 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAD34 40 82 00 40 */ bne lbl_80CBAD74 -/* 80CBAD38 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBAD3C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAD40 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAD44 40 82 00 30 */ bne lbl_80CBAD74 -/* 80CBAD48 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CBAD4C C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80CBAD50 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAD54 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAD58 40 82 00 1C */ bne lbl_80CBAD74 -/* 80CBAD5C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBAD60 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAD64 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAD68 40 82 00 0C */ bne lbl_80CBAD74 -/* 80CBAD6C 38 60 00 02 */ li r3, 2 -/* 80CBAD70 48 00 02 3C */ b lbl_80CBAFAC -lbl_80CBAD74: -/* 80CBAD74 80 7B 5D AC */ lwz r3, 0x5dac(r27) -/* 80CBAD78 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80CBAD7C 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 80CBAD80 7D 89 03 A6 */ mtctr r12 -/* 80CBAD84 4E 80 04 21 */ bctrl -/* 80CBAD88 28 03 00 00 */ cmplwi r3, 0 -/* 80CBAD8C 41 82 00 F0 */ beq lbl_80CBAE7C -/* 80CBAD90 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80CBAD94 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CBAD98 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CBAD9C C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80CBADA0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CBADA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBADA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBADAC 83 63 5D B8 */ lwz r27, 0x5db8(r3) -/* 80CBADB0 28 1B 00 00 */ cmplwi r27, 0 -/* 80CBADB4 41 82 00 C8 */ beq lbl_80CBAE7C -/* 80CBADB8 38 7B 04 D0 */ addi r3, r27, 0x4d0 -/* 80CBADBC 4B 35 1F A9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBADC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBADC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBADC8 A8 9B 04 E6 */ lha r4, 0x4e6(r27) -/* 80CBADCC 4B 35 16 69 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBADD0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBADD4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBADD8 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBADDC 7C 85 23 78 */ mr r5, r4 -/* 80CBADE0 4B 68 BF 8D */ bl PSMTXMultVec -/* 80CBADE4 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80CBADE8 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CBADEC C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80CBADF0 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CBADF4 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80CBADF8 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80CBADFC 38 7D 0C 00 */ addi r3, r29, 0xc00 -/* 80CBAE00 38 81 00 74 */ addi r4, r1, 0x74 -/* 80CBAE04 4B 68 B7 AD */ bl PSMTXInverse -/* 80CBAE08 38 61 00 74 */ addi r3, r1, 0x74 -/* 80CBAE0C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAE10 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAE14 4B 68 B6 9D */ bl PSMTXCopy -/* 80CBAE18 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAE1C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAE20 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CBAE24 7C 85 23 78 */ mr r5, r4 -/* 80CBAE28 4B 68 BF 45 */ bl PSMTXMultVec -/* 80CBAE2C C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CBAE30 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 80CBAE34 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAE38 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAE3C 40 82 00 40 */ bne lbl_80CBAE7C -/* 80CBAE40 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBAE44 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAE48 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAE4C 40 82 00 30 */ bne lbl_80CBAE7C -/* 80CBAE50 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CBAE54 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80CBAE58 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAE5C 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAE60 40 82 00 1C */ bne lbl_80CBAE7C -/* 80CBAE64 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBAE68 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAE6C 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAE70 40 82 00 0C */ bne lbl_80CBAE7C -/* 80CBAE74 38 60 00 03 */ li r3, 3 -/* 80CBAE78 48 00 01 34 */ b lbl_80CBAFAC -lbl_80CBAE7C: -/* 80CBAE7C C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80CBAE80 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80CBAE84 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80CBAE88 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80CBAE8C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CBAE90 C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 80CBAE94 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CBAE98 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CBAE9C C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80CBAEA0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80CBAEA4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CBAEA8 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CBAEAC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CBAEB0 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CBAEB4 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CBAEB8 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80CBAEBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBAEC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBAEC4 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80CBAEC8 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80CBAECC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80CBAED0 41 82 00 18 */ beq lbl_80CBAEE8 -/* 80CBAED4 D0 21 00 08 */ stfs f1, 8(r1) -/* 80CBAED8 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CBAEDC C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 80CBAEE0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBAEE4 48 00 00 10 */ b lbl_80CBAEF4 -lbl_80CBAEE8: -/* 80CBAEE8 D0 21 00 08 */ stfs f1, 8(r1) -/* 80CBAEEC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CBAEF0 D0 21 00 10 */ stfs f1, 0x10(r1) -lbl_80CBAEF4: -/* 80CBAEF4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAEF8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAEFC A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80CBAF00 4B 35 14 DD */ bl mDoMtx_YrotS__FPA4_fs -/* 80CBAF04 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAF08 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAF0C 38 81 00 08 */ addi r4, r1, 8 -/* 80CBAF10 7C 85 23 78 */ mr r5, r4 -/* 80CBAF14 4B 68 BE 59 */ bl PSMTXMultVec -/* 80CBAF18 38 61 00 38 */ addi r3, r1, 0x38 -/* 80CBAF1C 38 81 00 08 */ addi r4, r1, 8 -/* 80CBAF20 7C 65 1B 78 */ mr r5, r3 -/* 80CBAF24 4B 68 C1 6D */ bl PSVECAdd -/* 80CBAF28 38 7D 0C 00 */ addi r3, r29, 0xc00 -/* 80CBAF2C 38 81 00 44 */ addi r4, r1, 0x44 -/* 80CBAF30 4B 68 B6 81 */ bl PSMTXInverse -/* 80CBAF34 38 61 00 44 */ addi r3, r1, 0x44 -/* 80CBAF38 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAF3C 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAF40 4B 68 B5 71 */ bl PSMTXCopy -/* 80CBAF44 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBAF48 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBAF4C 38 81 00 38 */ addi r4, r1, 0x38 -/* 80CBAF50 7C 85 23 78 */ mr r5, r4 -/* 80CBAF54 4B 68 BE 19 */ bl PSMTXMultVec -/* 80CBAF58 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80CBAF5C C0 21 00 38 */ lfs f1, 0x38(r1) -/* 80CBAF60 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAF64 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAF68 40 82 00 40 */ bne lbl_80CBAFA8 -/* 80CBAF6C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBAF70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAF74 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAF78 40 82 00 30 */ bne lbl_80CBAFA8 -/* 80CBAF7C C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80CBAF80 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80CBAF84 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80CBAF88 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAF8C 40 82 00 1C */ bne lbl_80CBAFA8 -/* 80CBAF90 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBAF94 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBAF98 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBAF9C 40 82 00 0C */ bne lbl_80CBAFA8 -/* 80CBAFA0 38 60 00 01 */ li r3, 1 -/* 80CBAFA4 48 00 00 08 */ b lbl_80CBAFAC -lbl_80CBAFA8: -/* 80CBAFA8 38 60 00 00 */ li r3, 0 -lbl_80CBAFAC: -/* 80CBAFAC 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80CBAFB0 4B 6A 72 71 */ bl _restgpr_27 -/* 80CBAFB4 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 80CBAFB8 7C 08 03 A6 */ mtlr r0 -/* 80CBAFBC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80CBAFC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirL__12daObjRgate_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirL__12daObjRgate_cFP10fopAc_ac_c.s deleted file mode 100644 index 37c33b3e39..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirL__12daObjRgate_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80CBB0F0: -/* 80CBB0F0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80CBB0F4 7C 08 02 A6 */ mflr r0 -/* 80CBB0F8 90 01 00 54 */ stw r0, 0x54(r1) -/* 80CBB0FC 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80CBB100 7C 9F 23 78 */ mr r31, r4 -/* 80CBB104 38 63 0C 30 */ addi r3, r3, 0xc30 -/* 80CBB108 38 81 00 14 */ addi r4, r1, 0x14 -/* 80CBB10C 4B 68 B4 A5 */ bl PSMTXInverse -/* 80CBB110 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CBB114 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CBB118 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CBB11C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CBB120 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80CBB124 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBB128 38 61 00 14 */ addi r3, r1, 0x14 -/* 80CBB12C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBB130 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBB134 4B 68 B3 7D */ bl PSMTXCopy -/* 80CBB138 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBB13C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBB140 38 81 00 08 */ addi r4, r1, 8 -/* 80CBB144 7C 85 23 78 */ mr r5, r4 -/* 80CBB148 4B 68 BC 25 */ bl PSMTXMultVec -/* 80CBB14C C0 21 00 10 */ lfs f1, 0x10(r1) -/* 80CBB150 3C 60 80 CC */ lis r3, lit_3897@ha /* 0x80CBC3C4@ha */ -/* 80CBB154 C0 03 C3 C4 */ lfs f0, lit_3897@l(r3) /* 0x80CBC3C4@l */ -/* 80CBB158 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBB15C 7C 00 00 26 */ mfcr r0 -/* 80CBB160 54 00 17 FE */ rlwinm r0, r0, 2, 0x1f, 0x1f -/* 80CBB164 7C 00 00 34 */ cntlzw r0, r0 -/* 80CBB168 54 03 D9 7E */ srwi r3, r0, 5 -/* 80CBB16C 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 80CBB170 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80CBB174 7C 08 03 A6 */ mtlr r0 -/* 80CBB178 38 21 00 50 */ addi r1, r1, 0x50 -/* 80CBB17C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirR__12daObjRgate_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirR__12daObjRgate_cFP10fopAc_ac_c.s deleted file mode 100644 index f6c5e21e0c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirR__12daObjRgate_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80CBB180: -/* 80CBB180 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80CBB184 7C 08 02 A6 */ mflr r0 -/* 80CBB188 90 01 00 54 */ stw r0, 0x54(r1) -/* 80CBB18C 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80CBB190 7C 9F 23 78 */ mr r31, r4 -/* 80CBB194 38 63 0C 00 */ addi r3, r3, 0xc00 -/* 80CBB198 38 81 00 14 */ addi r4, r1, 0x14 -/* 80CBB19C 4B 68 B4 15 */ bl PSMTXInverse -/* 80CBB1A0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CBB1A4 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CBB1A8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CBB1AC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CBB1B0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80CBB1B4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBB1B8 38 61 00 14 */ addi r3, r1, 0x14 -/* 80CBB1BC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBB1C0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBB1C4 4B 68 B2 ED */ bl PSMTXCopy -/* 80CBB1C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBB1CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBB1D0 38 81 00 08 */ addi r4, r1, 8 -/* 80CBB1D4 7C 85 23 78 */ mr r5, r4 -/* 80CBB1D8 4B 68 BB 95 */ bl PSMTXMultVec -/* 80CBB1DC C0 21 00 10 */ lfs f1, 0x10(r1) -/* 80CBB1E0 3C 60 80 CC */ lis r3, lit_3897@ha /* 0x80CBC3C4@ha */ -/* 80CBB1E4 C0 03 C3 C4 */ lfs f0, lit_3897@l(r3) /* 0x80CBC3C4@l */ -/* 80CBB1E8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBB1EC 7C 00 00 26 */ mfcr r0 -/* 80CBB1F0 54 00 0F FE */ srwi r0, r0, 0x1f -/* 80CBB1F4 7C 00 00 34 */ cntlzw r0, r0 -/* 80CBB1F8 54 03 D9 7E */ srwi r3, r0, 5 -/* 80CBB1FC 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 80CBB200 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80CBB204 7C 08 03 A6 */ mtlr r0 -/* 80CBB208 38 21 00 50 */ addi r1, r1, 0x50 -/* 80CBB20C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkOpen__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkOpen__12daObjRgate_cFv.s deleted file mode 100644 index 7e18b0500a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkOpen__12daObjRgate_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_80CBAFC4: -/* 80CBAFC4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80CBAFC8 7C 08 02 A6 */ mflr r0 -/* 80CBAFCC 90 01 00 74 */ stw r0, 0x74(r1) -/* 80CBAFD0 39 61 00 70 */ addi r11, r1, 0x70 -/* 80CBAFD4 4B 6A 72 09 */ bl _savegpr_29 -/* 80CBAFD8 7C 7D 1B 78 */ mr r29, r3 -/* 80CBAFDC 3C 60 80 CC */ lis r3, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CBAFE0 3B E3 C3 68 */ addi r31, r3, l_cull_box@l /* 0x80CBC368@l */ -/* 80CBAFE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBAFE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBAFEC 88 03 09 74 */ lbz r0, 0x974(r3) -/* 80CBAFF0 28 00 00 00 */ cmplwi r0, 0 -/* 80CBAFF4 40 82 00 0C */ bne lbl_80CBB000 -/* 80CBAFF8 38 60 00 00 */ li r3, 0 -/* 80CBAFFC 48 00 00 DC */ b lbl_80CBB0D8 -lbl_80CBB000: -/* 80CBB000 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80CBB004 A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 80CBB008 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80CBB00C 7C 03 00 50 */ subf r0, r3, r0 -/* 80CBB010 7C 03 07 34 */ extsh r3, r0 -/* 80CBB014 4B 6A A0 BD */ bl abs -/* 80CBB018 2C 03 50 00 */ cmpwi r3, 0x5000 -/* 80CBB01C 40 80 00 0C */ bge lbl_80CBB028 -/* 80CBB020 38 60 00 00 */ li r3, 0 -/* 80CBB024 48 00 00 B4 */ b lbl_80CBB0D8 -lbl_80CBB028: -/* 80CBB028 38 7D 0B 14 */ addi r3, r29, 0xb14 -/* 80CBB02C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBB030 4B 68 B5 81 */ bl PSMTXInverse -/* 80CBB034 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CBB038 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80CBB03C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CBB040 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80CBB044 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CBB048 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CBB04C 38 61 00 2C */ addi r3, r1, 0x2c -/* 80CBB050 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBB054 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBB058 4B 68 B4 59 */ bl PSMTXCopy -/* 80CBB05C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBB060 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBB064 38 81 00 20 */ addi r4, r1, 0x20 -/* 80CBB068 7C 85 23 78 */ mr r5, r4 -/* 80CBB06C 4B 68 BD 01 */ bl PSMTXMultVec -/* 80CBB070 C0 5F 00 9C */ lfs f2, 0x9c(r31) -/* 80CBB074 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80CBB078 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80CBB07C D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80CBB080 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80CBB084 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80CBB088 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CBB08C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CBB090 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBB094 C0 61 00 20 */ lfs f3, 0x20(r1) -/* 80CBB098 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 80CBB09C 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBB0A0 40 82 00 34 */ bne lbl_80CBB0D4 -/* 80CBB0A4 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80CBB0A8 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBB0AC 40 82 00 28 */ bne lbl_80CBB0D4 -/* 80CBB0B0 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 80CBB0B4 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 80CBB0B8 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBB0BC 40 82 00 18 */ bne lbl_80CBB0D4 -/* 80CBB0C0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80CBB0C4 4C 40 13 82 */ cror 2, 0, 2 -/* 80CBB0C8 40 82 00 0C */ bne lbl_80CBB0D4 -/* 80CBB0CC 38 60 00 01 */ li r3, 1 -/* 80CBB0D0 48 00 00 08 */ b lbl_80CBB0D8 -lbl_80CBB0D4: -/* 80CBB0D4 38 60 00 00 */ li r3, 0 -lbl_80CBB0D8: -/* 80CBB0D8 39 61 00 70 */ addi r11, r1, 0x70 -/* 80CBB0DC 4B 6A 71 4D */ bl _restgpr_29 -/* 80CBB0E0 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80CBB0E4 7C 08 03 A6 */ mtlr r0 -/* 80CBB0E8 38 21 00 70 */ addi r1, r1, 0x70 -/* 80CBB0EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/create1st__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/create1st__12daObjRgate_cFv.s deleted file mode 100644 index a2f7a49aba..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/create1st__12daObjRgate_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80CBA828: -/* 80CBA828 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBA82C 7C 08 02 A6 */ mflr r0 -/* 80CBA830 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBA834 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBA838 7C 7F 1B 78 */ mr r31, r3 -/* 80CBA83C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80CBA840 3C 80 80 CC */ lis r4, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA844 38 84 C4 C0 */ addi r4, r4, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA848 80 84 00 00 */ lwz r4, 0(r4) -/* 80CBA84C 4B 37 26 71 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CBA850 7C 60 1B 78 */ mr r0, r3 -/* 80CBA854 2C 00 00 04 */ cmpwi r0, 4 -/* 80CBA858 40 82 00 38 */ bne lbl_80CBA890 -/* 80CBA85C 7F E3 FB 78 */ mr r3, r31 -/* 80CBA860 3C 80 80 CC */ lis r4, l_arcName@ha /* 0x80CBC4C0@ha */ -/* 80CBA864 38 84 C4 C0 */ addi r4, r4, l_arcName@l /* 0x80CBC4C0@l */ -/* 80CBA868 80 84 00 00 */ lwz r4, 0(r4) -/* 80CBA86C 38 A0 00 0A */ li r5, 0xa -/* 80CBA870 38 C0 00 00 */ li r6, 0 -/* 80CBA874 38 E0 21 80 */ li r7, 0x2180 -/* 80CBA878 39 00 00 00 */ li r8, 0 -/* 80CBA87C 4B 3B DF 41 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80CBA880 7C 60 1B 78 */ mr r0, r3 -/* 80CBA884 2C 00 00 05 */ cmpwi r0, 5 -/* 80CBA888 40 82 00 08 */ bne lbl_80CBA890 -/* 80CBA88C 48 00 00 08 */ b lbl_80CBA894 -lbl_80CBA890: -/* 80CBA890 7C 03 03 78 */ mr r3, r0 -lbl_80CBA894: -/* 80CBA894 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBA898 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBA89C 7C 08 03 A6 */ mtlr r0 -/* 80CBA8A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBA8A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDelete__FP12daObjRgate_c.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDelete__FP12daObjRgate_c.s deleted file mode 100644 index c1cd664b13..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDelete__FP12daObjRgate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CBC290: -/* 80CBC290 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC294 7C 08 02 A6 */ mflr r0 -/* 80CBC298 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC29C 4B 3B C6 41 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80CBC2A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC2A4 7C 08 03 A6 */ mtlr r0 -/* 80CBC2A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC2AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDraw__FP12daObjRgate_c.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDraw__FP12daObjRgate_c.s deleted file mode 100644 index 9e310b29fd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDraw__FP12daObjRgate_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CBC2D0: -/* 80CBC2D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC2D4 7C 08 02 A6 */ mflr r0 -/* 80CBC2D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC2DC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80CBC2E0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80CBC2E4 7D 89 03 A6 */ mtctr r12 -/* 80CBC2E8 4E 80 04 21 */ bctrl -/* 80CBC2EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC2F0 7C 08 03 A6 */ mtlr r0 -/* 80CBC2F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC2F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGExecute__FP12daObjRgate_c.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGExecute__FP12daObjRgate_c.s deleted file mode 100644 index c726af7855..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGExecute__FP12daObjRgate_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CBC2B0: -/* 80CBC2B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBC2B4 7C 08 02 A6 */ mflr r0 -/* 80CBC2B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBC2BC 4B 3B C6 95 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80CBC2C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC2C4 7C 08 03 A6 */ mtlr r0 -/* 80CBC2C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC2CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_create1st__FP12daObjRgate_c.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_create1st__FP12daObjRgate_c.s deleted file mode 100644 index a533d2cc97..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_create1st__FP12daObjRgate_c.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80CBBFA0: -/* 80CBBFA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBFA4 7C 08 02 A6 */ mflr r0 -/* 80CBBFA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBFAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CBBFB0 93 C1 00 08 */ stw r30, 8(r1) -/* 80CBBFB4 7C 7F 1B 78 */ mr r31, r3 -/* 80CBBFB8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CBBFBC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CBBFC0 40 82 00 74 */ bne lbl_80CBC034 -/* 80CBBFC4 7F E0 FB 79 */ or. r0, r31, r31 -/* 80CBBFC8 41 82 00 60 */ beq lbl_80CBC028 -/* 80CBBFCC 7C 1E 03 78 */ mr r30, r0 -/* 80CBBFD0 4B 3B C6 55 */ bl __ct__16dBgS_MoveBgActorFv -/* 80CBBFD4 3C 60 80 CC */ lis r3, __vt__12daObjRgate_c@ha /* 0x80CBC59C@ha */ -/* 80CBBFD8 38 03 C5 9C */ addi r0, r3, __vt__12daObjRgate_c@l /* 0x80CBC59C@l */ -/* 80CBBFDC 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80CBBFE0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CBBFE4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CBBFE8 90 1E 05 CC */ stw r0, 0x5cc(r30) -/* 80CBBFEC 38 7E 05 D0 */ addi r3, r30, 0x5d0 -/* 80CBBFF0 4B 3C 77 71 */ bl __ct__10dCcD_GSttsFv -/* 80CBBFF4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CBBFF8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CBBFFC 90 7E 05 CC */ stw r3, 0x5cc(r30) -/* 80CBC000 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CBC004 90 1E 05 D0 */ stw r0, 0x5d0(r30) -/* 80CBC008 38 7E 05 F0 */ addi r3, r30, 0x5f0 -/* 80CBC00C 3C 80 80 CC */ lis r4, __ct__8dCcD_CylFv@ha /* 0x80CBC120@ha */ -/* 80CBC010 38 84 C1 20 */ addi r4, r4, __ct__8dCcD_CylFv@l /* 0x80CBC120@l */ -/* 80CBC014 3C A0 80 CC */ lis r5, __dt__8dCcD_CylFv@ha /* 0x80CBC054@ha */ -/* 80CBC018 38 A5 C0 54 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 0x80CBC054@l */ -/* 80CBC01C 38 C0 01 3C */ li r6, 0x13c -/* 80CBC020 38 E0 00 04 */ li r7, 4 -/* 80CBC024 4B 6A 5D 3D */ bl __construct_array -lbl_80CBC028: -/* 80CBC028 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CBC02C 60 00 00 08 */ ori r0, r0, 8 -/* 80CBC030 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CBC034: -/* 80CBC034 7F E3 FB 78 */ mr r3, r31 -/* 80CBC038 4B FF E7 F1 */ bl create1st__12daObjRgate_cFv -/* 80CBC03C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CBC040 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CBC044 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBC048 7C 08 03 A6 */ mtlr r0 -/* 80CBC04C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBC050 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/demoProc__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/demoProc__12daObjRgate_cFv.s deleted file mode 100644 index 780b221e22..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/demoProc__12daObjRgate_cFv.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_80CBBC04: -/* 80CBBC04 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CBBC08 7C 08 02 A6 */ mflr r0 -/* 80CBBC0C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CBBC10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CBBC14 4B 6A 65 C9 */ bl _savegpr_29 -/* 80CBBC18 7C 7D 1B 78 */ mr r29, r3 -/* 80CBBC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBC24 3B C3 4F F8 */ addi r30, r3, 0x4ff8 -/* 80CBBC28 7F C3 F3 78 */ mr r3, r30 -/* 80CBBC2C 3C 80 80 CC */ lis r4, d_a_obj_rgate__stringBase0@ha /* 0x80CBC458@ha */ -/* 80CBBC30 38 84 C4 58 */ addi r4, r4, d_a_obj_rgate__stringBase0@l /* 0x80CBC458@l */ -/* 80CBBC34 38 84 00 1C */ addi r4, r4, 0x1c -/* 80CBBC38 38 A0 00 00 */ li r5, 0 -/* 80CBBC3C 38 C0 00 00 */ li r6, 0 -/* 80CBBC40 4B 38 BE DD */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80CBBC44 90 7D 0B A4 */ stw r3, 0xba4(r29) -/* 80CBBC48 7F A3 EB 78 */ mr r3, r29 -/* 80CBBC4C 48 00 01 1D */ bl getDemoAction__12daObjRgate_cFv -/* 80CBBC50 7C 7F 1B 78 */ mr r31, r3 -/* 80CBBC54 7F C3 F3 78 */ mr r3, r30 -/* 80CBBC58 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBC5C 4B 38 C0 F1 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80CBBC60 2C 03 00 00 */ cmpwi r3, 0 -/* 80CBBC64 41 82 00 68 */ beq lbl_80CBBCCC -/* 80CBBC68 2C 1F 00 03 */ cmpwi r31, 3 -/* 80CBBC6C 41 82 00 50 */ beq lbl_80CBBCBC -/* 80CBBC70 40 80 00 5C */ bge lbl_80CBBCCC -/* 80CBBC74 2C 1F 00 00 */ cmpwi r31, 0 -/* 80CBBC78 41 82 00 08 */ beq lbl_80CBBC80 -/* 80CBBC7C 48 00 00 50 */ b lbl_80CBBCCC -lbl_80CBBC80: -/* 80CBBC80 7F C3 F3 78 */ mr r3, r30 -/* 80CBBC84 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBC88 3C A0 80 CC */ lis r5, d_a_obj_rgate__stringBase0@ha /* 0x80CBC458@ha */ -/* 80CBBC8C 38 A5 C4 58 */ addi r5, r5, d_a_obj_rgate__stringBase0@l /* 0x80CBC458@l */ -/* 80CBBC90 38 A5 00 23 */ addi r5, r5, 0x23 -/* 80CBBC94 38 C0 00 03 */ li r6, 3 -/* 80CBBC98 4B 38 C4 55 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 80CBBC9C 28 03 00 00 */ cmplwi r3, 0 -/* 80CBBCA0 40 82 00 10 */ bne lbl_80CBBCB0 -/* 80CBBCA4 38 00 00 01 */ li r0, 1 -/* 80CBBCA8 98 1D 0B A8 */ stb r0, 0xba8(r29) -/* 80CBBCAC 48 00 00 20 */ b lbl_80CBBCCC -lbl_80CBBCB0: -/* 80CBBCB0 80 03 00 00 */ lwz r0, 0(r3) -/* 80CBBCB4 98 1D 0B A8 */ stb r0, 0xba8(r29) -/* 80CBBCB8 48 00 00 14 */ b lbl_80CBBCCC -lbl_80CBBCBC: -/* 80CBBCBC 38 00 03 E8 */ li r0, 0x3e8 -/* 80CBBCC0 B0 1D 0B 9C */ sth r0, 0xb9c(r29) -/* 80CBBCC4 38 00 FC 18 */ li r0, -1000 -/* 80CBBCC8 B0 1D 0B 9E */ sth r0, 0xb9e(r29) -lbl_80CBBCCC: -/* 80CBBCCC 2C 1F 00 02 */ cmpwi r31, 2 -/* 80CBBCD0 41 82 00 54 */ beq lbl_80CBBD24 -/* 80CBBCD4 40 80 00 14 */ bge lbl_80CBBCE8 -/* 80CBBCD8 2C 1F 00 00 */ cmpwi r31, 0 -/* 80CBBCDC 41 82 00 18 */ beq lbl_80CBBCF4 -/* 80CBBCE0 40 80 00 54 */ bge lbl_80CBBD34 -/* 80CBBCE4 48 00 00 60 */ b lbl_80CBBD44 -lbl_80CBBCE8: -/* 80CBBCE8 2C 1F 00 04 */ cmpwi r31, 4 -/* 80CBBCEC 40 80 00 58 */ bge lbl_80CBBD44 -/* 80CBBCF0 48 00 00 24 */ b lbl_80CBBD14 -lbl_80CBBCF4: -/* 80CBBCF4 38 7D 0B A8 */ addi r3, r29, 0xba8 -/* 80CBBCF8 48 00 06 4D */ bl func_80CBC344 -/* 80CBBCFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CBBD00 40 82 00 50 */ bne lbl_80CBBD50 -/* 80CBBD04 7F C3 F3 78 */ mr r3, r30 -/* 80CBBD08 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBD0C 4B 38 C4 71 */ bl cutEnd__16dEvent_manager_cFi -/* 80CBBD10 48 00 00 40 */ b lbl_80CBBD50 -lbl_80CBBD14: -/* 80CBBD14 7F C3 F3 78 */ mr r3, r30 -/* 80CBBD18 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBD1C 4B 38 C4 61 */ bl cutEnd__16dEvent_manager_cFi -/* 80CBBD20 48 00 00 30 */ b lbl_80CBBD50 -lbl_80CBBD24: -/* 80CBBD24 7F C3 F3 78 */ mr r3, r30 -/* 80CBBD28 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBD2C 4B 38 C4 51 */ bl cutEnd__16dEvent_manager_cFi -/* 80CBBD30 48 00 00 20 */ b lbl_80CBBD50 -lbl_80CBBD34: -/* 80CBBD34 7F C3 F3 78 */ mr r3, r30 -/* 80CBBD38 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBD3C 4B 38 C4 41 */ bl cutEnd__16dEvent_manager_cFi -/* 80CBBD40 48 00 00 10 */ b lbl_80CBBD50 -lbl_80CBBD44: -/* 80CBBD44 7F C3 F3 78 */ mr r3, r30 -/* 80CBBD48 80 9D 0B A4 */ lwz r4, 0xba4(r29) -/* 80CBBD4C 4B 38 C4 31 */ bl cutEnd__16dEvent_manager_cFi -lbl_80CBBD50: -/* 80CBBD50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CBBD54 4B 6A 64 D5 */ bl _restgpr_29 -/* 80CBBD58 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CBBD5C 7C 08 03 A6 */ mtlr r0 -/* 80CBBD60 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CBBD64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/event_proc_call__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/event_proc_call__12daObjRgate_cFv.s deleted file mode 100644 index fad62a9fa0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/event_proc_call__12daObjRgate_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80CBBB60: -/* 80CBBB60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBB64 7C 08 02 A6 */ mflr r0 -/* 80CBBB68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBB6C 3C 80 80 CC */ lis r4, cNullVec__6Z2Calc@ha /* 0x80CBC4A0@ha */ -/* 80CBBB70 38 E4 C4 A0 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80CBC4A0@l */ -/* 80CBBB74 3C 80 80 CC */ lis r4, struct_80CBC5CC+0x1@ha /* 0x80CBC5CD@ha */ -/* 80CBBB78 38 C4 C5 CD */ addi r6, r4, struct_80CBC5CC+0x1@l /* 0x80CBC5CD@l */ -/* 80CBBB7C 88 06 00 00 */ lbz r0, 0(r6) -/* 80CBBB80 7C 00 07 75 */ extsb. r0, r0 -/* 80CBBB84 40 82 00 58 */ bne lbl_80CBBBDC -/* 80CBBB88 80 87 00 24 */ lwz r4, 0x24(r7) -/* 80CBBB8C 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80CBBB90 90 87 00 48 */ stw r4, 0x48(r7) -/* 80CBBB94 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80CBBB98 80 07 00 2C */ lwz r0, 0x2c(r7) -/* 80CBBB9C 90 07 00 50 */ stw r0, 0x50(r7) -/* 80CBBBA0 38 A7 00 48 */ addi r5, r7, 0x48 -/* 80CBBBA4 80 87 00 30 */ lwz r4, 0x30(r7) -/* 80CBBBA8 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80CBBBAC 90 85 00 0C */ stw r4, 0xc(r5) -/* 80CBBBB0 90 05 00 10 */ stw r0, 0x10(r5) -/* 80CBBBB4 80 07 00 38 */ lwz r0, 0x38(r7) -/* 80CBBBB8 90 05 00 14 */ stw r0, 0x14(r5) -/* 80CBBBBC 80 87 00 3C */ lwz r4, 0x3c(r7) -/* 80CBBBC0 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80CBBBC4 90 85 00 18 */ stw r4, 0x18(r5) -/* 80CBBBC8 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80CBBBCC 80 07 00 44 */ lwz r0, 0x44(r7) -/* 80CBBBD0 90 05 00 20 */ stw r0, 0x20(r5) -/* 80CBBBD4 38 00 00 01 */ li r0, 1 -/* 80CBBBD8 98 06 00 00 */ stb r0, 0(r6) -lbl_80CBBBDC: -/* 80CBBBDC 88 03 0B A0 */ lbz r0, 0xba0(r3) -/* 80CBBBE0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80CBBBE4 39 87 00 48 */ addi r12, r7, 0x48 -/* 80CBBBE8 7D 8C 02 14 */ add r12, r12, r0 -/* 80CBBBEC 4B 6A 64 99 */ bl __ptmf_scall -/* 80CBBBF0 60 00 00 00 */ nop -/* 80CBBBF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBBBF8 7C 08 03 A6 */ mtlr r0 -/* 80CBBBFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBBC00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/func_80CBC344.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/func_80CBC344.s deleted file mode 100644 index cb24258fa7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/func_80CBC344.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CBC344: -/* 80CBC344 88 83 00 00 */ lbz r4, 0(r3) -/* 80CBC348 28 04 00 00 */ cmplwi r4, 0 -/* 80CBC34C 41 82 00 0C */ beq lbl_80CBC358 -/* 80CBC350 38 04 FF FF */ addi r0, r4, -1 -/* 80CBC354 98 03 00 00 */ stb r0, 0(r3) -lbl_80CBC358: -/* 80CBC358 88 63 00 00 */ lbz r3, 0(r3) -/* 80CBC35C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/getDemoAction__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/getDemoAction__12daObjRgate_cFv.s deleted file mode 100644 index e27d36ae14..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/getDemoAction__12daObjRgate_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80CBBD68: -/* 80CBBD68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CBBD6C 7C 08 02 A6 */ mflr r0 -/* 80CBBD70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CBBD74 7C 64 1B 78 */ mr r4, r3 -/* 80CBBD78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CBBD7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CBBD80 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80CBBD84 80 84 0B A4 */ lwz r4, 0xba4(r4) -/* 80CBBD88 3C A0 80 CC */ lis r5, action_table@ha /* 0x80CBC50C@ha */ -/* 80CBBD8C 38 A5 C5 0C */ addi r5, r5, action_table@l /* 0x80CBC50C@l */ -/* 80CBBD90 38 C0 00 04 */ li r6, 4 -/* 80CBBD94 38 E0 00 00 */ li r7, 0 -/* 80CBBD98 39 00 00 00 */ li r8, 0 -/* 80CBBD9C 4B 38 C0 75 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80CBBDA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CBBDA4 7C 08 03 A6 */ mtlr r0 -/* 80CBBDA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CBBDAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/initBaseMtx__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/initBaseMtx__12daObjRgate_cFv.s deleted file mode 100644 index fd14983cc9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/initBaseMtx__12daObjRgate_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_80CB9DF8: -/* 80CB9DF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CB9DFC 7C 08 02 A6 */ mflr r0 -/* 80CB9E00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CB9E04 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CB9E08 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80CB9E0C 7C 7F 1B 78 */ mr r31, r3 -/* 80CB9E10 3C 60 80 CC */ lis r3, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CB9E14 3B C3 C3 68 */ addi r30, r3, l_cull_box@l /* 0x80CBC368@l */ -/* 80CB9E18 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CB9E1C 4B 35 2F 49 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CB9E20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9E24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9E28 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CB9E2C 4B 35 26 09 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CB9E30 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9E34 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9E38 38 9F 0B 14 */ addi r4, r31, 0xb14 -/* 80CB9E3C 4B 68 C6 75 */ bl PSMTXCopy -/* 80CB9E40 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CB9E44 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CB9E48 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80CB9E4C C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CB9E50 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80CB9E54 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80CB9E58 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80CB9E5C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CB9E60 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CB9E64 28 00 00 FF */ cmplwi r0, 0xff -/* 80CB9E68 41 82 00 4C */ beq lbl_80CB9EB4 -/* 80CB9E6C 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80CB9E70 28 03 00 00 */ cmplwi r3, 0 -/* 80CB9E74 41 82 00 1C */ beq lbl_80CB9E90 -/* 80CB9E78 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CB9E7C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80CB9E80 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CB9E84 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80CB9E88 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80CB9E8C D0 03 00 20 */ stfs f0, 0x20(r3) -lbl_80CB9E90: -/* 80CB9E90 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80CB9E94 28 03 00 00 */ cmplwi r3, 0 -/* 80CB9E98 41 82 00 1C */ beq lbl_80CB9EB4 -/* 80CB9E9C C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CB9EA0 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80CB9EA4 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CB9EA8 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80CB9EAC C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80CB9EB0 D0 03 00 20 */ stfs f0, 0x20(r3) -lbl_80CB9EB4: -/* 80CB9EB4 C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 80CB9EB8 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CB9EBC C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 80CB9EC0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CB9EC4 C0 1E 00 64 */ lfs f0, 0x64(r30) -/* 80CB9EC8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CB9ECC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9ED0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9ED4 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CB9ED8 4B 35 25 05 */ bl mDoMtx_YrotS__FPA4_fs -/* 80CB9EDC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9EE0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9EE4 38 81 00 08 */ addi r4, r1, 8 -/* 80CB9EE8 7C 85 23 78 */ mr r5, r4 -/* 80CB9EEC 4B 68 CE 81 */ bl PSMTXMultVec -/* 80CB9EF0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CB9EF4 D0 1F 0B D0 */ stfs f0, 0xbd0(r31) -/* 80CB9EF8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CB9EFC D0 1F 0B D4 */ stfs f0, 0xbd4(r31) -/* 80CB9F00 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80CB9F04 D0 1F 0B D8 */ stfs f0, 0xbd8(r31) -/* 80CB9F08 38 7F 0B D0 */ addi r3, r31, 0xbd0 -/* 80CB9F0C 38 81 00 08 */ addi r4, r1, 8 -/* 80CB9F10 7C 65 1B 78 */ mr r5, r3 -/* 80CB9F14 4B 68 D1 7D */ bl PSVECAdd -/* 80CB9F18 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 80CB9F1C 38 00 00 00 */ li r0, 0 -/* 80CB9F20 B0 1F 0B DC */ sth r0, 0xbdc(r31) -/* 80CB9F24 B0 7F 0B DE */ sth r3, 0xbde(r31) -/* 80CB9F28 B0 1F 0B E0 */ sth r0, 0xbe0(r31) -/* 80CB9F2C 7F E3 FB 78 */ mr r3, r31 -/* 80CB9F30 48 00 00 1D */ bl setBaseMtx__12daObjRgate_cFv -/* 80CB9F34 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CB9F38 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80CB9F3C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CB9F40 7C 08 03 A6 */ mtlr r0 -/* 80CB9F44 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CB9F48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/nodeCallBack__FP8J3DJointi.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/nodeCallBack__FP8J3DJointi.s deleted file mode 100644 index be1caca732..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/nodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_80CB9CE8: -/* 80CB9CE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CB9CEC 7C 08 02 A6 */ mflr r0 -/* 80CB9CF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CB9CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CB9CF8 4B 6A 84 E5 */ bl _savegpr_29 -/* 80CB9CFC 2C 04 00 00 */ cmpwi r4, 0 -/* 80CB9D00 40 82 00 DC */ bne lbl_80CB9DDC -/* 80CB9D04 A0 83 00 14 */ lhz r4, 0x14(r3) -/* 80CB9D08 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CB9D0C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CB9D10 83 E3 00 38 */ lwz r31, 0x38(r3) -/* 80CB9D14 83 DF 00 14 */ lwz r30, 0x14(r31) -/* 80CB9D18 2C 04 00 01 */ cmpwi r4, 1 -/* 80CB9D1C 40 82 00 60 */ bne lbl_80CB9D7C -/* 80CB9D20 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 80CB9D24 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80CB9D28 1F A4 00 30 */ mulli r29, r4, 0x30 -/* 80CB9D2C 7C 60 EA 14 */ add r3, r0, r29 -/* 80CB9D30 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9D34 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9D38 4B 68 C7 79 */ bl PSMTXCopy -/* 80CB9D3C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9D40 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9D44 A8 9E 0B 76 */ lha r4, 0xb76(r30) -/* 80CB9D48 4B 35 26 ED */ bl mDoMtx_YrotM__FPA4_fs -/* 80CB9D4C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9D50 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9D54 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 80CB9D58 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80CB9D5C 7C 80 EA 14 */ add r4, r0, r29 -/* 80CB9D60 4B 68 C7 51 */ bl PSMTXCopy -/* 80CB9D64 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9D68 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9D6C 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 80CB9D70 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 80CB9D74 4B 68 C7 3D */ bl PSMTXCopy -/* 80CB9D78 48 00 00 64 */ b lbl_80CB9DDC -lbl_80CB9D7C: -/* 80CB9D7C 2C 04 00 02 */ cmpwi r4, 2 -/* 80CB9D80 40 82 00 5C */ bne lbl_80CB9DDC -/* 80CB9D84 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 80CB9D88 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80CB9D8C 1F A4 00 30 */ mulli r29, r4, 0x30 -/* 80CB9D90 7C 60 EA 14 */ add r3, r0, r29 -/* 80CB9D94 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9D98 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9D9C 4B 68 C7 15 */ bl PSMTXCopy -/* 80CB9DA0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9DA4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9DA8 A8 9E 0B 74 */ lha r4, 0xb74(r30) -/* 80CB9DAC 4B 35 26 89 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CB9DB0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9DB4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9DB8 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 80CB9DBC 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80CB9DC0 7C 80 EA 14 */ add r4, r0, r29 -/* 80CB9DC4 4B 68 C6 ED */ bl PSMTXCopy -/* 80CB9DC8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9DCC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9DD0 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 80CB9DD4 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 80CB9DD8 4B 68 C6 D9 */ bl PSMTXCopy -lbl_80CB9DDC: -/* 80CB9DDC 38 60 00 01 */ li r3, 1 -/* 80CB9DE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CB9DE4 4B 6A 84 45 */ bl _restgpr_29 -/* 80CB9DE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CB9DEC 7C 08 03 A6 */ mtlr r0 -/* 80CB9DF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CB9DF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/search_coach__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/search_coach__FPvPv.s deleted file mode 100644 index d025c733c8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/search_coach__FPvPv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80CB9C98: -/* 80CB9C98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB9C9C 7C 08 02 A6 */ mflr r0 -/* 80CB9CA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB9CA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB9CA8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB9CAC 41 82 00 24 */ beq lbl_80CB9CD0 -/* 80CB9CB0 4B 35 F0 31 */ bl fopAc_IsActor__FPv -/* 80CB9CB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB9CB8 41 82 00 18 */ beq lbl_80CB9CD0 -/* 80CB9CBC A8 1F 00 0E */ lha r0, 0xe(r31) -/* 80CB9CC0 2C 00 00 56 */ cmpwi r0, 0x56 -/* 80CB9CC4 40 82 00 0C */ bne lbl_80CB9CD0 -/* 80CB9CC8 7F E3 FB 78 */ mr r3, r31 -/* 80CB9CCC 48 00 00 08 */ b lbl_80CB9CD4 -lbl_80CB9CD0: -/* 80CB9CD0 38 60 00 00 */ li r3, 0 -lbl_80CB9CD4: -/* 80CB9CD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB9CD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB9CDC 7C 08 03 A6 */ mtlr r0 -/* 80CB9CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB9CE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setAtkSE__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setAtkSE__12daObjRgate_cFv.s deleted file mode 100644 index 1cc2716d35..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setAtkSE__12daObjRgate_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80CBB210: -/* 80CBB210 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CBB214 7C 08 02 A6 */ mflr r0 -/* 80CBB218 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CBB21C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CBB220 7C 7F 1B 78 */ mr r31, r3 -/* 80CBB224 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80CBB228 7C 03 07 74 */ extsb r3, r0 -/* 80CBB22C 4B 37 1E 41 */ bl dComIfGp_getReverb__Fi -/* 80CBB230 7C 67 1B 78 */ mr r7, r3 -/* 80CBB234 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080229@ha */ -/* 80CBB238 38 03 02 29 */ addi r0, r3, 0x0229 /* 0x00080229@l */ -/* 80CBB23C 90 01 00 08 */ stw r0, 8(r1) -/* 80CBB240 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CBB244 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CBB248 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBB24C 38 81 00 08 */ addi r4, r1, 8 -/* 80CBB250 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80CBB254 38 C0 00 00 */ li r6, 0 -/* 80CBB258 3D 00 80 CC */ lis r8, lit_4513@ha /* 0x80CBC420@ha */ -/* 80CBB25C C0 28 C4 20 */ lfs f1, lit_4513@l(r8) /* 0x80CBC420@l */ -/* 80CBB260 FC 40 08 90 */ fmr f2, f1 -/* 80CBB264 3D 00 80 CC */ lis r8, lit_4514@ha /* 0x80CBC424@ha */ -/* 80CBB268 C0 68 C4 24 */ lfs f3, lit_4514@l(r8) /* 0x80CBC424@l */ -/* 80CBB26C FC 80 18 90 */ fmr f4, f3 -/* 80CBB270 39 00 00 00 */ li r8, 0 -/* 80CBB274 4B 5F 07 11 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CBB278 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CBB27C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CBB280 7C 08 03 A6 */ mtlr r0 -/* 80CBB284 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CBB288 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setBaseMtx__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setBaseMtx__12daObjRgate_cFv.s deleted file mode 100644 index 78a9da8321..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setBaseMtx__12daObjRgate_cFv.s +++ /dev/null @@ -1,332 +0,0 @@ -lbl_80CB9F4C: -/* 80CB9F4C 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80CB9F50 7C 08 02 A6 */ mflr r0 -/* 80CB9F54 90 01 00 84 */ stw r0, 0x84(r1) -/* 80CB9F58 39 61 00 80 */ addi r11, r1, 0x80 -/* 80CB9F5C 4B 6A 82 81 */ bl _savegpr_29 -/* 80CB9F60 7C 7F 1B 78 */ mr r31, r3 -/* 80CB9F64 3C 60 80 CC */ lis r3, l_cull_box@ha /* 0x80CBC368@ha */ -/* 80CB9F68 3B C3 C3 68 */ addi r30, r3, l_cull_box@l /* 0x80CBC368@l */ -/* 80CB9F6C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CB9F70 4B 35 2D F5 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CB9F74 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9F78 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9F7C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CB9F80 4B 35 24 B5 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CB9F84 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9F88 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9F8C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80CB9F90 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CB9F94 4B 68 C5 1D */ bl PSMTXCopy -/* 80CB9F98 C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 80CB9F9C D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 80CB9FA0 C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 80CB9FA4 D0 21 00 60 */ stfs f1, 0x60(r1) -/* 80CB9FA8 D0 21 00 64 */ stfs f1, 0x64(r1) -/* 80CB9FAC C0 1E 00 6C */ lfs f0, 0x6c(r30) -/* 80CB9FB0 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80CB9FB4 D0 21 00 54 */ stfs f1, 0x54(r1) -/* 80CB9FB8 D0 21 00 58 */ stfs f1, 0x58(r1) -/* 80CB9FBC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9FC0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9FC4 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CB9FC8 4B 35 24 15 */ bl mDoMtx_YrotS__FPA4_fs -/* 80CB9FCC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9FD0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9FD4 38 81 00 5C */ addi r4, r1, 0x5c -/* 80CB9FD8 7C 85 23 78 */ mr r5, r4 -/* 80CB9FDC 4B 68 CD 91 */ bl PSMTXMultVec -/* 80CB9FE0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB9FE4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB9FE8 38 81 00 50 */ addi r4, r1, 0x50 -/* 80CB9FEC 7C 85 23 78 */ mr r5, r4 -/* 80CB9FF0 4B 68 CD 7D */ bl PSMTXMultVec -/* 80CB9FF4 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CB9FF8 4B 35 2D 6D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CB9FFC 38 61 00 5C */ addi r3, r1, 0x5c -/* 80CBA000 4B 35 2D D5 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80CBA004 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA008 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA00C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CBA010 4B 35 24 25 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA014 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA018 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA01C A8 9F 0B 76 */ lha r4, 0xb76(r31) -/* 80CBA020 4B 35 24 15 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA024 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA028 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA02C 38 9F 0C 30 */ addi r4, r31, 0xc30 -/* 80CBA030 4B 68 C4 81 */ bl PSMTXCopy -/* 80CBA034 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA038 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA03C 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80CBA040 4B 68 C4 71 */ bl PSMTXCopy -/* 80CBA044 38 61 00 14 */ addi r3, r1, 0x14 -/* 80CBA048 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80CBA04C 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80CBA050 4B 5A CA 95 */ bl __pl__4cXyzCFRC3Vec -/* 80CBA054 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80CBA058 D0 1F 0B E8 */ stfs f0, 0xbe8(r31) -/* 80CBA05C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80CBA060 D0 1F 0B EC */ stfs f0, 0xbec(r31) -/* 80CBA064 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CBA068 D0 1F 0B F0 */ stfs f0, 0xbf0(r31) -/* 80CBA06C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CBA070 4B 35 2C F5 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBA074 38 61 00 50 */ addi r3, r1, 0x50 -/* 80CBA078 4B 35 2D 5D */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80CBA07C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA080 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA084 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CBA088 4B 35 23 AD */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA08C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA090 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA094 38 80 7F FF */ li r4, 0x7fff -/* 80CBA098 4B 35 23 9D */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA09C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA0A0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA0A4 A8 9F 0B 74 */ lha r4, 0xb74(r31) -/* 80CBA0A8 4B 35 23 8D */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA0AC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA0B0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA0B4 38 9F 0C 00 */ addi r4, r31, 0xc00 -/* 80CBA0B8 4B 68 C3 F9 */ bl PSMTXCopy -/* 80CBA0BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA0C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA0C4 38 9F 0A E4 */ addi r4, r31, 0xae4 -/* 80CBA0C8 4B 68 C3 E9 */ bl PSMTXCopy -/* 80CBA0CC C0 01 00 50 */ lfs f0, 0x50(r1) -/* 80CBA0D0 D0 1F 0B F4 */ stfs f0, 0xbf4(r31) -/* 80CBA0D4 C0 01 00 54 */ lfs f0, 0x54(r1) -/* 80CBA0D8 D0 1F 0B F8 */ stfs f0, 0xbf8(r31) -/* 80CBA0DC C0 01 00 58 */ lfs f0, 0x58(r1) -/* 80CBA0E0 D0 1F 0B FC */ stfs f0, 0xbfc(r31) -/* 80CBA0E4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CBA0E8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CBA0EC 28 00 00 FF */ cmplwi r0, 0xff -/* 80CBA0F0 41 82 03 60 */ beq lbl_80CBA450 -/* 80CBA0F4 C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 80CBA0F8 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80CBA0FC C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 80CBA100 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80CBA104 C0 1E 00 64 */ lfs f0, 0x64(r30) -/* 80CBA108 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80CBA10C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA110 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA114 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CBA118 4B 35 22 C5 */ bl mDoMtx_YrotS__FPA4_fs -/* 80CBA11C C0 3E 00 68 */ lfs f1, 0x68(r30) -/* 80CBA120 C0 5E 00 5C */ lfs f2, 0x5c(r30) -/* 80CBA124 FC 60 10 90 */ fmr f3, f2 -/* 80CBA128 4B 35 2C 75 */ bl transM__14mDoMtx_stack_cFfff -/* 80CBA12C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA130 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA134 A8 9F 0B 76 */ lha r4, 0xb76(r31) -/* 80CBA138 4B 35 22 FD */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA13C C0 3E 00 6C */ lfs f1, 0x6c(r30) -/* 80CBA140 C0 5E 00 5C */ lfs f2, 0x5c(r30) -/* 80CBA144 FC 60 10 90 */ fmr f3, f2 -/* 80CBA148 4B 35 2C 55 */ bl transM__14mDoMtx_stack_cFfff -/* 80CBA14C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA150 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA154 38 81 00 44 */ addi r4, r1, 0x44 -/* 80CBA158 7C 85 23 78 */ mr r5, r4 -/* 80CBA15C 4B 68 CC 11 */ bl PSMTXMultVec -/* 80CBA160 C0 1F 0B C0 */ lfs f0, 0xbc0(r31) -/* 80CBA164 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CBA168 C0 1F 0B C4 */ lfs f0, 0xbc4(r31) -/* 80CBA16C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CBA170 C0 1F 0B C8 */ lfs f0, 0xbc8(r31) -/* 80CBA174 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CBA178 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA17C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA180 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CBA184 A8 1F 0B 76 */ lha r0, 0xb76(r31) -/* 80CBA188 7C 04 02 14 */ add r0, r4, r0 -/* 80CBA18C 7C 04 07 34 */ extsh r4, r0 -/* 80CBA190 4B 35 22 4D */ bl mDoMtx_YrotS__FPA4_fs -/* 80CBA194 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA198 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA19C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80CBA1A0 7C 85 23 78 */ mr r5, r4 -/* 80CBA1A4 4B 68 CB C9 */ bl PSMTXMultVec -/* 80CBA1A8 C0 1F 0B B4 */ lfs f0, 0xbb4(r31) -/* 80CBA1AC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CBA1B0 C0 1F 0B B8 */ lfs f0, 0xbb8(r31) -/* 80CBA1B4 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CBA1B8 C0 1F 0B BC */ lfs f0, 0xbbc(r31) -/* 80CBA1BC D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80CBA1C0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80CBA1C4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80CBA1C8 80 1F 0B 98 */ lwz r0, 0xb98(r31) -/* 80CBA1CC 1C 00 0B B8 */ mulli r0, r0, 0xbb8 -/* 80CBA1D0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80CBA1D4 7C 63 02 14 */ add r3, r3, r0 -/* 80CBA1D8 C0 23 00 04 */ lfs f1, 4(r3) -/* 80CBA1DC C0 1F 0B B0 */ lfs f0, 0xbb0(r31) -/* 80CBA1E0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80CBA1E4 FC 00 00 1E */ fctiwz f0, f0 -/* 80CBA1E8 D8 01 00 68 */ stfd f0, 0x68(r1) -/* 80CBA1EC 83 A1 00 6C */ lwz r29, 0x6c(r1) -/* 80CBA1F0 38 7F 0B B0 */ addi r3, r31, 0xbb0 -/* 80CBA1F4 C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 80CBA1F8 C0 5E 00 70 */ lfs f2, 0x70(r30) -/* 80CBA1FC C0 7E 00 74 */ lfs f3, 0x74(r30) -/* 80CBA200 C0 9E 00 78 */ lfs f4, 0x78(r30) -/* 80CBA204 4B 5B 57 79 */ bl cLib_addCalc__FPfffff -/* 80CBA208 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CBA20C 4B 35 2B 59 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBA210 38 61 00 2C */ addi r3, r1, 0x2c -/* 80CBA214 4B 35 2B C1 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80CBA218 38 61 00 44 */ addi r3, r1, 0x44 -/* 80CBA21C 4B 35 2B B9 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80CBA220 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA224 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA228 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CBA22C A8 1F 0B 76 */ lha r0, 0xb76(r31) -/* 80CBA230 7C 04 02 14 */ add r0, r4, r0 -/* 80CBA234 7C 04 07 34 */ extsh r4, r0 -/* 80CBA238 4B 35 21 FD */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA23C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA240 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA244 38 80 F1 C8 */ li r4, -3640 -/* 80CBA248 4B 35 21 55 */ bl mDoMtx_XrotM__FPA4_fs -/* 80CBA24C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA250 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA254 A8 1F 0B AA */ lha r0, 0xbaa(r31) -/* 80CBA258 7C 00 00 D0 */ neg r0, r0 -/* 80CBA25C 7C 04 07 34 */ extsh r4, r0 -/* 80CBA260 4B 35 21 3D */ bl mDoMtx_XrotM__FPA4_fs -/* 80CBA264 C0 3E 00 7C */ lfs f1, 0x7c(r30) -/* 80CBA268 C0 5E 00 5C */ lfs f2, 0x5c(r30) -/* 80CBA26C FC 60 10 90 */ fmr f3, f2 -/* 80CBA270 4B 35 2B 2D */ bl transM__14mDoMtx_stack_cFfff -/* 80CBA274 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA278 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA27C A8 9F 0B AE */ lha r4, 0xbae(r31) -/* 80CBA280 4B 35 22 4D */ bl mDoMtx_ZrotM__FPA4_fs -/* 80CBA284 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA288 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA28C 7F A4 EB 78 */ mr r4, r29 -/* 80CBA290 4B 35 22 3D */ bl mDoMtx_ZrotM__FPA4_fs -/* 80CBA294 C0 3E 00 80 */ lfs f1, 0x80(r30) -/* 80CBA298 C0 5E 00 5C */ lfs f2, 0x5c(r30) -/* 80CBA29C FC 60 10 90 */ fmr f3, f2 -/* 80CBA2A0 4B 35 2A FD */ bl transM__14mDoMtx_stack_cFfff -/* 80CBA2A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA2A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA2AC 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80CBA2B0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CBA2B4 4B 68 C1 FD */ bl PSMTXCopy -/* 80CBA2B8 80 1F 05 AC */ lwz r0, 0x5ac(r31) -/* 80CBA2BC 28 00 00 00 */ cmplwi r0, 0 -/* 80CBA2C0 41 82 01 90 */ beq lbl_80CBA450 -/* 80CBA2C4 A8 1F 0B AE */ lha r0, 0xbae(r31) -/* 80CBA2C8 2C 00 00 00 */ cmpwi r0, 0 -/* 80CBA2CC 40 82 00 70 */ bne lbl_80CBA33C -/* 80CBA2D0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CBA2D4 4B 35 2A 91 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBA2D8 38 61 00 44 */ addi r3, r1, 0x44 -/* 80CBA2DC 4B 35 2A F9 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 80CBA2E0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA2E4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA2E8 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80CBA2EC A8 1F 0B 76 */ lha r0, 0xb76(r31) -/* 80CBA2F0 7C 04 02 14 */ add r0, r4, r0 -/* 80CBA2F4 7C 04 07 34 */ extsh r4, r0 -/* 80CBA2F8 4B 35 21 3D */ bl mDoMtx_YrotM__FPA4_fs -/* 80CBA2FC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA300 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA304 38 80 F1 C8 */ li r4, -3640 -/* 80CBA308 4B 35 20 95 */ bl mDoMtx_XrotM__FPA4_fs -/* 80CBA30C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA310 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA314 A8 1F 0B AA */ lha r0, 0xbaa(r31) -/* 80CBA318 7C 00 00 D0 */ neg r0, r0 -/* 80CBA31C 7C 04 07 34 */ extsh r4, r0 -/* 80CBA320 4B 35 20 7D */ bl mDoMtx_XrotM__FPA4_fs -/* 80CBA324 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA328 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA32C 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80CBA330 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CBA334 4B 68 C1 7D */ bl PSMTXCopy -/* 80CBA338 48 00 01 18 */ b lbl_80CBA450 -lbl_80CBA33C: -/* 80CBA33C C0 3F 0B E4 */ lfs f1, 0xbe4(r31) -/* 80CBA340 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80CBA344 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CBA348 D0 1F 0B E4 */ stfs f0, 0xbe4(r31) -/* 80CBA34C C0 3F 0B E4 */ lfs f1, 0xbe4(r31) -/* 80CBA350 C0 1E 00 88 */ lfs f0, 0x88(r30) -/* 80CBA354 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBA358 40 80 00 08 */ bge lbl_80CBA360 -/* 80CBA35C D0 1F 0B E4 */ stfs f0, 0xbe4(r31) -lbl_80CBA360: -/* 80CBA360 C0 3F 0B D4 */ lfs f1, 0xbd4(r31) -/* 80CBA364 C0 1F 0B E4 */ lfs f0, 0xbe4(r31) -/* 80CBA368 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CBA36C D0 1F 0B D4 */ stfs f0, 0xbd4(r31) -/* 80CBA370 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 80CBA374 C0 3E 00 74 */ lfs f1, 0x74(r30) -/* 80CBA378 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CBA37C EC 21 00 2A */ fadds f1, f1, f0 -/* 80CBA380 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CBA384 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80CBA388 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80CBA38C D0 41 00 28 */ stfs f2, 0x28(r1) -/* 80CBA390 38 61 00 20 */ addi r3, r1, 0x20 -/* 80CBA394 4B 36 39 29 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80CBA398 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CBA39C 41 82 00 78 */ beq lbl_80CBA414 -/* 80CBA3A0 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80CBA3A4 C0 23 0C D0 */ lfs f1, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80CBA3A8 C0 1F 0B D4 */ lfs f0, 0xbd4(r31) -/* 80CBA3AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CBA3B0 40 81 00 64 */ ble lbl_80CBA414 -/* 80CBA3B4 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 80CBA3B8 EC 00 08 2A */ fadds f0, f0, f1 -/* 80CBA3BC D0 1F 0B D4 */ stfs f0, 0xbd4(r31) -/* 80CBA3C0 88 1F 0B A9 */ lbz r0, 0xba9(r31) -/* 80CBA3C4 28 00 00 00 */ cmplwi r0, 0 -/* 80CBA3C8 40 82 00 4C */ bne lbl_80CBA414 -/* 80CBA3CC C0 1E 00 90 */ lfs f0, 0x90(r30) -/* 80CBA3D0 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CBA3D4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CBA3D8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CBA3DC 38 61 00 08 */ addi r3, r1, 8 -/* 80CBA3E0 7C 64 1B 78 */ mr r4, r3 -/* 80CBA3E4 C0 3E 00 94 */ lfs f1, 0x94(r30) -/* 80CBA3E8 4B 68 CC F1 */ bl PSVECScale -/* 80CBA3EC 38 60 03 01 */ li r3, 0x301 -/* 80CBA3F0 38 80 00 03 */ li r4, 3 -/* 80CBA3F4 38 BF 0B D0 */ addi r5, r31, 0xbd0 -/* 80CBA3F8 38 C0 FF FF */ li r6, -1 -/* 80CBA3FC 38 E0 00 00 */ li r7, 0 -/* 80CBA400 39 01 00 08 */ addi r8, r1, 8 -/* 80CBA404 39 20 FF FF */ li r9, -1 -/* 80CBA408 4B 35 F9 91 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 80CBA40C 38 00 00 01 */ li r0, 1 -/* 80CBA410 98 1F 0B A9 */ stb r0, 0xba9(r31) -lbl_80CBA414: -/* 80CBA414 38 7F 0B DC */ addi r3, r31, 0xbdc -/* 80CBA418 38 80 C0 00 */ li r4, -16384 -/* 80CBA41C 38 A0 00 05 */ li r5, 5 -/* 80CBA420 38 C0 0C 00 */ li r6, 0xc00 -/* 80CBA424 38 E0 04 00 */ li r7, 0x400 -/* 80CBA428 4B 5B 61 19 */ bl cLib_addCalcAngleS__FPsssss -/* 80CBA42C 38 7F 0B D0 */ addi r3, r31, 0xbd0 -/* 80CBA430 4B 35 29 35 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CBA434 38 7F 0B DC */ addi r3, r31, 0xbdc -/* 80CBA438 4B 35 2B 0D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80CBA43C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CBA440 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CBA444 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80CBA448 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CBA44C 4B 68 C0 65 */ bl PSMTXCopy -lbl_80CBA450: -/* 80CBA450 39 61 00 80 */ addi r11, r1, 0x80 -/* 80CBA454 4B 6A 7D D5 */ bl _restgpr_29 -/* 80CBA458 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80CBA45C 7C 08 03 A6 */ mtlr r0 -/* 80CBA460 38 21 00 80 */ addi r1, r1, 0x80 -/* 80CBA464 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setCrkSE__12daObjRgate_cFv.s b/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setCrkSE__12daObjRgate_cFv.s deleted file mode 100644 index 0430705e21..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setCrkSE__12daObjRgate_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80CBB28C: -/* 80CBB28C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CBB290 7C 08 02 A6 */ mflr r0 -/* 80CBB294 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CBB298 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CBB29C 7C 7F 1B 78 */ mr r31, r3 -/* 80CBB2A0 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80CBB2A4 7C 03 07 74 */ extsb r3, r0 -/* 80CBB2A8 4B 37 1D C5 */ bl dComIfGp_getReverb__Fi -/* 80CBB2AC 7C 67 1B 78 */ mr r7, r3 -/* 80CBB2B0 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008022B@ha */ -/* 80CBB2B4 38 03 02 2B */ addi r0, r3, 0x022B /* 0x0008022B@l */ -/* 80CBB2B8 90 01 00 08 */ stw r0, 8(r1) -/* 80CBB2BC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CBB2C0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CBB2C4 80 63 00 00 */ lwz r3, 0(r3) -/* 80CBB2C8 38 81 00 08 */ addi r4, r1, 8 -/* 80CBB2CC 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80CBB2D0 38 C0 00 00 */ li r6, 0 -/* 80CBB2D4 3D 00 80 CC */ lis r8, lit_4513@ha /* 0x80CBC420@ha */ -/* 80CBB2D8 C0 28 C4 20 */ lfs f1, lit_4513@l(r8) /* 0x80CBC420@l */ -/* 80CBB2DC FC 40 08 90 */ fmr f2, f1 -/* 80CBB2E0 3D 00 80 CC */ lis r8, lit_4514@ha /* 0x80CBC424@ha */ -/* 80CBB2E4 C0 68 C4 24 */ lfs f3, lit_4514@l(r8) /* 0x80CBC424@l */ -/* 80CBB2E8 FC 80 18 90 */ fmr f4, f3 -/* 80CBB2EC 39 00 00 00 */ li r8, 0 -/* 80CBB2F0 4B 5F 06 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CBB2F4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CBB2F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CBB2FC 7C 08 03 A6 */ mtlr r0 -/* 80CBB300 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CBB304 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index aee90d93c1..4765a991f5 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -2,7 +2,7 @@ #define J2DPRINT_H #include "JSystem/J2DGraph/J2DTextBox.h" -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" #include "dolphin/types.h" class JUTFont; diff --git a/include/JSystem/J3DU/J3DUD.h b/include/JSystem/J3DU/J3DUD.h index f0f0e6e963..a15172221a 100644 --- a/include/JSystem/J3DU/J3DUD.h +++ b/include/JSystem/J3DU/J3DUD.h @@ -1,7 +1,7 @@ #ifndef J3DUD_H #define J3DUD_H -#include "MSL_C/math.h" +#include "math.h" #include "dolphin/types.h" namespace J3DUD { diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 56017bc8d0..916ceeae89 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -2,7 +2,7 @@ #define JASGADGET_H #include "JSystem/JUtility/JUTAssert.h" -#include "MSL_C/string.h" +#include "string.h" template class JASGlobalInstance { diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index 9fee434d3b..d3126391bb 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JAUBankTable.h" #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h" #include "JSystem/JKernel/JKRDisposer.h" -#include "MSL_C/bitset.h" +#include "bitset.h" class JAISeqData; class JAISeqDataMgr; diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h index 1754687538..4a23e2f6ff 100644 --- a/include/JSystem/JAudio2/JAUStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASAramStream.h" #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JUtility/JUTAssert.h" -#include "MSL_C/bitset.h" +#include "bitset.h" template class JAUStreamAramMgrBase_ : public JAIStreamAramMgr { diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 27f8992463..848a79e1a5 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -2,8 +2,7 @@ #define JGEOMETRY_H #include "dolphin/mtx/vec.h" -#include "MSL_C/float.h" -#include "MSL_C/math.h" +#include "math.h" namespace JGeometry { diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index 6fe4c32169..a8b34551d7 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/include/JSystem/JMath/JMATrigonometric.h @@ -2,7 +2,7 @@ #define JMATRIGONOMETRIC_H #include "dolphin/types.h" -#include "MSL_C/utility.h" +#include "utility.h" struct TSinCosTable { std::pair table[0x2000]; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index efe8ac7335..bbf2829d34 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" #include "dolphin/types.h" class JUTConsole : public JKRDisposer { diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 6016489c76..c7362afdff 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -2,7 +2,7 @@ #define JUTDIRECTPRINT_H #include "JSystem/JUtility/TColor.h" -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" class JUTDirectPrint { private: diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 5704f63c92..f9429df773 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" #include "dolphin/gx/GXEnum.h" #include "dolphin/os/OSError.h" #include "dolphin/types.h" diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index b6cd3d90d6..e56c34cfe3 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,7 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" -#include "MSL_C/string.h" +#include "string.h" struct ResFONT { struct INF1 { diff --git a/include/MSL_C/MSL_Common/Src/FILE_POS.h b/include/MSL_C/MSL_Common/Src/FILE_POS.h deleted file mode 100644 index 867b191949..0000000000 --- a/include/MSL_C/MSL_Common/Src/FILE_POS.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MSL_COMMON_SRC_FILE_POS_H -#define MSL_COMMON_SRC_FILE_POS_H - -#include "MSL_C/MSL_Common/Src/ansi_files.h" - -#ifdef __cplusplus -extern "C" { -#endif - -int fseek(FILE* file, long offset, int mode); -int _fseek(FILE* file, fpos_t offset, int mode); -long ftell(FILE* file); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_FILE_POS_H */ diff --git a/include/MSL_C/MSL_Common/Src/alloc.h b/include/MSL_C/MSL_Common/Src/alloc.h deleted file mode 100644 index abf8359183..0000000000 --- a/include/MSL_C/MSL_Common/Src/alloc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MSL_COMMON_SRC_ALLOC_H -#define MSL_COMMON_SRC_ALLOC_H - -#include "MSL_C/MSL_Common/Src/ansi_files.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void free(FILE* file); -void __pool_free(int **param_1, unsigned int **param_2); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_ALLOC_H */ diff --git a/include/MSL_C/MSL_Common/Src/buffer_io.h b/include/MSL_C/MSL_Common/Src/buffer_io.h deleted file mode 100644 index e020d543ac..0000000000 --- a/include/MSL_C/MSL_Common/Src/buffer_io.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef MSL_COMMON_SRC_BUFFER_IO_H -#define MSL_COMMON_SRC_BUFFER_IO_H - -#include "MSL_C/MSL_Common/Src/ansi_files.h" - -enum { __align_buffer, __dont_align_buffer }; - -void __prep_buffer(FILE* file); -int __flush_buffer(FILE* file, size_t* bytes_flushed); - -#endif /* MSL_COMMON_SRC_BUFFER_IO_H */ diff --git a/include/MSL_C/MSL_Common/Src/file_io.h b/include/MSL_C/MSL_Common/Src/file_io.h deleted file mode 100644 index 0fe7446924..0000000000 --- a/include/MSL_C/MSL_Common/Src/file_io.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MSL_COMMON_SRC_FILE_IO_H -#define MSL_COMMON_SRC_FILE_IO_H - -#include "MSL_C/MSL_Common/Src/ansi_files.h" - -#ifdef __cplusplus -extern "C" { -#endif - -int __msl_strnicmp(const char* str1, const char* str2, size_t n); -int fflush(FILE* file); -int fclose(FILE* file); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_FILE_IO_H */ diff --git a/include/MSL_C/MSL_Common/Src/mbstring.h b/include/MSL_C/MSL_Common/Src/mbstring.h deleted file mode 100644 index e42bcd0edb..0000000000 --- a/include/MSL_C/MSL_Common/Src/mbstring.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef MSL_COMMON_SRC_MBSTRING_H -#define MSL_COMMON_SRC_MBSTRING_H - -#include "MSL_C/MSL_Common/Src/wchar_io.h" - -#ifdef __cplusplus -extern "C" { -#endif - -size_t wcstombs(char* dst, const wchar_t* src, size_t n); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_MBSTRING_H */ diff --git a/include/MSL_C/MSL_Common/Src/mem.h b/include/MSL_C/MSL_Common/Src/mem.h deleted file mode 100644 index 1cca85f192..0000000000 --- a/include/MSL_C/MSL_Common/Src/mem.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef MSL_COMMON_SRC_MEM_H -#define MSL_COMMON_SRC_MEM_H - -#include "MSL_C/MSL_Common/Src/stddef.h" - -#ifdef __cplusplus -extern "C" { -#endif - -int memcmp(const void* lhs, const void* rhs, size_t count); -void* __memrchr(const void* ptr, int ch, size_t count); -void* memchr(const void* ptr, int ch, size_t count); -void* memmove(void* dst, const void* src, size_t n); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_MEM_H */ diff --git a/include/MSL_C/MSL_Common/Src/misc_io.h b/include/MSL_C/MSL_Common/Src/misc_io.h deleted file mode 100644 index 3860462910..0000000000 --- a/include/MSL_C/MSL_Common/Src/misc_io.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef MSL_COMMON_SRC_MISC_IO_H -#define MSL_COMMON_SRC_MISC_IO_H - -#ifdef __cplusplus -extern "C" { -#endif - -void __stdio_atexit(void); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_MISC_IO_H */ diff --git a/include/MSL_C/MSL_Common/Src/printf.h b/include/MSL_C/MSL_Common/Src/printf.h deleted file mode 100644 index 5b1a7ccd60..0000000000 --- a/include/MSL_C/MSL_Common/Src/printf.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef MSL_COMMON_SRC_PRINTF_H -#define MSL_COMMON_SRC_PRINTF_H - -#include "MSL_C/MSL_Common/Src/ansi_files.h" -#include "Runtime.PPCEABI.H/__va_arg.h" - -#ifdef __cplusplus -extern "C" { -#endif - -int fprintf(FILE* stream, const char* format, ...); -int printf(const char* format, ...); -int sprintf(const char* str, const char* format, ...); -int snprintf(const char* str, size_t n, const char* format, ...); -int vsnprintf(char* str, size_t n, const char* format, va_list arg); -int vprintf(const char* format, va_list arg); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_PRINTF_H */ diff --git a/include/MSL_C/MSL_Common/Src/scanf.h b/include/MSL_C/MSL_Common/Src/scanf.h deleted file mode 100644 index d0a323df59..0000000000 --- a/include/MSL_C/MSL_Common/Src/scanf.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef MSL_COMMON_SRC_SCANF_H -#define MSL_COMMON_SRC_SCANF_H - -#ifdef __cplusplus -extern "C" { -#endif - -int __StringRead(char* str, int ch, int behavior); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_SCANF_H */ diff --git a/include/MSL_C/MSL_Common/Src/signal.h b/include/MSL_C/MSL_Common/Src/signal.h deleted file mode 100644 index 5906c8e88d..0000000000 --- a/include/MSL_C/MSL_Common/Src/signal.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef MSL_COMMON_SRC_SIGNAL_H -#define MSL_COMMON_SRC_SIGNAL_H - -#ifdef __cplusplus -extern "C" { -#endif - -int raise(int sig); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_SIGNAL_H */ diff --git a/include/MSL_C/MSL_Common/Src/strtoul.h b/include/MSL_C/MSL_Common/Src/strtoul.h deleted file mode 100644 index a288815757..0000000000 --- a/include/MSL_C/MSL_Common/Src/strtoul.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef MSL_COMMON_SRC_STRTOUL_H -#define MSL_COMMON_SRC_STRTOUL_H - -#ifdef __cplusplus -extern "C" { -#endif - -long strtol(const char* str, char** endptr, int base); -unsigned long strtoul(const char* str, char** endptr, int base); -unsigned long __strtoul(const char* str, char** endptr, int base); - -#ifdef __cplusplus -} -#endif - -#endif /* MSL_COMMON_SRC_STRTOUL_H */ diff --git a/include/MSL_C/MSL_Common/Src/wchar_io.h b/include/MSL_C/MSL_Common/Src/wchar_io.h deleted file mode 100644 index be6fb63783..0000000000 --- a/include/MSL_C/MSL_Common/Src/wchar_io.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MSL_COMMON_SRC_WCHAR_IO_H -#define MSL_COMMON_SRC_WCHAR_IO_H - -#include "MSL_C/MSL_Common/Src/ansi_files.h" - -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif - -int fwide(FILE* file, int mode); - -#endif /* MSL_COMMON_SRC_WCHAR_IO_H */ diff --git a/include/MSL_C/MSL_Common_Embedded/Src/ansi_fp.h b/include/MSL_C/MSL_Common_Embedded/Src/ansi_fp.h deleted file mode 100644 index 38e5dec6f6..0000000000 --- a/include/MSL_C/MSL_Common_Embedded/Src/ansi_fp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MSL_COMMON_EMBEDDED_SRC_ANSI_FP_H -#define MSL_COMMON_EMBEDDED_SRC_ANSI_FP_H - - - -#endif /* MSL_COMMON_EMBEDDED_SRC_ANSI_FP_H */ diff --git a/include/MSL_C/Math/Double_precision/e_acos.h b/include/MSL_C/Math/Double_precision/e_acos.h deleted file mode 100644 index 04748bc442..0000000000 --- a/include/MSL_C/Math/Double_precision/e_acos.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_ACOS_H -#define MATH_DOUBLE_PRECISION_E_ACOS_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_ACOS_H */ diff --git a/include/MSL_C/Math/Double_precision/e_asin.h b/include/MSL_C/Math/Double_precision/e_asin.h deleted file mode 100644 index 0413f5038b..0000000000 --- a/include/MSL_C/Math/Double_precision/e_asin.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_ASIN_H -#define MATH_DOUBLE_PRECISION_E_ASIN_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_ASIN_H */ diff --git a/include/MSL_C/Math/Double_precision/e_atan2.h b/include/MSL_C/Math/Double_precision/e_atan2.h deleted file mode 100644 index 5233f7f418..0000000000 --- a/include/MSL_C/Math/Double_precision/e_atan2.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_ATAN2_H -#define MATH_DOUBLE_PRECISION_E_ATAN2_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_ATAN2_H */ diff --git a/include/MSL_C/Math/Double_precision/e_exp.h b/include/MSL_C/Math/Double_precision/e_exp.h deleted file mode 100644 index ac89887b96..0000000000 --- a/include/MSL_C/Math/Double_precision/e_exp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_EXP_H -#define MATH_DOUBLE_PRECISION_E_EXP_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_EXP_H */ diff --git a/include/MSL_C/Math/Double_precision/e_fmod.h b/include/MSL_C/Math/Double_precision/e_fmod.h deleted file mode 100644 index c94d42c5a8..0000000000 --- a/include/MSL_C/Math/Double_precision/e_fmod.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_FMOD_H -#define MATH_DOUBLE_PRECISION_E_FMOD_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_FMOD_H */ diff --git a/include/MSL_C/Math/Double_precision/e_pow.h b/include/MSL_C/Math/Double_precision/e_pow.h deleted file mode 100644 index 3f208c4dc5..0000000000 --- a/include/MSL_C/Math/Double_precision/e_pow.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_POW_H -#define MATH_DOUBLE_PRECISION_E_POW_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_POW_H */ diff --git a/include/MSL_C/Math/Double_precision/e_rem_pio2.h b/include/MSL_C/Math/Double_precision/e_rem_pio2.h deleted file mode 100644 index 7a74dcd37c..0000000000 --- a/include/MSL_C/Math/Double_precision/e_rem_pio2.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_REM_PIO2_H -#define MATH_DOUBLE_PRECISION_E_REM_PIO2_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_REM_PIO2_H */ diff --git a/include/MSL_C/Math/Double_precision/e_sqrt.h b/include/MSL_C/Math/Double_precision/e_sqrt.h deleted file mode 100644 index cfbfd46cf6..0000000000 --- a/include/MSL_C/Math/Double_precision/e_sqrt.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_E_SQRT_H -#define MATH_DOUBLE_PRECISION_E_SQRT_H - - - -#endif /* MATH_DOUBLE_PRECISION_E_SQRT_H */ diff --git a/include/MSL_C/Math/Double_precision/k_cos.h b/include/MSL_C/Math/Double_precision/k_cos.h deleted file mode 100644 index ca810015e5..0000000000 --- a/include/MSL_C/Math/Double_precision/k_cos.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_K_COS_H -#define MATH_DOUBLE_PRECISION_K_COS_H - - - -#endif /* MATH_DOUBLE_PRECISION_K_COS_H */ diff --git a/include/MSL_C/Math/Double_precision/k_rem_pio2.h b/include/MSL_C/Math/Double_precision/k_rem_pio2.h deleted file mode 100644 index e95f42ab16..0000000000 --- a/include/MSL_C/Math/Double_precision/k_rem_pio2.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_K_REM_PIO2_H -#define MATH_DOUBLE_PRECISION_K_REM_PIO2_H - - - -#endif /* MATH_DOUBLE_PRECISION_K_REM_PIO2_H */ diff --git a/include/MSL_C/Math/Double_precision/k_sin.h b/include/MSL_C/Math/Double_precision/k_sin.h deleted file mode 100644 index 7edda8d575..0000000000 --- a/include/MSL_C/Math/Double_precision/k_sin.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_K_SIN_H -#define MATH_DOUBLE_PRECISION_K_SIN_H - - - -#endif /* MATH_DOUBLE_PRECISION_K_SIN_H */ diff --git a/include/MSL_C/Math/Double_precision/k_tan.h b/include/MSL_C/Math/Double_precision/k_tan.h deleted file mode 100644 index 8ab3a8c8c8..0000000000 --- a/include/MSL_C/Math/Double_precision/k_tan.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_K_TAN_H -#define MATH_DOUBLE_PRECISION_K_TAN_H - - - -#endif /* MATH_DOUBLE_PRECISION_K_TAN_H */ diff --git a/include/MSL_C/Math/Double_precision/s_atan.h b/include/MSL_C/Math/Double_precision/s_atan.h deleted file mode 100644 index c3fce4ed7b..0000000000 --- a/include/MSL_C/Math/Double_precision/s_atan.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_ATAN_H -#define MATH_DOUBLE_PRECISION_S_ATAN_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_ATAN_H */ diff --git a/include/MSL_C/Math/Double_precision/s_ceil.h b/include/MSL_C/Math/Double_precision/s_ceil.h deleted file mode 100644 index 3437b2c209..0000000000 --- a/include/MSL_C/Math/Double_precision/s_ceil.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_CEIL_H -#define MATH_DOUBLE_PRECISION_S_CEIL_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_CEIL_H */ diff --git a/include/MSL_C/Math/Double_precision/s_copysign.h b/include/MSL_C/Math/Double_precision/s_copysign.h deleted file mode 100644 index 531a4e7f6e..0000000000 --- a/include/MSL_C/Math/Double_precision/s_copysign.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_COPYSIGN_H -#define MATH_DOUBLE_PRECISION_S_COPYSIGN_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_COPYSIGN_H */ diff --git a/include/MSL_C/Math/Double_precision/s_cos.h b/include/MSL_C/Math/Double_precision/s_cos.h deleted file mode 100644 index 4b70fd9d94..0000000000 --- a/include/MSL_C/Math/Double_precision/s_cos.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_COS_H -#define MATH_DOUBLE_PRECISION_S_COS_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_COS_H */ diff --git a/include/MSL_C/Math/Double_precision/s_floor.h b/include/MSL_C/Math/Double_precision/s_floor.h deleted file mode 100644 index fa3dc539ab..0000000000 --- a/include/MSL_C/Math/Double_precision/s_floor.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_FLOOR_H -#define MATH_DOUBLE_PRECISION_S_FLOOR_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_FLOOR_H */ diff --git a/include/MSL_C/Math/Double_precision/s_frexp.h b/include/MSL_C/Math/Double_precision/s_frexp.h deleted file mode 100644 index 2dfd7d048e..0000000000 --- a/include/MSL_C/Math/Double_precision/s_frexp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_FREXP_H -#define MATH_DOUBLE_PRECISION_S_FREXP_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_FREXP_H */ diff --git a/include/MSL_C/Math/Double_precision/s_ldexp.h b/include/MSL_C/Math/Double_precision/s_ldexp.h deleted file mode 100644 index e9c241263e..0000000000 --- a/include/MSL_C/Math/Double_precision/s_ldexp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_LDEXP_H -#define MATH_DOUBLE_PRECISION_S_LDEXP_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_LDEXP_H */ diff --git a/include/MSL_C/Math/Double_precision/s_modf.h b/include/MSL_C/Math/Double_precision/s_modf.h deleted file mode 100644 index 08b07880d7..0000000000 --- a/include/MSL_C/Math/Double_precision/s_modf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_MODF_H -#define MATH_DOUBLE_PRECISION_S_MODF_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_MODF_H */ diff --git a/include/MSL_C/Math/Double_precision/s_sin.h b/include/MSL_C/Math/Double_precision/s_sin.h deleted file mode 100644 index b4ac62f5b9..0000000000 --- a/include/MSL_C/Math/Double_precision/s_sin.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_SIN_H -#define MATH_DOUBLE_PRECISION_S_SIN_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_SIN_H */ diff --git a/include/MSL_C/Math/Double_precision/s_tan.h b/include/MSL_C/Math/Double_precision/s_tan.h deleted file mode 100644 index 9ddbb42a56..0000000000 --- a/include/MSL_C/Math/Double_precision/s_tan.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_S_TAN_H -#define MATH_DOUBLE_PRECISION_S_TAN_H - - - -#endif /* MATH_DOUBLE_PRECISION_S_TAN_H */ diff --git a/include/MSL_C/Math/Double_precision/w_acos.h b/include/MSL_C/Math/Double_precision/w_acos.h deleted file mode 100644 index aee53d2893..0000000000 --- a/include/MSL_C/Math/Double_precision/w_acos.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_ACOS_H -#define MATH_DOUBLE_PRECISION_W_ACOS_H - - - -#endif /* MATH_DOUBLE_PRECISION_W_ACOS_H */ diff --git a/include/MSL_C/Math/Double_precision/w_asin.h b/include/MSL_C/Math/Double_precision/w_asin.h deleted file mode 100644 index ed89429596..0000000000 --- a/include/MSL_C/Math/Double_precision/w_asin.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_ASIN_H -#define MATH_DOUBLE_PRECISION_W_ASIN_H - - - -#endif /* MATH_DOUBLE_PRECISION_W_ASIN_H */ diff --git a/include/MSL_C/Math/Double_precision/w_atan2.h b/include/MSL_C/Math/Double_precision/w_atan2.h deleted file mode 100644 index 5e0656ae23..0000000000 --- a/include/MSL_C/Math/Double_precision/w_atan2.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_ATAN2_H -#define MATH_DOUBLE_PRECISION_W_ATAN2_H - - - -#endif /* MATH_DOUBLE_PRECISION_W_ATAN2_H */ diff --git a/include/MSL_C/Math/Double_precision/w_exp.h b/include/MSL_C/Math/Double_precision/w_exp.h deleted file mode 100644 index d1b8d7b90d..0000000000 --- a/include/MSL_C/Math/Double_precision/w_exp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_EXP_H -#define MATH_DOUBLE_PRECISION_W_EXP_H - - - -#endif /* MATH_DOUBLE_PRECISION_W_EXP_H */ diff --git a/include/MSL_C/Math/Double_precision/w_fmod.h b/include/MSL_C/Math/Double_precision/w_fmod.h deleted file mode 100644 index 2d37b22e17..0000000000 --- a/include/MSL_C/Math/Double_precision/w_fmod.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_FMOD_H -#define MATH_DOUBLE_PRECISION_W_FMOD_H - - - -double fmod(double, double); - -#endif /* MATH_DOUBLE_PRECISION_W_FMOD_H */ diff --git a/include/MSL_C/Math/Double_precision/w_pow.h b/include/MSL_C/Math/Double_precision/w_pow.h deleted file mode 100644 index ad5968fb40..0000000000 --- a/include/MSL_C/Math/Double_precision/w_pow.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_POW_H -#define MATH_DOUBLE_PRECISION_W_POW_H - - - -#endif /* MATH_DOUBLE_PRECISION_W_POW_H */ diff --git a/include/MSL_C/Math/Double_precision/w_sqrt.h b/include/MSL_C/Math/Double_precision/w_sqrt.h deleted file mode 100644 index 226e8ea63c..0000000000 --- a/include/MSL_C/Math/Double_precision/w_sqrt.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MATH_DOUBLE_PRECISION_W_SQRT_H -#define MATH_DOUBLE_PRECISION_W_SQRT_H - - - -#endif /* MATH_DOUBLE_PRECISION_W_SQRT_H */ diff --git a/include/MSL_C/float.h b/include/MSL_C/float.h deleted file mode 100644 index aad72914b4..0000000000 --- a/include/MSL_C/float.h +++ /dev/null @@ -1,10 +0,0 @@ - -#ifndef MSL_FLOAT_H_ -#define MSL_FLOAT_H_ - -#include "MSL_C/MSL_Common/Src/float.h" - -#define FLT_MAX (*(float*) __float_max) -#define FLT_EPSILON (*(float*) __float_epsilon) - -#endif diff --git a/include/MSL_C/stdlib.h b/include/MSL_C/stdlib.h deleted file mode 100644 index d4d322252e..0000000000 --- a/include/MSL_C/stdlib.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef MSL_STDLIB_H_ -#define MSL_STDLIB_H_ - -#include "MSL_C/MSL_Common/Src/abort_exit.h" -#include "MSL_C/MSL_Common/Src/arith.h" -#include "MSL_C/MSL_Common/Src/mbstring.h" -#include "MSL_C/MSL_Common/Src/strtoul.h" - -#endif diff --git a/include/MSL_C/string.h b/include/MSL_C/string.h deleted file mode 100644 index ea08c98fa4..0000000000 --- a/include/MSL_C/string.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef MSL_STRING_H_ -#define MSL_STRING_H_ - -#include "MSL_C/MSL_Common/Src/extras.h" -#include "MSL_C/MSL_Common/Src/mem.h" -#include "MSL_C/MSL_Common/Src/string.h" - -#endif diff --git a/include/SSystem/SComponent/c_API.h b/include/SSystem/SComponent/c_API.h index 5916bc99b3..8fcd246b2d 100644 --- a/include/SSystem/SComponent/c_API.h +++ b/include/SSystem/SComponent/c_API.h @@ -1,9 +1,17 @@ #ifndef C_API_H #define C_API_H - typedef void (*cAPIGph_Mthd)(void); -extern cAPIGph_Mthd g_cAPI_Interface[6]; +struct cAPI_Interface { + /* 0x00 */ cAPIGph_Mthd createMtd; + /* 0x04 */ cAPIGph_Mthd beforeOfDrawMtd; + /* 0x08 */ cAPIGph_Mthd afterOfDrawMtd; + /* 0x0C */ cAPIGph_Mthd painterMtd; + /* 0x10 */ cAPIGph_Mthd blankingOnMtd; + /* 0x14 */ cAPIGph_Mthd blankingOffMtd; +}; + +extern cAPI_Interface g_cAPI_Interface; #endif /* C_API_H */ diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 31d5715c8e..cc4076df3c 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -1,7 +1,7 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include "MSL_C/math.h" +#include "math.h" #include "dolphin/types.h" #include "dolphin/mtx/vec.h" diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h index fac1f5a4f0..c525dfa7e4 100644 --- a/include/SSystem/SComponent/c_math.h +++ b/include/SSystem/SComponent/c_math.h @@ -8,11 +8,11 @@ u16 U_GetAtanTable(float, float); s16 cM_atan2s(float y, float x); float cM_atan2f(float y, float x); void cM_initRnd(int, int, int); -float cM_rnd(void); +float cM_rnd(); float cM_rndF(float); float cM_rndFX(float); void cM_initRnd2(int, int, int); -float cM_rnd2(void); +float cM_rnd2(); float cM_rndF2(float); float cM_rndFX2(float); diff --git a/include/SSystem/SComponent/c_phase.h b/include/SSystem/SComponent/c_phase.h index aea0da19fb..2c2cd09e86 100644 --- a/include/SSystem/SComponent/c_phase.h +++ b/include/SSystem/SComponent/c_phase.h @@ -1,6 +1,7 @@ #ifndef C_PHASE_H #define C_PHASE_H +#include "dolphin/types.h" typedef int (*cPhs__Handler)(void*); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 7bdc4fab51..0cf07d2a43 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -1,7 +1,7 @@ #ifndef C_XYZ_H #define C_XYZ_H -#include "MSL_C/math.h" +#include "math.h" #include "dolphin/mtx/vec.h" struct cXyz : Vec { diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 71606c6c00..5ae76dd182 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -728,6 +728,8 @@ public: virtual bool checkCopyRodEquip() const; virtual BOOL checkCutJumpMode() const; + f32 getSpeedF() const { return speedF; } + bool getSumouCameraMode() const { bool sumouCameraMode = false; if (mSpecialMode != 0 && mSpecialMode < 0x26) { diff --git a/include/d/d_name.h b/include/d/d_name.h index d025155f5e..4e2d0ba6c8 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -2,7 +2,7 @@ #define D_D_NAME_H #include "d/d_select_cursor.h" -#include "MSL_C/string.h" +#include "string.h" class CPaneMgr; class CPaneMgrAlpha; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 86a3df36fe..69c06ae7c5 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -1,7 +1,7 @@ #ifndef D_SAVE_D_SAVE_H #define D_SAVE_D_SAVE_H -#include "MSL_C/string.h" +#include "string.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/os/OSTime.h" #include "global.h" diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 32383d1480..222502bb51 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -1,7 +1,7 @@ #ifndef OS_H_ #define OS_H_ -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" #include "dolphin/dvd/dvd.h" #include "dolphin/os/OSAlarm.h" diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 00582288eb..67f3c70916 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -32,7 +32,7 @@ typedef int BOOL; #define READU32_BE(ptr, offset) \ (((u32)ptr[offset] << 24) | ((u32)ptr[offset + 1] << 16) | ((u32)ptr[offset + 2] << 8) | (u32)ptr[offset + 3]); -#include "MSL_C/MSL_Common/Src/stddef.h" +#include "stddef.h" #define INT32_MAX (0x7fffffff) #define UINT32_MAX (0xffffffff) diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index 175b95208c..135529fb8a 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -1,7 +1,7 @@ #ifndef M_DO_M_DO_PRINTF_H #define M_DO_M_DO_PRINTF_H -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" #include "m_Do/m_Do_main.h" void my_PutString(const char*); diff --git a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h index da1aa2f64e..41846245be 100644 --- a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h +++ b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h @@ -11,7 +11,7 @@ public: /* 80485E88 */ int Delete(); /* 0x568 */ request_of_phase_process_class mPhase; - /* 0x570 */ const char mArcName[16]; + /* 0x570 */ char mArcName[16]; }; #endif /* D_A_SET_BGOBJ_H */ diff --git a/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h b/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h index 577f50ebfc..a5c8c1e392 100644 --- a/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h +++ b/include/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h @@ -2,6 +2,7 @@ #define D_A_OBJ_EFF_H #include "f_op/f_op_actor_mng.h" +#include "d/d_procname.h" namespace daObjEff { class Act_c : public fopAc_ac_c { @@ -12,6 +13,12 @@ public: }; /* 8057C9D8 */ int _create(); + + static void make_land_smoke(cXyz* i_pos, f32 i_scale) { + cXyz scale(i_scale, i_scale, i_scale); + scale *= 1.6666666f; + fopAcM_create(PROC_Obj_Eff, 3, i_pos, -1, NULL, &scale, -1); + } }; }; // namespace daObjEff diff --git a/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h b/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h index e0f3b19fc8..1c6535e6f3 100644 --- a/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h +++ b/include/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h @@ -1,6 +1,80 @@ #ifndef D_A_OBJ_RGATE_H #define D_A_OBJ_RGATE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" + +class daObjRgate_c : public dBgS_MoveBgActor { +public: + /* 80CB9DF8 */ void initBaseMtx(); + /* 80CB9F4C */ void setBaseMtx(); + /* 80CBA828 */ int create1st(); + /* 80CBA8A8 */ int checkAreaL(cXyz const*, cXyz const*); + /* 80CBAC38 */ int checkAreaR(cXyz const*, cXyz const*); + /* 80CBAFC4 */ BOOL checkOpen(); + /* 80CBB0F0 */ BOOL checkDirL(fopAc_ac_c*); + /* 80CBB180 */ BOOL checkDirR(fopAc_ac_c*); + /* 80CBB210 */ void setAtkSE(); + /* 80CBB28C */ void setCrkSE(); + /* 80CBB308 */ void action(); + /* 80CBB370 */ void action_typeA(); + /* 80CBBA10 */ void actionWaitEvent(); + /* 80CBBAF4 */ void actionEvent(); + /* 80CBBB5C */ void actionDead(); + /* 80CBBB60 */ void event_proc_call(); + /* 80CBBC04 */ void demoProc(); + /* 80CBBD68 */ int getDemoAction(); + + /* 80CBA654 */ virtual int CreateHeap(); + /* 80CBA468 */ virtual int Create(); + /* 80CBBDB0 */ virtual int Execute(Mtx**); + /* 80CBBE18 */ virtual int Draw(); + /* 80CBBF34 */ virtual int Delete(); + + void setAction(u8 i_action) { mAction = i_action; } + + u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getEventID() { return fopAcM_GetParamBit(this, 0x14, 8); } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpGateModel; + /* 0x5AC */ J3DModel* mpKeyModel; + /* 0x5B0 */ J3DModel* mpHookModel; + /* 0x5B4 */ dCcD_Stts mCcStatus; + /* 0x5F0 */ dCcD_Cyl mCyls[4]; + /* 0xAE0 */ dBgW* mpBgW; + /* 0xAE4 */ Mtx field_0xae4; + /* 0xB14 */ Mtx field_0xb14; + /* 0xB44 */ u8 field_0xB44[0xB74 - 0xB44]; + /* 0xB74 */ s16 mGateRAngle; + /* 0xB76 */ s16 mGateLAngle; + /* 0xB78 */ u8 field_0xB78[0xB90 - 0xB78]; + /* 0xB90 */ f32 field_0xb90; + /* 0xB94 */ f32 field_0xb94; + /* 0xB98 */ int mCounter; + /* 0xB9C */ s16 mGateLMove; + /* 0xB9E */ s16 mGateRMove; + /* 0xBA0 */ u8 mAction; + /* 0xBA1 */ u8 mMapToolID; + /* 0xBA2 */ s16 mEventID; + /* 0xBA4 */ int mStaffID; + /* 0xBA8 */ u8 mTimer; + /* 0xBA9 */ bool mCreatedSmokeEff; + /* 0xBAA */ s16 field_0xbaa; + /* 0xBAC */ s16 field_0xbac; + /* 0xBAE */ s16 field_0xbae; + /* 0xBB0 */ f32 field_0xbb0; + /* 0xBB4 */ cXyz field_0xbb4; + /* 0xBC0 */ cXyz field_0xbc0; + /* 0xBCC */ s16 field_0xbcc; + /* 0xBD0 */ cXyz mEffPos; + /* 0xBDC */ csXyz mKeyRot; + /* 0xBE4 */ f32 field_0xbe4; + /* 0xBE8 */ cXyz field_0xbe8; + /* 0xBF4 */ cXyz field_0xbf4; + /* 0xC00 */ Mtx field_0xc00; + /* 0xC30 */ Mtx field_0xc30; +}; #endif /* D_A_OBJ_RGATE_H */ diff --git a/include_link.mk b/include_link.mk index 20e7987465..544377be79 100644 --- a/include_link.mk +++ b/include_link.mk @@ -41,8 +41,8 @@ -include libs/dolphin/card/Makefile -include libs/dolphin/gx/Makefile -include libs/dolphin/gd/Makefile --include libs/Runtime.PPCEABI.H/Makefile --include libs/MSL_C/Makefile +-include libs/PowerPC_EABI_Support/Runtime/Src/Makefile +-include libs/PowerPC_EABI_Support/MSL/MSL_C/Makefile -include libs/TRK_MINNOW_DOLPHIN/Makefile -include libs/amcstubs/Makefile -include libs/odemuexi2/Makefile diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index a3464f6eb3..1937fd0ccc 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DManage.h" #include "JSystem/JSupport/JSUInputStream.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index 1ffc1862a0..b9c18e4411 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DMaterialFactory.h" #include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/JSupport/JSupport.h" -#include "MSL_C/string.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index 3233cf6427..6d187bc6cf 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -6,9 +6,9 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" -#include "MSL_C/stdio.h" -#include "MSL_C/stdlib.h" -#include "MSL_C/string.h" +#include "stdio.h" +#include "stdlib.h" +#include "string.h" #include "dol2asm.h" #include "global.h" diff --git a/libs/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/J2DGraph/J2DTevs.cpp index de3157e9de..c87724577a 100644 --- a/libs/JSystem/J2DGraph/J2DTevs.cpp +++ b/libs/JSystem/J2DGraph/J2DTevs.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMatBlock.h" #include "JSystem/JUtility/TColor.h" -#include "MSL_C/math.h" +#include "math.h" #include "dol2asm.h" #include "dolphin/gx/GX.h" diff --git a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index b4c9795895..0971d44838 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "dol2asm.h" #include "dolphin/os/OS.h" -#include "MSL_C/MSL_Common/Src/string.h" +#include "string.h" // // Types: diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index da84a7e9c1..efb578acc3 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C/string.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "dolphin/os/OSInterrupt.h" diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp index 86634fa7b3..aa726738bc 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J3DGraphBase/J3DShapeDraw.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/gx/GX.h" #include "dolphin/os/OSCache.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp index b0955f2f42..2a9921e417 100644 --- a/libs/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/libs/JSystem/J3DGraphBase/J3DVertex.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphAnimator/J3DJointTree.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/os/OSCache.h" #include "global.h" #include "init.h" diff --git a/libs/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/J3DU/J3DUClipper.cpp index 8de8ba3b73..95edb61a2c 100644 --- a/libs/JSystem/J3DU/J3DUClipper.cpp +++ b/libs/JSystem/J3DU/J3DUClipper.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J3DU/J3DUClipper.h" -#include "MSL_C/math.h" +#include "math.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/JAudio2/JASCalc.cpp index bcb17c1755..83ae399076 100644 --- a/libs/JSystem/JAudio2/JASCalc.cpp +++ b/libs/JSystem/JAudio2/JASCalc.cpp @@ -6,8 +6,8 @@ #include "JSystem/JAudio2/JASCalc.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" -#include "MSL_C/math.h" -#include "MSL_C/MSL_Common/Src/limits" +#include "math.h" +#include "limits.h" // // Types: diff --git a/libs/JSystem/JAudio2/JASReport.cpp b/libs/JSystem/JAudio2/JASReport.cpp index 736d85a55c..db7ad75e1c 100644 --- a/libs/JSystem/JAudio2/JASReport.cpp +++ b/libs/JSystem/JAudio2/JASReport.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JAudio2/JASMutex.h" -#include "MSL_C/stdio.h" +#include "stdio.h" // // Forward References: diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp index 28d1f9eb29..7b0d9b99cf 100644 --- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/dvd/dvd.h" #include "global.h" diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp index 4c3fcfbb2c..d4e4bda155 100644 --- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp @@ -17,7 +17,7 @@ #include "JSystem/JAudio2/JAUSoundTable.h" #include "JSystem/JAudio2/JAUStreamFileTable.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include "MSL_C/stdlib.h" +#include "stdlib.h" #include "dol2asm.h" #include "dolphin/dvd/dvd.h" diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index fe4cbc77e8..2cb1edae51 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -9,7 +9,7 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/ar/ar.h" #include "dolphin/os/OSCache.h" #include "dolphin/os/OSInterrupt.h" diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 63b1738162..262b6407f1 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -10,8 +10,8 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C/math.h" -#include "MSL_C/string.h" +#include "math.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "global.h" diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp index 6aea270869..e2f6557cc4 100644 --- a/libs/JSystem/JKernel/JKRArchivePri.cpp +++ b/libs/JSystem/JKernel/JKRArchivePri.cpp @@ -5,8 +5,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C/MSL_Common/Src/ctype.h" -#include "MSL_C/string.h" +#include "ctype.h" +#include "string.h" /* ############################################################################################## */ /* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss sCurrentDirID__10JKRArchive */ diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 1cc3ec008e..b7933468e6 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -13,8 +13,8 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C/math.h" -#include "MSL_C/string.h" +#include "math.h" +#include "string.h" #include "dolphin/os/OSCache.h" // diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index a3350d113d..9227a4ba6b 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -9,8 +9,8 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C/math.h" -#include "MSL_C/string.h" +#include "math.h" +#include "string.h" #include "dolphin/os/OS.h" #include "global.h" diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 8d551690b3..19d587ce00 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" #include "JSystem/JKernel/JKRArchive.h" -#include "MSL_C/string.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "dolphin/os/OSInterrupt.h" diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp index 91c6015c42..3d011991bb 100644 --- a/libs/JSystem/JKernel/JKRFileCache.cpp +++ b/libs/JSystem/JKernel/JKRFileCache.cpp @@ -8,8 +8,8 @@ #include "JSystem/JKernel/JKRFileFinder.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "MSL_C/MSL_Common/Src/ctype.h" -#include "MSL_C/string.h" +#include "ctype.h" +#include "string.h" #include "global.h" /* 802D49B4-802D4AB4 2CF2F4 0100+00 0/0 2/2 0/0 .text mount__12JKRFileCacheFPCcP7JKRHeapPCc */ diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp index 0cf77638ee..43c8b41bae 100644 --- a/libs/JSystem/JKernel/JKRFileLoader.cpp +++ b/libs/JSystem/JKernel/JKRFileLoader.cpp @@ -4,8 +4,8 @@ // #include "JSystem/JKernel/JKRFileLoader.h" -#include "MSL_C/string.h" -#include "MSL_C/MSL_Common/Src/ctype.h" +#include "string.h" +#include "ctype.h" #include "global.h" // diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index 4dc4d9beb8..e664b94e44 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/os/OSCache.h" #include "global.h" diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index d2ed52d520..14521e6e66 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "dol2asm.h" /* 8043428C-80434298 060FAC 000C+00 5/6 0/0 0/0 .bss sThreadList__9JKRThread */ diff --git a/libs/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp index 88c107cb14..392b83de58 100644 --- a/libs/JSystem/JMath/JMATrigonometric.cpp +++ b/libs/JSystem/JMath/JMATrigonometric.cpp @@ -5,7 +5,7 @@ // don't include header until this "zero" mess is figured out // #include "JSystem/JMath/JMATrigonometric.h" -#include "MSL_C/math.h" +#include "math.h" #include "dol2asm.h" #include "global.h" diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp index 39a414d01c..0fcd38a5f0 100644 --- a/libs/JSystem/JMessage/resource.cpp +++ b/libs/JSystem/JMessage/resource.cpp @@ -4,7 +4,8 @@ // #include "JSystem/JMessage/resource.h" -#include "MSL_C/string.h" +#include "string.h" +#include "string.h" #include "dol2asm.h" // diff --git a/libs/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp index 35ca5632c1..dd4c574681 100644 --- a/libs/JSystem/JParticle/JPAResourceManager.cpp +++ b/libs/JSystem/JParticle/JPAResourceManager.cpp @@ -6,7 +6,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" -#include "MSL_C/string.h" +#include "string.h" #include "dolphin/types.h" struct JPAResourceLoader { diff --git a/libs/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/JStage/JSGCamera.cpp index 1a4d86be4b..47be44d82d 100644 --- a/libs/JSystem/JStage/JSGCamera.cpp +++ b/libs/JSystem/JStage/JSGCamera.cpp @@ -1,5 +1,5 @@ #include "JSystem/JStage/JSGCamera.h" -#include "MSL_C/float.h" +#include "math.h" /* 80280BA0-80280C00 27B4E0 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage7TCameraFv */ JStage::TCamera::~TCamera() {} diff --git a/libs/JSystem/JStage/JSGFog.cpp b/libs/JSystem/JStage/JSGFog.cpp index d2f2a7eec4..c948f8d2e5 100644 --- a/libs/JSystem/JStage/JSGFog.cpp +++ b/libs/JSystem/JStage/JSGFog.cpp @@ -1,5 +1,5 @@ #include "JSystem/JStage/JSGFog.h" -#include "MSL_C/float.h" +#include "math.h" /* 80280C80-80280CE0 27B5C0 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage4TFogFv */ JStage::TFog::~TFog() {} diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp index 7323ff174a..f0767af683 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp @@ -5,8 +5,8 @@ #include "JSystem/JStudio/JStudio/functionvalue.h" #include "JSystem/JUtility/JUTException.h" -#include "MSL_C/math.h" -#include "MSL_C/stdlib.h" +#include "math.h" +#include "stdlib.h" #include "dol2asm.h" #include "global.h" diff --git a/libs/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp index 093be5330a..a0cc604f33 100644 --- a/libs/JSystem/JSupport/JSUMemoryStream.cpp +++ b/libs/JSystem/JSupport/JSUMemoryStream.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JSupport/JSUMemoryStream.h" -#include "MSL_C/string.h" +#include "string.h" /* 802DC520-802DC534 2D6E60 0014+00 0/0 3/3 0/0 .text setBuffer__20JSUMemoryInputStreamFPCvl */ void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) { diff --git a/libs/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/JUtility/JUTAssert.cpp index 2ed45e3146..1496e03864 100644 --- a/libs/JSystem/JUtility/JUTAssert.cpp +++ b/libs/JSystem/JUtility/JUTAssert.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "dolphin/vi/vi.h" namespace JUTAssertion { diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index dedd5688b1..1f67bcbc56 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -9,7 +9,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "dol2asm.h" #include "dolphin/os/OS.h" diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp index f3393ee336..c3a180c1c7 100644 --- a/libs/JSystem/JUtility/JUTDbPrint.cpp +++ b/libs/JSystem/JUtility/JUTDbPrint.cpp @@ -7,7 +7,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include "MSL_C/stdio.h" +#include "stdio.h" /* 802E0148-802E0190 2DAA88 0048+00 1/1 0/0 0/0 .text __ct__10JUTDbPrintFP7JUTFontP7JKRHeap */ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { diff --git a/libs/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp index 1ab0842118..0ea8f0c094 100644 --- a/libs/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/JUtility/JUTDirectPrint.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "dolphin/os/OSCache.h" #include "global.h" diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index d40b198067..a9c2ac6321 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -6,9 +6,9 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include "MSL_C/float.h" -#include "MSL_C/stdio.h" -#include "MSL_C/stdlib.h" +#include "math.h" +#include "stdio.h" +#include "stdlib.h" #include "dol2asm.h" #include "dolphin/base/PPCArch.h" #include "dolphin/os/OS.h" @@ -285,12 +285,15 @@ void JUTException::setFPException(u32 fpscr_enable_bits) { } } +// u8 doesn't work in other places for signbit? temp fix +#define __signbit(x) ((*(unsigned char*)&(x)) & 0x80) + /* 802E22C4-802E2454 2DCC04 0190+00 1/1 0/0 0/0 .text showFloatSub__12JUTExceptionFif */ void JUTException::showFloatSub(int index, f32 value) { if (fpclassify(value) == FP_NAN) { sConsole->print_f("F%02d: Nan ", index); } else if (fpclassify(value) == FP_INFINITE) { - if (signbit(value)) { + if (__signbit(value)) { sConsole->print_f("F%02d:+Inf ", index); } else { sConsole->print_f("F%02d:-Inf ", index); diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index ef631a7283..9ec141f8d3 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTGamePad.h" -#include "MSL_C/math.h" +#include "math.h" #include "dol2asm.h" #include "dolphin/os/OSResetSW.h" diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp index ca2ff4ea1b..b25e67e133 100644 --- a/libs/JSystem/JUtility/JUTNameTab.cpp +++ b/libs/JSystem/JUtility/JUTNameTab.cpp @@ -4,7 +4,7 @@ // #include "JSystem/JUtility/JUTNameTab.h" -#include "MSL_C/string.h" +#include "string.h" JUTNameTab::JUTNameTab() { setResource(NULL); diff --git a/libs/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/JUtility/JUTResource.cpp index 49ba42767a..4d371db7ab 100644 --- a/libs/JSystem/JUtility/JUTResource.cpp +++ b/libs/JSystem/JUtility/JUTResource.cpp @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JSupport/JSUInputStream.h" -#include "MSL_C/MSL_Common/Src/string.h" +#include "string.h" #include "dolphin/types.h" // diff --git a/libs/MSL_C/MSL_Common/Src/FILE_POS.c b/libs/MSL_C/MSL_Common/Src/FILE_POS.c deleted file mode 100644 index 9652ce84f8..0000000000 --- a/libs/MSL_C/MSL_Common/Src/FILE_POS.c +++ /dev/null @@ -1,49 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: MSL_Common/Src/FILE_POS -// - -#include "MSL_C/MSL_Common/Src/FILE_POS.h" -#include "MSL_C/MSL_Common/Src/buffer_io.h" -#include "errno.h" - -// -// External References: -// - -void __end_critical_region(); -void __begin_critical_region(); - -// -// Declarations: -// - -/* 80365BB4-80365C20 3604F4 006C+00 0/0 2/2 0/0 .text fseek */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int fseek(FILE* file, long offset, int mode) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/FILE_POS/fseek.s" -} -#pragma pop - -/* 80365C20-80365E90 360560 0270+00 1/1 0/0 0/0 .text _fseek */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int _fseek(FILE* file, fpos_t offset, int mode) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/FILE_POS/_fseek.s" -} -#pragma pop - -/* 80365E90-80365F74 3607D0 00E4+00 0/0 2/2 0/0 .text ftell */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm long ftell(FILE* file) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/FILE_POS/ftell.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/alloc.c b/libs/MSL_C/MSL_Common/Src/alloc.c deleted file mode 100644 index 3937a44c16..0000000000 --- a/libs/MSL_C/MSL_Common/Src/alloc.c +++ /dev/null @@ -1,106 +0,0 @@ -#include "MSL_C/MSL_Common/Src/alloc.h" -#include "MSL_C/MSL_Common/Src/string.h" - -static void deallocate_from_fixed_pools(int**,unsigned int**, unsigned int); -static void deallocate_from_var_pools(int**,unsigned int**); - -// -// External References: -// - -void __sys_free(); -void __end_critical_region(int); -void __begin_critical_region(int); -extern unsigned char data_804519A0[8]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8044D540-8044D578 07A260 0038+00 1/1 0/0 0/0 .bss protopool$192 */ -static unsigned char protopool[56]; - -/* 80362B58-80362BC8 35D498 0070+00 0/0 2/2 0/0 .text free */ -#ifdef NONMATCHING -// matches but causes reordering -void free(FILE* file) { - __begin_critical_region(1); - - if (data_804519A0[0] == 0) { - memset(protopool,0,0x34); - data_804519A0[0] = 1; - } - - __pool_free((int**)protopool, (unsigned int**)file); - __end_critical_region(1); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void free(FILE* file) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/alloc/free.s" -} -#pragma pop -#endif - -/* 80362BC8-80362C20 35D508 0058+00 1/1 0/0 0/0 .text __pool_free */ -#ifdef NONMATCHING -// matches but causes reordering -void __pool_free(int **param_1, unsigned int **param_2) { - unsigned int var; - - if (param_2) { - if (((unsigned int)param_2[-1] & 1) == 0) { - var = param_2[-1][2]; - } else { - var = (unsigned int)param_2[-2] & 0xfffffff8; - var -= 8; - } - - if (var <= 0x44) { - deallocate_from_fixed_pools(param_1,param_2, var); - } else { - deallocate_from_var_pools(param_1,param_2); - } - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __pool_free(int **param_1, unsigned int **param_2) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/alloc/__pool_free.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 803A2220-803A2238 02E880 0018+00 1/1 0/0 0/0 .rodata fix_pool_sizes */ -static unsigned char const fix_pool_sizes[24] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x44, -}; - -/* 80362C20-80362D78 35D560 0158+00 1/1 0/0 0/0 .text deallocate_from_fixed_pools */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void deallocate_from_fixed_pools(int** param_1,unsigned int** param_2, unsigned int param_3) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_fixed_pools.s" -} -#pragma pop - -/* 80362D78-8036300C 35D6B8 0294+00 2/2 0/0 0/0 .text deallocate_from_var_pools */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void deallocate_from_var_pools(int** param_1,unsigned int** param_2) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/alloc/deallocate_from_var_pools.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/char_io.c b/libs/MSL_C/MSL_Common/Src/char_io.c deleted file mode 100644 index 2c9850ed76..0000000000 --- a/libs/MSL_C/MSL_Common/Src/char_io.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "MSL_C/MSL_Common/Src/char_io.h" -#include "MSL_C/MSL_Common/Src/FILE_POS.h" -#include "MSL_C/MSL_Common/Src/buffer_io.h" -#include "MSL_C/MSL_Common/Src/misc_io.h" -#include "MSL_C/MSL_Common/Src/wchar_io.h" - -void __end_critical_region(); -void __begin_critical_region(); - -/* 803651D8-803652AC 35FB18 00D4+00 0/0 1/1 0/0 .text fputs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int fputs(const char* str, FILE* stream) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/char_io/fputs.s" -} -#pragma pop - -/* 803652AC-80365464 35FBEC 01B8+00 1/1 0/0 0/0 .text __put_char */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int __put_char(int c, FILE* stream) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/char_io/__put_char.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/extras.c b/libs/MSL_C/MSL_Common/Src/extras.c deleted file mode 100644 index f5f7b7c531..0000000000 --- a/libs/MSL_C/MSL_Common/Src/extras.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "MSL_C/MSL_Common/Src/extras.h" -#include "MSL_C/MSL_Common/Src/ctype.h" -#include "MSL_C/MSL_Common/Src/file_io.h" - -/* 8036CA74-8036CA94 3673B4 0020+00 0/0 1/1 0/0 .text strnicmp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int strnicmp(const char* str1, const char* str2, int n) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/extras/strnicmp.s" -} -#pragma pop - -/* 8036CA94-8036CB20 3673D4 008C+00 0/0 1/1 0/0 .text stricmp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int stricmp(const char* str1, const char* str2) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/extras/stricmp.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/mbstring.c b/libs/MSL_C/MSL_Common/Src/mbstring.c deleted file mode 100644 index 82c7bcd957..0000000000 --- a/libs/MSL_C/MSL_Common/Src/mbstring.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "MSL_C/MSL_Common/Src/mbstring.h" -#include "MSL_C/MSL_Common/Src/string.h" -#include "dol2asm.h" - -/* ############################################################################################## */ -/* 80456668-80456670 004C68 0004+04 1/1 0/0 0/0 .sdata2 @74 */ -SECTION_SDATA2 static unsigned long lit_74 = 0x0000C0E0; - -/* 80365F74-8036608C 3608B4 0118+00 0/0 1/1 0/0 .text wcstombs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm size_t wcstombs(char* dst, const wchar_t* src, size_t n) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/mbstring/wcstombs.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/printf.c b/libs/MSL_C/MSL_Common/Src/printf.c deleted file mode 100644 index c313056f8b..0000000000 --- a/libs/MSL_C/MSL_Common/Src/printf.c +++ /dev/null @@ -1,336 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: MSL_Common/Src/printf -// - -#include "MSL_C/MSL_Common/Src/printf.h" -#include "MSL_C/MSL_Common/Src/ctype.h" -#include "MSL_C/MSL_Common/Src/mem.h" -#include "MSL_C/MSL_Common/Src/string.h" -#include "MSL_C/MSL_Common/Src/wchar_io.h" -#include "dol2asm.h" - -// -// Forward References: -// - -void __StringWrite(); -void __FileWrite(); -void __pformatter(); -static void float2str(); -static void round_decimal(); -static void double2hex(); -static void longlong2str(); -static void long2str(); -static void parse_format(); -extern char const* const MSL_Common_Src_printf__stringBase0; - -// -// External References: -// - -void __div2u(); -void __mod2u(); -void __num2dec(); -void __end_critical_region(); -void __begin_critical_region(); -void fwrite(); -void wcstombs(); - -// -// Declarations: -// - -/* 803664DC-803665BC 360E1C 00E0+00 0/0 32/32 14/14 .text sprintf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int sprintf(const char* str, const char* format, ...) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/sprintf.s" -} -#pragma pop - -/* 803665BC-80366690 360EFC 00D4+00 0/0 19/19 0/0 .text snprintf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int snprintf(const char* str, size_t n, const char* format, ...) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/snprintf.s" -} -#pragma pop - -/* 80366690-80366704 360FD0 0074+00 0/0 8/8 0/0 .text vsnprintf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int vsnprintf(char* str, size_t n, const char* format, va_list arg) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/vsnprintf.s" -} -#pragma pop - -/* 80366704-8036679C 361044 0098+00 0/0 2/2 0/0 .text vprintf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int vprintf(const char* format, va_list arg) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/vprintf.s" -} -#pragma pop - -/* 8036679C-8036687C 3610DC 00E0+00 0/0 9/9 0/0 .text fprintf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int fprintf(FILE* stream, const char* format, ...) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/fprintf.s" -} -#pragma pop - -/* 8036687C-80366964 3611BC 00E8+00 0/0 4/4 0/0 .text printf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int printf(const char* format, ...) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/printf.s" -} -#pragma pop - -/* 80366964-803669D0 3612A4 006C+00 3/3 0/0 0/0 .text __StringWrite */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __StringWrite() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/__StringWrite.s" -} -#pragma pop - -/* 803669D0-80366A28 361310 0058+00 3/3 0/0 0/0 .text __FileWrite */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __FileWrite() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/__FileWrite.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803A2318-803A2318 02E978 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A2318 = ""; -#pragma pop - -/* 80450AD8-80450AE0 000558 0002+06 1/1 0/0 0/0 .sdata @wstringBase0 */ -SECTION_SDATA static unsigned char data_80450AD8[2 + 6 /* padding */] = { - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80366A28-8036719C 361368 0774+00 6/6 0/0 0/0 .text __pformatter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __pformatter() { - nofralloc -#undef __va_arg -#include "asm/MSL_C/MSL_Common/Src/printf/__pformatter.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803A2318-803A2318 02E978 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A2319 = "-INF"; -SECTION_DEAD static char const* const stringBase_803A231E = "-inf"; -SECTION_DEAD static char const* const stringBase_803A2323 = "INF"; -SECTION_DEAD static char const* const stringBase_803A2327 = "inf"; -SECTION_DEAD static char const* const stringBase_803A232B = "-NAN"; -SECTION_DEAD static char const* const stringBase_803A2330 = "-nan"; -SECTION_DEAD static char const* const stringBase_803A2335 = "NAN"; -SECTION_DEAD static char const* const stringBase_803A2339 = "nan"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A233D = "\0\0"; -#pragma pop - -/* 80456670-80456678 004C70 0008+00 1/1 0/0 0/0 .sdata2 @1089 */ -SECTION_SDATA2 static unsigned char lit_1089[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8036719C-803678B8 361ADC 071C+00 1/1 0/0 0/0 .text float2str */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void float2str() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/float2str.s" -} -#pragma pop - -/* 803678B8-803679E4 3621F8 012C+00 1/1 0/0 0/0 .text round_decimal */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void round_decimal() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/round_decimal.s" -} -#pragma pop - -/* 803679E4-80367D1C 362324 0338+00 1/1 0/0 0/0 .text double2hex */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void double2hex() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/double2hex.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803D2F18-803D2F9C -00001 0084+00 1/1 0/0 0/0 .data @1248 */ -SECTION_DATA static void* lit_1248[33] = { - (void*)(((char*)longlong2str) + 0xF8), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x98), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x98), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0xD0), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0xE4), - (void*)(((char*)longlong2str) + 0x108), (void*)(((char*)longlong2str) + 0x108), - (void*)(((char*)longlong2str) + 0xF8), -}; - -/* 80367D1C-80368030 36265C 0314+00 2/1 0/0 0/0 .text longlong2str */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void longlong2str() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/longlong2str.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803D2F9C-803D3020 -00001 0084+00 1/1 0/0 0/0 .data @1307 */ -SECTION_DATA static void* lit_1307[33] = { - (void*)(((char*)long2str) + 0xA8), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0x70), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0x70), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0x88), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0x98), - (void*)(((char*)long2str) + 0xB4), (void*)(((char*)long2str) + 0xB4), - (void*)(((char*)long2str) + 0xA8), -}; - -/* 80368030-80368288 362970 0258+00 3/2 0/0 0/0 .text long2str */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void long2str() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/long2str.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803D3020-803D3100 -00001 00E0+00 1/1 0/0 0/0 .data @1443 */ -SECTION_DATA static void* lit_1443[56] = { - (void*)(((char*)parse_format) + 0x38C), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x3DC), (void*)(((char*)parse_format) + 0x354), - (void*)(((char*)parse_format) + 0x3C8), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x30C), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x38C), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x440), (void*)(((char*)parse_format) + 0x30C), - (void*)(((char*)parse_format) + 0x3DC), (void*)(((char*)parse_format) + 0x354), - (void*)(((char*)parse_format) + 0x3C8), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x30C), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4A4), - (void*)(((char*)parse_format) + 0x30C), (void*)(((char*)parse_format) + 0x41C), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x478), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x30C), (void*)(((char*)parse_format) + 0x4BC), - (void*)(((char*)parse_format) + 0x4BC), (void*)(((char*)parse_format) + 0x30C), -}; - -/* 803D3100-803D3148 -00001 0044+04 1/1 0/0 0/0 .data @1442 */ -SECTION_DATA static void* lit_1442[17 + 1 /* padding */] = { - (void*)(((char*)parse_format) + 0xBC), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xD4), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xB0), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xA4), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xF8), - (void*)(((char*)parse_format) + 0xE0), - /* padding */ - NULL, -}; - -/* 80368288-8036878C 362BC8 0504+00 3/1 0/0 0/0 .text parse_format */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void parse_format() { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/printf/parse_format.s" -} -#pragma pop - -/* 803A2318-803A2318 02E978 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/MSL_C/MSL_Common/Src/scanf.c b/libs/MSL_C/MSL_Common/Src/scanf.c deleted file mode 100644 index f6640613eb..0000000000 --- a/libs/MSL_C/MSL_Common/Src/scanf.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "MSL_C/MSL_Common/Src/scanf.h" - -/* 8036878C-8036881C 3630CC 0090+00 0/0 2/2 0/0 .text __StringRead */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int __StringRead(char* str, int ch, int behavior) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/scanf/__StringRead.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/signal.c b/libs/MSL_C/MSL_Common/Src/signal.c deleted file mode 100644 index 6fb6830310..0000000000 --- a/libs/MSL_C/MSL_Common/Src/signal.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "MSL_C/MSL_Common/Src/signal.h" -#include "MSL_C/MSL_Common/Src/abort_exit.h" - -void __end_critical_region(); -void __begin_critical_region(); - -/* ############################################################################################## */ -/* 8044D878-8044D890 07A598 0018+00 1/1 0/0 0/0 .bss signal_funcs */ -static unsigned char signal_funcs[24]; - -/* 8036881C-803688DC 36315C 00C0+00 0/0 1/1 0/0 .text raise */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int raise(int sig) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/signal/raise.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common/Src/strtoul.c b/libs/MSL_C/MSL_Common/Src/strtoul.c deleted file mode 100644 index dd7147bd1b..0000000000 --- a/libs/MSL_C/MSL_Common/Src/strtoul.c +++ /dev/null @@ -1,64 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: MSL_Common/Src/strtoul -// - -#include "MSL_C/MSL_Common/Src/strtoul.h" -#include "MSL_C/MSL_Common/Src/ctype.h" -#include "MSL_C/MSL_Common/Src/scanf.h" -#include "errno.h" -#include "dol2asm.h" - -/* 80368C00-80368CF0 363540 00F0+00 0/0 3/3 0/0 .text strtol */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm long strtol(const char* str, char** endptr, int base) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/strtoul/strtol.s" -} -#pragma pop - -/* 80368CF0-80368D9C 363630 00AC+00 0/0 2/2 0/0 .text strtoul */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm unsigned long strtoul(const char* str, char** endptr, int base) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/strtoul/strtoul.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803D3148-803D3190 -00001 0044+04 1/1 0/0 0/0 .data @431 */ -SECTION_DATA static void* lit_431[17 + 1 /* padding */] = { - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0xC4), - (void*)(((char*)__strtoul) + 0x164), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x1AC), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x1FC), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x310), - (void*)(((char*)__strtoul) + 0x1FC), - /* padding */ - 0, -}; - -/* 80368D9C-80369114 3636DC 0378+00 3/2 0/0 0/0 .text __strtoul */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm unsigned long __strtoul(const char* str, char** endptr, int base) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/strtoul/__strtoul.s" -} -#pragma pop diff --git a/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c deleted file mode 100644 index 4cdf13f636..0000000000 --- a/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c +++ /dev/null @@ -1,192 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: MSL_Common_Embedded/Src/ansi_fp -// - -#include "MSL_C/MSL_Common_Embedded/Src/ansi_fp.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -void __num2dec(); -void __num2dec_internal(); -void __two_exp(); -void __timesdec(); -extern char const* const MSL_Common_Embedded_Src_ansi_fp__stringBase0; - -// -// External References: -// - -void __div2u(); -void __mod2u(); -void __cvt_dbl_usll(); -void frexp(); -void ldexp(); -void modf(); - -// -// Declarations: -// - -/* 80363124-803632C8 35DA64 01A4+00 0/0 2/2 0/0 .text __num2dec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __num2dec() { - nofralloc -#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80456660-80456668 004C60 0008+00 1/1 0/0 0/0 .sdata2 @824 */ -SECTION_SDATA2 static u8 lit_824[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803632C8-8036367C 35DC08 03B4+00 1/1 0/0 0/0 .text __num2dec_internal */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __num2dec_internal() { - nofralloc -#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__num2dec_internal.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803A2238-803A2238 02E898 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A2238 = "179769313486231580793729011405303420"; -SECTION_DEAD static char const* const stringBase_803A225D = - "542101086242752217003726400434970855712890625"; -SECTION_DEAD static char const* const stringBase_803A228B = - "11102230246251565404236316680908203125"; -SECTION_DEAD static char const* const stringBase_803A22B2 = "23283064365386962890625"; -SECTION_DEAD static char const* const stringBase_803A22CA = "152587890625"; -SECTION_DEAD static char const* const stringBase_803A22D7 = "390625"; -SECTION_DEAD static char const* const stringBase_803A22DE = "78125"; -SECTION_DEAD static char const* const stringBase_803A22E4 = "15625"; -SECTION_DEAD static char const* const stringBase_803A22EA = "3125"; -SECTION_DEAD static char const* const stringBase_803A22EF = "625"; -SECTION_DEAD static char const* const stringBase_803A22F3 = "125"; -SECTION_DEAD static char const* const stringBase_803A22F7 = "25"; -SECTION_DEAD static char const* const stringBase_803A22FA = "5"; -SECTION_DEAD static char const* const stringBase_803A22FC = "1"; -SECTION_DEAD static char const* const stringBase_803A22FE = "2"; -SECTION_DEAD static char const* const stringBase_803A2300 = "4"; -SECTION_DEAD static char const* const stringBase_803A2302 = "8"; -SECTION_DEAD static char const* const stringBase_803A2304 = "16"; -SECTION_DEAD static char const* const stringBase_803A2307 = "32"; -SECTION_DEAD static char const* const stringBase_803A230A = "64"; -SECTION_DEAD static char const* const stringBase_803A230D = "128"; -SECTION_DEAD static char const* const stringBase_803A2311 = "256"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A2315 = "\0\0"; -#pragma pop - -/* 803D2AF0-803D2C18 -00001 0124+04 1/1 0/0 0/0 .data @1710 */ -SECTION_DATA static void* lit_1710[73 + 1 /* padding */] = { - (void*)(((char*)__two_exp) + 0x40), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x13C), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x238), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x334), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x14DC), - (void*)(((char*)__two_exp) + 0x430), - (void*)(((char*)__two_exp) + 0x52C), - (void*)(((char*)__two_exp) + 0x628), - (void*)(((char*)__two_exp) + 0x724), - (void*)(((char*)__two_exp) + 0x820), - (void*)(((char*)__two_exp) + 0x91C), - (void*)(((char*)__two_exp) + 0xA18), - (void*)(((char*)__two_exp) + 0xB14), - (void*)(((char*)__two_exp) + 0xC10), - (void*)(((char*)__two_exp) + 0xD08), - (void*)(((char*)__two_exp) + 0xE00), - (void*)(((char*)__two_exp) + 0xEF8), - (void*)(((char*)__two_exp) + 0xFF0), - (void*)(((char*)__two_exp) + 0x10EC), - (void*)(((char*)__two_exp) + 0x11E8), - (void*)(((char*)__two_exp) + 0x12E4), - (void*)(((char*)__two_exp) + 0x13E0), - /* padding */ - NULL, -}; - -/* 8036367C-80364E00 35DFBC 1784+00 2/1 0/0 0/0 .text __two_exp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __two_exp() { - nofralloc -#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__two_exp.s" -} -#pragma pop - -/* 80364E00-80365078 35F740 0278+00 2/2 0/0 0/0 .text __timesdec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __timesdec() { - nofralloc -#include "asm/MSL_C/MSL_Common_Embedded/Src/ansi_fp/__timesdec.s" -} -#pragma pop - -/* 803A2238-803A2238 02E898 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/MSL_C/Makefile b/libs/MSL_C/Makefile deleted file mode 100644 index f918f89903..0000000000 --- a/libs/MSL_C/Makefile +++ /dev/null @@ -1,151 +0,0 @@ -# -# Generated By: dol2asm -# - -LIBMSL_C_PPCEABI_BARE_H_A_CPP_FILES := \ - libs/MSL_C/MSL_Common/Src/abort_exit.c \ - libs/MSL_C/MSL_Common/Src/alloc.c \ - libs/MSL_C/MSL_Common/Src/errno.c \ - libs/MSL_C/MSL_Common/Src/ansi_files.c \ - libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c \ - libs/MSL_C/MSL_Common/Src/arith.c \ - libs/MSL_C/MSL_Common/Src/buffer_io.c \ - libs/MSL_C/MSL_Common/Src/char_io.c \ - libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c \ - libs/MSL_C/MSL_Common/Src/ctype.c \ - libs/MSL_C/MSL_Common/Src/direct_io.c \ - libs/MSL_C/MSL_Common/Src/file_io.c \ - libs/MSL_C/MSL_Common/Src/FILE_POS.c \ - libs/MSL_C/MSL_Common/Src/mbstring.c \ - libs/MSL_C/MSL_Common/Src/mem.c \ - libs/MSL_C/MSL_Common/Src/mem_funcs.c \ - libs/MSL_C/MSL_Common/Src/misc_io.c \ - libs/MSL_C/MSL_Common/Src/printf.c \ - libs/MSL_C/MSL_Common/Src/scanf.c \ - libs/MSL_C/MSL_Common/Src/float.c \ - libs/MSL_C/MSL_Common/Src/signal.c \ - libs/MSL_C/MSL_Common/Src/string.c \ - libs/MSL_C/MSL_Common/Src/strtoul.c \ - libs/MSL_C/MSL_Common/Src/wchar_io.c \ - libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c \ - libs/MSL_C/Math/Double_precision/e_acos.c \ - libs/MSL_C/Math/Double_precision/e_asin.c \ - libs/MSL_C/Math/Double_precision/e_atan2.c \ - libs/MSL_C/Math/Double_precision/e_exp.c \ - libs/MSL_C/Math/Double_precision/e_fmod.c \ - libs/MSL_C/Math/Double_precision/e_pow.c \ - libs/MSL_C/Math/Double_precision/e_rem_pio2.c \ - libs/MSL_C/Math/Double_precision/k_cos.c \ - libs/MSL_C/Math/Double_precision/k_rem_pio2.c \ - libs/MSL_C/Math/Double_precision/k_sin.c \ - libs/MSL_C/Math/Double_precision/k_tan.c \ - libs/MSL_C/Math/Double_precision/s_atan.c \ - libs/MSL_C/Math/Double_precision/s_ceil.c \ - libs/MSL_C/Math/Double_precision/s_copysign.c \ - libs/MSL_C/Math/Double_precision/s_cos.c \ - libs/MSL_C/Math/Double_precision/s_floor.c \ - libs/MSL_C/Math/Double_precision/s_frexp.c \ - libs/MSL_C/Math/Double_precision/s_ldexp.c \ - libs/MSL_C/Math/Double_precision/s_modf.c \ - libs/MSL_C/Math/Double_precision/s_sin.c \ - libs/MSL_C/Math/Double_precision/s_tan.c \ - libs/MSL_C/Math/Double_precision/w_acos.c \ - libs/MSL_C/Math/Double_precision/w_asin.c \ - libs/MSL_C/Math/Double_precision/w_atan2.c \ - libs/MSL_C/Math/Double_precision/w_exp.c \ - libs/MSL_C/Math/Double_precision/w_fmod.c \ - libs/MSL_C/Math/Double_precision/w_pow.c \ - libs/MSL_C/Math/Double_precision/e_sqrt.c \ - libs/MSL_C/PPC_EABI/Src/math_ppc.c \ - libs/MSL_C/Math/Double_precision/w_sqrt.c \ - libs/MSL_C/MSL_Common/Src/extras.c \ - -LIBMSL_C_PPCEABI_BARE_H_A_O_FILES := \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/abort_exit.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/alloc.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/errno.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/ansi_files.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common_Embedded/Src/ansi_fp.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/arith.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/buffer_io.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/char_io.o \ - $(BUILD_DIR)/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/ctype.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/direct_io.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/file_io.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/FILE_POS.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/mbstring.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/mem.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/mem_funcs.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/misc_io.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/printf.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/scanf.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/float.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/signal.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/string.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/strtoul.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/wchar_io.o \ - $(BUILD_DIR)/libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_acos.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_asin.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_atan2.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_exp.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_fmod.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_pow.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_rem_pio2.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_cos.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_rem_pio2.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_sin.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/k_tan.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_atan.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_ceil.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_copysign.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_cos.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_floor.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_frexp.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_ldexp.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_modf.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_sin.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/s_tan.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_acos.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_asin.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_atan2.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_exp.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_fmod.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_pow.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/e_sqrt.o \ - $(BUILD_DIR)/libs/MSL_C/PPC_EABI/Src/math_ppc.o \ - $(BUILD_DIR)/libs/MSL_C/Math/Double_precision/w_sqrt.o \ - $(BUILD_DIR)/libs/MSL_C/MSL_Common/Src/extras.o \ - -LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS := \ - -O4,p \ - -lang=c \ - -fp_contract on \ - -use_lmw_stmw on \ - -inline deferred,auto \ - -LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS := \ - -nodefaults \ - -fp hard \ - -proc gekko \ - -linkmode moreram \ - -$(BUILD_DIR)/libMSL_C.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) - @echo linking... $(BUILD_DIR)/libMSL_C.a - @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles - @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libMSL_C.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles - -$(BUILD_DIR)/libs/MSL_C/%.o: libs/MSL_C/%.c $(BUILD_DIR)/libs/MSL_C/%.d - @mkdir -p $(@D) - @echo building... $< - @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c - @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi - -ifndef DISABLE_DEPS -LIBMSL_C_PPCEABI_BARE_H_A_D_FILES := $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES:.o=.d) -$(LIBMSL_C_PPCEABI_BARE_H_A_D_FILES): -include $(wildcard $(LIBMSL_C_PPCEABI_BARE_H_A_D_FILES)) -endif - diff --git a/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c b/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c deleted file mode 100644 index 1bab3322e8..0000000000 --- a/libs/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "MSL_C/PPC_EABI/Src/critical_regions.gamecube.h" - -void __end_critical_region(); -void __begin_critical_region(); -void __kill_critical_regions(); - -/* 8036546C-80365470 35FDAC 0004+00 0/0 2/2 0/0 .text __kill_critical_regions */ -void __kill_critical_regions() { - /* empty function */ -} - -/* 80365468-8036546C 35FDA8 0004+00 0/0 12/12 0/0 .text __begin_critical_region */ -void __begin_critical_region() { - /* empty function */ -} - -/* 80365464-80365468 35FDA4 0004+00 0/0 12/12 0/0 .text __end_critical_region */ -void __end_critical_region() { - /* empty function */ -} \ No newline at end of file diff --git a/include/MSL_C/algorithm.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h similarity index 100% rename from include/MSL_C/algorithm.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h diff --git a/include/MSL_C/bitset.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h similarity index 95% rename from include/MSL_C/bitset.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h index f96866939b..1bdd4f0faf 100644 --- a/include/MSL_C/bitset.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h @@ -1,9 +1,9 @@ #ifndef MSL_BITSET_H_ #define MSL_BITSET_H_ -#include "MSL_C/algorithm.h" -#include "MSL_C/stdio.h" -#include "MSL_C/stdlib.h" +#include "algorithm.h" +#include "stdio.h" +#include "stdlib.h" namespace std { // TODO: where does this go? diff --git a/include/MSL_C/functional.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional.h similarity index 100% rename from include/MSL_C/functional.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional.h diff --git a/include/MSL_C/utility.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility.h similarity index 100% rename from include/MSL_C/utility.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility.h diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h new file mode 100644 index 0000000000..386fc29fd1 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h @@ -0,0 +1,18 @@ +#ifndef _MSL_COMMON_FILE_POS_H +#define _MSL_COMMON_FILE_POS_H + +#include "ansi_files.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int fseek(FILE* file, unsigned long offset, int mode); +int _fseek(FILE* file, fpos_t offset, int mode); +long ftell(FILE* file); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_FILE_POS_H */ diff --git a/include/MSL_C/MSL_Common/Src/abort_exit.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h similarity index 56% rename from include/MSL_C/MSL_Common/Src/abort_exit.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h index 80eea63904..7c62fe70fa 100644 --- a/include/MSL_C/MSL_Common/Src/abort_exit.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h @@ -1,5 +1,5 @@ -#ifndef MSL_COMMON_SRC_ABORT_EXIT_H -#define MSL_COMMON_SRC_ABORT_EXIT_H +#ifndef _MSL_COMMON_ABORT_EXIT_H +#define _MSL_COMMON_ABORT_EXIT_H #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ extern void (*__stdio_exit)(void); }; #endif -#endif /* MSL_COMMON_SRC_ABORT_EXIT_H */ +#endif /* _MSL_COMMON_ABORT_EXIT_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h new file mode 100644 index 0000000000..085c40d484 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h @@ -0,0 +1,16 @@ +#ifndef _MSL_COMMON_ALLOC_H +#define _MSL_COMMON_ALLOC_H + +#include "ansi_files.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void free(void* ptr); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_ALLOC_H */ diff --git a/include/MSL_C/MSL_Common/Src/ansi_files.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h similarity index 95% rename from include/MSL_C/MSL_Common/Src/ansi_files.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h index a5d74cf21f..d4d3b843ae 100644 --- a/include/MSL_C/MSL_Common/Src/ansi_files.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h @@ -1,7 +1,7 @@ -#ifndef MSL_COMMON_SRC_ANSI_FILES_H -#define MSL_COMMON_SRC_ANSI_FILES_H +#ifndef _MSL_COMMON_ANSI_FILES_H +#define _MSL_COMMON_ANSI_FILES_H -#include "MSL_C/MSL_Common/Src/stddef.h" +#include "stddef.h" #ifdef __cplusplus extern "C" { @@ -126,4 +126,4 @@ void __close_all(void); }; #endif -#endif /* MSL_COMMON_SRC_ANSI_FILES_H */ +#endif /* _MSL_COMMON_ANSI_FILES_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h new file mode 100644 index 0000000000..82152fbc2e --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h @@ -0,0 +1,36 @@ +#ifndef _MSL_COMMON_ANSI_FP_H +#define _MSL_COMMON_ANSI_FP_H + +#include "float.h" + +#define SIGDIGLEN 36 + +typedef struct decimal { + char sign; + char unk1; + short exp; + struct { + unsigned char length; + unsigned char text[36]; + unsigned char unk41; + } sig; +} decimal; + +typedef struct decform { + char style; + char unk1; + short digits; +} decform; + +/* void __ull2dec(decimal*, u64); +void __timesdec(decimal*, const decimal*, const decimal*); +void __str2dec(decimal*, const char*, short); +void __two_exp(decimal*, s32); +BOOL __equals_dec(const decimal*, const decimal*); +BOOL __less_dec(const decimal*, const decimal*); +void __minus_dec(decimal*, const decimal*, const decimal*); +void __num2dec_internal(decimal*, f64); +void __num2dec(const decform*, f64, decimal*); +f64 __dec2num(const decimal*); */ + +#endif \ No newline at end of file diff --git a/include/MSL_C/MSL_Common/Src/arith.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h similarity index 67% rename from include/MSL_C/MSL_Common/Src/arith.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h index dd92a0bb03..f1d0bd6d8d 100644 --- a/include/MSL_C/MSL_Common/Src/arith.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h @@ -1,5 +1,5 @@ -#ifndef MSL_COMMON_SRC_ARITH_H -#define MSL_COMMON_SRC_ARITH_H +#ifndef _MSL_COMMON_ARITH_H +#define _MSL_COMMON_ARITH_H #ifdef __cplusplus extern "C" { @@ -16,4 +16,4 @@ div_t div(int numerator, int denominator); } #endif -#endif /* MSL_COMMON_SRC_ARITH_H */ +#endif /* _MSL_COMMON_ARITH_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h new file mode 100644 index 0000000000..07fcf209e4 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h @@ -0,0 +1,11 @@ +#ifndef _MSL_COMMON_BUFFER_IO_H +#define _MSL_COMMON_BUFFER_IO_H + +#include "ansi_files.h" + +enum { __align_buffer, __dont_align_buffer }; + +void __prep_buffer(FILE* file); +int __flush_buffer(FILE* file, size_t* bytes_flushed); + +#endif /* _MSL_COMMON_BUFFER_IO_H */ diff --git a/include/MSL_C/MSL_Common/Src/char_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h similarity index 50% rename from include/MSL_C/MSL_Common/Src/char_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h index 47f7ac4ed3..a21f2e1bb5 100644 --- a/include/MSL_C/MSL_Common/Src/char_io.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h @@ -1,7 +1,7 @@ -#ifndef MSL_COMMON_SRC_CHAR_IO_H -#define MSL_COMMON_SRC_CHAR_IO_H +#ifndef _MSL_COMMON_CHAR_IO_H +#define _MSL_COMMON_CHAR_IO_H -#include "MSL_C/MSL_Common/Src/ansi_files.h" +#include "ansi_files.h" #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ int __put_char(int c, FILE* stream); } #endif -#endif /* MSL_COMMON_SRC_CHAR_IO_H */ +#endif /* _MSL_COMMON_CHAR_IO_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h new file mode 100644 index 0000000000..a36c75d6c7 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h @@ -0,0 +1,30 @@ +#ifndef _MSL_COMMON_CRITICAL_REGIONS_H +#define _MSL_COMMON_CRITICAL_REGIONS_H + +#ifdef __cplusplus +extern "C" { +#endif + +enum critical_regions { + atexit_funcs_access, + malloc_pool_access, + stdin_access, + stdout_access, + stderr_access, + files_access, + console_status_access, + signal_funcs_access, + thread_access, + num_critical_regions +}; + +void __init_critical_regions(void); +void __kill_critical_regions(void); +void __begin_critical_region(int region); +void __end_critical_region(int region); + +#ifdef __cplusplus +} +#endif + +#endif \ No newline at end of file diff --git a/include/MSL_C/MSL_Common/Src/ctype.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h similarity index 50% rename from include/MSL_C/MSL_Common/Src/ctype.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h index 86290cf26f..067a24b2f0 100644 --- a/include/MSL_C/MSL_Common/Src/ctype.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h @@ -1,5 +1,5 @@ -#ifndef MSL_COMMON_SRC_CTYPE_H -#define MSL_COMMON_SRC_CTYPE_H +#ifndef _MSL_COMMON_CTYPE_H +#define _MSL_COMMON_CTYPE_H #ifdef __cplusplus extern "C" { @@ -30,8 +30,17 @@ extern unsigned char __upper_map[]; int tolower(int); +inline int isalpha(int c) { return (int)(__ctype_map[(unsigned char)c] & __letter); } +inline int isdigit(int c) { return (int)(__ctype_map[(unsigned char)c] & __digit); } +inline int isspace(int c) { return (int)(__ctype_map[(unsigned char)c] & __whitespace); } +inline int isupper(int c) { return (int)(__ctype_map[(unsigned char)c] & __upper_case); } +inline int isxdigit(int c) { return (int)(__ctype_map[(unsigned char)c] & __hex_digit); } +// added underscore to avoid naming conflicts +inline int _tolower(int c) { return (c == -1 ? -1 : (int)__lower_map[(unsigned char)c]); } +inline int toupper(int c) { return (c == -1 ? -1 : (int)__upper_map[(unsigned char)c]); } + #ifdef __cplusplus } #endif -#endif /* MSL_COMMON_SRC_CTYPE_H */ +#endif /* _MSL_COMMON_CTYPE_H */ diff --git a/include/MSL_C/MSL_Common/Src/direct_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h similarity index 59% rename from include/MSL_C/MSL_Common/Src/direct_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h index a15d4ee902..c16943b430 100644 --- a/include/MSL_C/MSL_Common/Src/direct_io.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h @@ -1,7 +1,7 @@ -#ifndef MSL_COMMON_SRC_DIRECT_IO_H -#define MSL_COMMON_SRC_DIRECT_IO_H +#ifndef _MSL_COMMON_DIRECT_IO_H +#define _MSL_COMMON_DIRECT_IO_H -#include "MSL_C/MSL_Common/Src/ansi_files.h" +#include "ansi_files.h" #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream); } #endif -#endif /* MSL_COMMON_SRC_DIRECT_IO_H */ +#endif /* _MSL_COMMON_DIRECT_IO_H */ diff --git a/include/MSL_C/MSL_Common/Src/extras.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h similarity index 63% rename from include/MSL_C/MSL_Common/Src/extras.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h index 2b89fc3fec..4d8e8b62ec 100644 --- a/include/MSL_C/MSL_Common/Src/extras.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h @@ -1,5 +1,5 @@ -#ifndef MSL_COMMON_SRC_EXTRAS_H -#define MSL_COMMON_SRC_EXTRAS_H +#ifndef _MSL_COMMON_EXTRAS_H +#define _MSL_COMMON_EXTRAS_H #ifdef __cplusplus extern "C" { @@ -12,4 +12,4 @@ int stricmp(const char* str1, const char* str2); } #endif -#endif /* MSL_COMMON_SRC_EXTRAS_H */ +#endif /* _MSL_COMMON_EXTRAS_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h new file mode 100644 index 0000000000..a6cc390b4b --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h @@ -0,0 +1,18 @@ +#ifndef _MSL_COMMON_FILE_IO_H +#define _MSL_COMMON_FILE_IO_H + +#include "ansi_files.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int __msl_strnicmp(const char* str1, const char* str2, int n); +int fflush(FILE* file); +int fclose(FILE* file); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_FILE_IO_H */ diff --git a/include/MSL_C/MSL_Common/Src/float.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h similarity index 68% rename from include/MSL_C/MSL_Common/Src/float.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index b772054568..10fab57c01 100644 --- a/include/MSL_C/MSL_Common/Src/float.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -1,5 +1,5 @@ -#ifndef MSL_COMMON_SRC_FLOAT_H -#define MSL_COMMON_SRC_FLOAT_H +#ifndef _MSL_COMMON_FLOAT_H +#define _MSL_COMMON_FLOAT_H #include "fdlibm.h" @@ -16,10 +16,10 @@ #define signbit(x) ((sizeof(x) == sizeof(float)) ? __signbitf(x) : __signbitd(x)) #define isfinite(x) ((fpclassify(x) > 2)) -#define __signbitf(x) ((*(unsigned char*)&(x)) & 0x80) +#define __signbitf(x) ((int)(__HI(x) & 0x80000000)) // TODO: OK? -#define __signbitd(x) ((*(unsigned char*)&(x)) & 0x80) +#define __signbitd(x) ((int)(__HI(x) & 0x80000000)) extern unsigned long __float_nan[]; extern unsigned long __float_huge[]; @@ -66,4 +66,21 @@ inline int __fpclassifyd(double __value) { return FP_NORMAL; } -#endif /* MSL_COMMON_SRC_FLOAT_H */ +#define FLT_MANT_DIG 24 +#define FLT_DIG 6 +#define FLT_MIN_EXP (-125) +#define FLT_MIN_10_EXP (-37) +#define FLT_MAX_EXP 128 +#define FLT_MAX_10_EXP 38 + +#define FLT_MAX (*(float*) __float_max) +#define FLT_EPSILON (*(float*) __float_epsilon) + +#define DBL_MANT_DIG 53 +#define DBL_DIG 15 +#define DBL_MIN_EXP (-1021) +#define DBL_MIN_10_EXP (-308) +#define DBL_MAX_EXP 1024 +#define DBL_MAX_10_EXP 308 + +#endif /* _MSL_COMMON_FLOAT_H */ diff --git a/include/MSL_C/MSL_Common/Src/limits b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h similarity index 70% rename from include/MSL_C/MSL_Common/Src/limits rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h index 579f600dd4..55110c724c 100644 --- a/include/MSL_C/MSL_Common/Src/limits +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h @@ -1,6 +1,38 @@ #ifndef _STD_LIMITS_H #define _STD_LIMITS_H +#ifdef __cplusplus +extern "C" { +#endif + +#define CHAR_BIT 8 + +#define SCHAR_MIN (-0x7F - 1) +#define SCHAR_MAX 0x7F +#define UCHAR_MAX 0xFF + +#define CHAR_MIN 0 +#define CHAR_MAX SCHAR_MAX + +#define SHRT_MIN (-0x7FFF - 1) +#define SHRT_MAX 0x7FFF +#define USHRT_MAX 0xFFFF + +#define INT_MIN (-0x7FFFFFFF - 1) +#define INT_MAX 0x7FFFFFFF +#define UINT_MAX 0xFFFFFFFF + +#define LONG_MIN (-0x7FFFFFFFL - 1) +#define LONG_MAX 0x7FFFFFFFL +#define ULONG_MAX 0xFFFFFFFFUL + +#define LLONG_MIN (-0x7FFFFFFFFFFFFFFFLL - 1) +#define LLONG_MAX 0x7FFFFFFFFFFFFFFFLL +#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL + +#ifdef __cplusplus +} + namespace std { template class numeric_limits { @@ -66,5 +98,5 @@ public: }; } // namespace std - +#endif #endif \ No newline at end of file diff --git a/include/MSL_C/math.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h similarity index 97% rename from include/MSL_C/math.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h index 51a9bf8f95..ca4310d273 100644 --- a/include/MSL_C/math.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h @@ -1,7 +1,7 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include "MSL_C/MSL_Common/Src/float.h" +#include "float.h" #define NAN (*(float*) __float_nan) #define HUGE_VALF (*(float*) __float_huge) diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h new file mode 100644 index 0000000000..945748b134 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h @@ -0,0 +1,16 @@ +#ifndef _MSL_COMMON_MBSTRING_H +#define _MSL_COMMON_MBSTRING_H + +#include "wchar_io.h" + +#ifdef __cplusplus +extern "C" { +#endif + +size_t wcstombs(char* dst, const wchar_t* src, size_t n); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_MBSTRING_H */ diff --git a/include/MSL_C/MSL_Common/Src/mem_funcs.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h similarity index 69% rename from include/MSL_C/MSL_Common/Src/mem_funcs.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h index a5c9110716..0e2454660d 100644 --- a/include/MSL_C/MSL_Common/Src/mem_funcs.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h @@ -1,7 +1,7 @@ -#ifndef MSL_COMMON_SRC_MEM_FUNCS_H -#define MSL_COMMON_SRC_MEM_FUNCS_H +#ifndef _MSL_COMMON_MEM_FUNCS_H +#define _MSL_COMMON_MEM_FUNCS_H -#include "MSL_C/MSL_Common/Src/stddef.h" +#include "stddef.h" #ifdef __cplusplus extern "C" { @@ -16,4 +16,4 @@ void __copy_longs_aligned(void* dst, const void* src, size_t n); } #endif -#endif /* MSL_COMMON_SRC_MEM_FUNCS_H */ +#endif /* _MSL_COMMON_MEM_FUNCS_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h new file mode 100644 index 0000000000..715f282a18 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h @@ -0,0 +1,14 @@ +#ifndef _MSL_COMMON_MISC_IO_H +#define _MSL_COMMON_MISC_IO_H + +#ifdef __cplusplus +extern "C" { +#endif + +void __stdio_atexit(void); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_MISC_IO_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h new file mode 100644 index 0000000000..2adaa7d02e --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h @@ -0,0 +1,22 @@ +#ifndef _MSL_COMMON_PRINTF_H +#define _MSL_COMMON_PRINTF_H + +#include "ansi_files.h" +#include "__va_arg.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int fprintf(FILE* stream, const char* format, ...); +int printf(const char* format, ...); +int sprintf(char* s, const char* format, ...); +int snprintf(char* s, size_t n, const char* format, ...); +int vsnprintf(char* s, size_t n, const char* format, va_list arg); +int vprintf(const char* format, va_list arg); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_PRINTF_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h new file mode 100644 index 0000000000..ca142dc1c8 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h @@ -0,0 +1,43 @@ +#ifndef _MSL_COMMON_SCANF_H +#define _MSL_COMMON_SCANF_H + +#include "stddef.h" +#include "ansi_files.h" + +#ifdef __cplusplus +extern "C" { +#endif + +enum __ReadProcActions { __GetAChar, __UngetAChar, __TestForError }; + +enum __WReadProcActions { __GetAwChar, __UngetAwChar, __TestForwcsError }; + +typedef struct { + char* CharStr; + size_t MaxCharCount; + size_t CharsWritten; +} __OutStrCtrl; + +typedef struct { + char* NextChar; + int NullCharDetected; +} __InStrCtrl; + +typedef struct { + wchar_t* wCharStr; + size_t MaxCharCount; + size_t CharsWritten; +} __wOutStrCtrl; + +typedef struct { + wchar_t* wNextChar; + int wNullCharDetected; +} __wInStrCtrl; + +int __StringRead(void* str, int ch, int behavior); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_SCANF_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h new file mode 100644 index 0000000000..58fc22abb2 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h @@ -0,0 +1,16 @@ +#ifndef _MSL_COMMON_SIGNAL_H +#define _MSL_COMMON_SIGNAL_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void (*__signal_func_ptr)(int); + +int raise(int sig); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_SIGNAL_H */ diff --git a/include/MSL_C/MSL_Common/Src/stddef.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h similarity index 81% rename from include/MSL_C/MSL_Common/Src/stddef.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h index 7d93b65045..dacf399772 100644 --- a/include/MSL_C/MSL_Common/Src/stddef.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h @@ -13,12 +13,14 @@ typedef unsigned long size_t; typedef long ptrdiff_t; #endif +#define offsetof(type, member) ((size_t)&(((type*)0)->member)) + #ifndef NULL #define NULL (0) #endif #ifdef __cplusplus -} +}; #endif #endif \ No newline at end of file diff --git a/include/MSL_C/stdio.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h similarity index 54% rename from include/MSL_C/stdio.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h index 7c4ff318ef..e8f88ac8f6 100644 --- a/include/MSL_C/stdio.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h @@ -1,9 +1,10 @@ #ifndef MSL_STDIO_H_ #define MSL_STDIO_H_ -#include "MSL_C/MSL_Common/Src/char_io.h" -#include "MSL_C/MSL_Common/Src/file_io.h" -#include "MSL_C/MSL_Common/Src/printf.h" +#include "char_io.h" +#include "file_io.h" +#include "printf.h" +#include "extras.h" #define stdin (&__files._stdin) #define stdout (&__files._stdout) diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h new file mode 100644 index 0000000000..2ce2e5c803 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h @@ -0,0 +1,9 @@ +#ifndef MSL_STDLIB_H_ +#define MSL_STDLIB_H_ + +#include "abort_exit.h" +#include "arith.h" +#include "mbstring.h" +#include "strtoul.h" + +#endif diff --git a/include/MSL_C/MSL_Common/Src/string.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h similarity index 59% rename from include/MSL_C/MSL_Common/Src/string.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h index 8a0a3f97ba..ba90802ad1 100644 --- a/include/MSL_C/MSL_Common/Src/string.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h @@ -1,7 +1,8 @@ -#ifndef MSL_COMMON_SRC_STRING_H -#define MSL_COMMON_SRC_STRING_H +#ifndef _MSL_COMMON_STRING_H +#define _MSL_COMMON_STRING_H -#include "MSL_C/MSL_Common/Src/stddef.h" +#include "stddef.h" +#include "extras.h" #ifdef __cplusplus extern "C" { @@ -9,7 +10,10 @@ extern "C" { void* memcpy(void* dst, const void* src, size_t n); void* memset(void* dst, int val, size_t n); - +int memcmp(const void* lhs, const void* rhs, size_t count); +void* __memrchr(const void* ptr, int ch, size_t count); +void* memchr(const void* ptr, int ch, size_t count); +void* memmove(void* dst, const void* src, size_t n); char* strrchr(const char* str, int c); char* strchr(const char* str, int c); int strncmp(const char* str1, const char* str2, size_t n); @@ -23,4 +27,4 @@ size_t strlen(const char* str); } #endif -#endif /* MSL_COMMON_SRC_STRING_H */ +#endif /* _MSL_COMMON_STRING_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h new file mode 100644 index 0000000000..c10340bf1e --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h @@ -0,0 +1,17 @@ +#ifndef _MSL_COMMON_STRTOUL_H +#define _MSL_COMMON_STRTOUL_H + +#ifdef __cplusplus +extern "C" { +#endif + +long strtol(const char* str, char** end, int base); +unsigned long strtoul(const char* str, char** end, int base); +unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative, + int* overflow); + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_STRTOUL_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h new file mode 100644 index 0000000000..711bb395b6 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h @@ -0,0 +1,12 @@ +#ifndef _MSL_COMMON_WCHAR_IO_H +#define _MSL_COMMON_WCHAR_IO_H + +#include "ansi_files.h" + +#ifndef __cplusplus +typedef unsigned short wchar_t; +#endif + +int fwide(FILE* file, int mode); + +#endif /* _MSL_COMMON_WCHAR_IO_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c new file mode 100644 index 0000000000..06c1eba037 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c @@ -0,0 +1,148 @@ +#include "FILE_POS.h" +#include "buffer_io.h" +#include "critical_regions.h" +#include "errno.h" + +/* 80365E90-80365F74 3607D0 00E4+00 0/0 2/2 0/0 .text ftell */ +long ftell(FILE* stream) { + int retval; + + __begin_critical_region(stdin_access); + retval = (long)_ftell(stream); + __end_critical_region(stdin_access); + return retval; +} + +int _ftell(FILE* file) { + int charsInUndoBuffer = 0; + int position; + + unsigned char tmp_kind = file->file_mode.file_kind; + if (!(tmp_kind == __disk_file || tmp_kind == __console_file) || file->file_state.error) { + errno = 0x28; + return -1; + } + + if (file->file_state.io_state == __neutral) + return (file->position); + + position = file->buffer_position + (file->buffer_ptr - file->buffer); + + if (file->file_state.io_state >= __rereading) { + charsInUndoBuffer = file->file_state.io_state - __rereading + 1; + position -= charsInUndoBuffer; + } + + if (!file->file_mode.binary_io) { + int n = file->buffer_ptr - file->buffer - charsInUndoBuffer; + unsigned char* p = (unsigned char*)file->buffer; + + while (n--) + if (*p++ == '\n') + position++; + } + + return (position); +} + +/* 80365C20-80365E90 360560 0270+00 1/1 0/0 0/0 .text _fseek */ +int _fseek(FILE* file, unsigned long offset, int whence) { + int bufferCode; + int pos; + int adjust; + unsigned long state; + int buffLen; + + unsigned char* ptr; + + if (file->file_mode.file_kind != 1 || file->file_state.error != 0) { + errno = 0x28; + return -1; + } + + if (file->file_state.io_state == 1) { + if (__flush_buffer(file, NULL) != 0) { + file->file_state.error = 1; + file->buffer_length = 0; + errno = 0x28; + return -1; + } + } + + if (whence == SEEK_CUR) { + whence = SEEK_SET; + adjust = 0; + if ((file->file_mode.file_kind != 1 && file->file_mode.file_kind != 2) || + file->file_state.error != 0) + { + errno = 0x28; + pos = -1; + } else { + state = file->file_state.io_state; + if (state == 0) { + pos = file->position; + } else { + pos = file->buffer_position; + ptr = file->buffer; + buffLen = (file->buffer_ptr - ptr); + pos += buffLen; + if ((state >= 3)) { + adjust = (state - 2); + pos -= adjust; + } + + if (file->file_mode.binary_io == 0) { + int i; + for (i = (buffLen - adjust); i != 0; i--) { + unsigned char c = *ptr; + ptr++; + if (c == 10) { + pos++; + } + } + } + } + } + offset += pos; + } + + if ((whence != SEEK_END) && (file->file_mode.io_mode != 3) && + (file->file_state.io_state == 2 || file->file_state.io_state == 3)) + { + if ((offset >= file->position) || !(offset >= file->buffer_position)) { + file->file_state.io_state = 0; + } else { + file->buffer_ptr = file->buffer + (offset - file->buffer_position); + file->buffer_length = file->position - offset; + file->file_state.io_state = 2; + } + } else { + file->file_state.io_state = 0; + } + + if (file->file_state.io_state == 0) { + if (file->position_fn != NULL && + (int)file->position_fn(file->handle, &offset, whence, file->idle_fn)) + { + file->file_state.error = 1; + file->buffer_length = 0; + errno = 0x28; + return -1; + } else { + file->file_state.eof = 0; + file->position = offset; + file->buffer_length = 0; + } + } + + return 0; +} + +/* 80365BB4-80365C20 3604F4 006C+00 0/0 2/2 0/0 .text fseek */ +int fseek(FILE* stream, unsigned long offset, int whence) { + int code; + __begin_critical_region(stdin_access); + code = _fseek(stream, offset, whence); // 0 if successful, -1 if error + __end_critical_region(stdin_access); + return code; +} diff --git a/libs/MSL_C/MSL_Common/Src/abort_exit.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c similarity index 66% rename from libs/MSL_C/MSL_Common/Src/abort_exit.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c index 9ce38184b1..78b93e9ae2 100644 --- a/libs/MSL_C/MSL_Common/Src/abort_exit.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c @@ -1,28 +1,12 @@ -#include "MSL_C/MSL_Common/Src/abort_exit.h" -#include "MSL_C/MSL_Common/Src/stddef.h" +#include "abort_exit.h" +#include "critical_regions.h" +#include "stddef.h" -extern unsigned char data_804519A0[8]; - -// -// External References: -// - -void _ExitProcess(); -void __destroy_global_chain(); -void __end_critical_region(); -void __begin_critical_region(); -void __kill_critical_regions(); extern void (*__destroy_global_chain_reference[])(void); -/* ############################################################################################## */ /* 8044D440-8044D540 07A160 0100+00 2/2 0/0 0/0 .bss __atexit_funcs */ static void (*__atexit_funcs[64])(void); -/* ############################################################################################## */ -/* 804519A0-804519A8 000EA0 0008+00 0/0 1/1 0/0 .sbss None */ -extern unsigned char data_804519A0[8]; -unsigned char data_804519A0[8]; - /* 8045199C-804519A0 000E9C 0004+00 2/2 0/0 0/0 .sbss __console_exit */ static void (*__console_exit)(void); @@ -39,12 +23,12 @@ static int __aborting; void abort(void) { raise(1); __aborting = 1; - __begin_critical_region(0); + __begin_critical_region(atexit_funcs_access); while (__atexit_curr_func > 0) __atexit_funcs[--__atexit_curr_func](); - __end_critical_region(0); + __end_critical_region(atexit_funcs_access); __kill_critical_regions(); if (__console_exit != NULL) { @@ -61,8 +45,8 @@ void exit(int status) { void (**dtor)(void); if (!__aborting) { - __begin_critical_region(0); - __end_critical_region(0); + __begin_critical_region(atexit_funcs_access); + __end_critical_region(atexit_funcs_access); __destroy_global_chain(); dtor = __destroy_global_chain_reference; @@ -77,11 +61,11 @@ void exit(int status) { } } - __begin_critical_region(0); + __begin_critical_region(atexit_funcs_access); while (__atexit_curr_func > 0) __atexit_funcs[--__atexit_curr_func](); - __end_critical_region(0); + __end_critical_region(atexit_funcs_access); __kill_critical_regions(); if (__console_exit != NULL) { diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c new file mode 100644 index 0000000000..27eeed7cf9 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -0,0 +1,335 @@ +#include "alloc.h" +#include "critical_regions.h" +#include "string.h" + +typedef struct Block { + struct Block* prev; + struct Block* next; + unsigned long max_size; + unsigned long size; +} Block; + +typedef struct SubBlock { + unsigned long size; + Block* block; + struct SubBlock* prev; + struct SubBlock* next; +} SubBlock; + +struct FixSubBlock; + +typedef struct FixBlock { + struct FixBlock* prev_; + struct FixBlock* next_; + unsigned long client_size_; + struct FixSubBlock* start_; + unsigned long n_allocated_; +} FixBlock; + +typedef struct FixSubBlock { + FixBlock* block_; + struct FixSubBlock* next_; +} FixSubBlock; + +typedef struct FixStart { + FixBlock* tail_; + FixBlock* head_; +} FixStart; + +typedef struct __mem_pool_obj { + Block* start_; + FixStart fix_start[6]; +} __mem_pool_obj; + +typedef struct __mem_pool { + void* reserved[14]; +} __mem_pool; + +typedef long tag_word; + +typedef struct block_header { + tag_word tag; + struct block_header* prev; + struct block_header* next; +} block_header; + +typedef struct list_header { + block_header* rover; + block_header header; +} list_header; + +typedef struct heap_header { + struct heap_header* prev; + struct heap_header* next; +} heap_header; + +struct mem_pool_obj; +typedef void* (*sys_alloc_ptr)(unsigned long, struct mem_pool_obj*); +typedef void (*sys_free_ptr)(void*, struct mem_pool_obj*); + +typedef struct pool_options { + sys_alloc_ptr sys_alloc_func; + sys_free_ptr sys_free_func; + unsigned long min_heap_size; + int always_search_first; +} pool_options; + +typedef struct mem_pool_obj { + list_header free_list; + pool_options options; + heap_header* heap_list; + void* userData; + +} mem_pool_obj; + +mem_pool_obj __malloc_pool; +static int initialized = 0; + +static SubBlock* SubBlock_merge_prev(SubBlock*, SubBlock**); +static void SubBlock_merge_next(SubBlock*, SubBlock**); + +static const unsigned long fix_pool_sizes[] = {4, 12, 20, 36, 52, 68}; + +#define SubBlock_size(ths) ((ths)->size & 0xFFFFFFF8) +#define SubBlock_block(ths) ((Block*)((unsigned long)((ths)->block) & ~0x1)) +#define Block_size(ths) ((ths)->size & 0xFFFFFFF8) +#define Block_start(ths) (*(SubBlock**)((char*)(ths) + Block_size((ths)) - sizeof(unsigned long))) + +#define SubBlock_set_free(ths) \ + unsigned long this_size = SubBlock_size((ths)); \ + (ths)->size &= ~0x2; \ + *(unsigned long*)((char*)(ths) + this_size) &= ~0x4; \ + *(unsigned long*)((char*)(ths) + this_size - sizeof(unsigned long)) = this_size + +#define SubBlock_is_free(ths) !((ths)->size & 2) +#define SubBlock_set_size(ths, sz) \ + (ths)->size &= ~0xFFFFFFF8; \ + (ths)->size |= (sz) & 0xFFFFFFF8; \ + if (SubBlock_is_free((ths))) \ + *(unsigned long*)((char*)(ths) + (sz) - sizeof(unsigned long)) = (sz) + +#define SubBlock_from_pointer(ptr) ((SubBlock*)((char*)(ptr)-8)) +#define FixSubBlock_from_pointer(ptr) ((FixSubBlock*)((char*)(ptr)-4)) + +#define FixBlock_client_size(ths) ((ths)->client_size_) +#define FixSubBlock_size(ths) (FixBlock_client_size((ths)->block_)) + +#define classify(ptr) (*(unsigned long*)((char*)(ptr) - sizeof(unsigned long)) & 1) +#define __msize_inline(ptr) \ + (!classify(ptr) ? FixSubBlock_size(FixSubBlock_from_pointer(ptr)) : \ + SubBlock_size(SubBlock_from_pointer(ptr)) - 8) + +#define Block_empty(ths) \ + (_sb = (SubBlock*)((char*)(ths) + 16)), \ + SubBlock_is_free(_sb) && SubBlock_size(_sb) == Block_size((ths)) - 24 + +void __sys_free(); + +static inline SubBlock* SubBlock_merge_prev(SubBlock* ths, SubBlock** start) { + unsigned long prevsz; + SubBlock* p; + + if (!(ths->size & 0x04)) { + prevsz = *(unsigned long*)((char*)ths - sizeof(unsigned long)); + if (prevsz & 0x2) + return ths; + p = (SubBlock*)((char*)ths - prevsz); + SubBlock_set_size(p, prevsz + SubBlock_size(ths)); + + if (*start == ths) + *start = (*start)->next; + ths->next->prev = ths->prev; + ths->next->prev->next = ths->next; + return p; + } + return ths; +} + +static inline void SubBlock_merge_next(SubBlock* pBlock, SubBlock** pStart) { + SubBlock* next_sub_block; + unsigned long this_cur_size; + + next_sub_block = (SubBlock*)((char*)pBlock + (pBlock->size & 0xFFFFFFF8)); + + if (!(next_sub_block->size & 2)) { + this_cur_size = (pBlock->size & 0xFFFFFFF8) + (next_sub_block->size & 0xFFFFFFF8); + + pBlock->size &= ~0xFFFFFFF8; + pBlock->size |= this_cur_size & 0xFFFFFFF8; + + if (!(pBlock->size & 2)) { + *(unsigned long*)((char*)(pBlock) + (this_cur_size)-4) = (this_cur_size); + } + + if (!(pBlock->size & 2)) { + *(unsigned long*)((char*)pBlock + this_cur_size) &= ~4; + } else { + *(unsigned long*)((char*)pBlock + this_cur_size) |= 4; + } + + if (*pStart == next_sub_block) { + *pStart = (*pStart)->next; + } + + if (*pStart == next_sub_block) { + *pStart = 0; + } + + next_sub_block->next->prev = next_sub_block->prev; + next_sub_block->prev->next = next_sub_block->next; + } +} + +inline void Block_link(Block* ths, SubBlock* sb) { + SubBlock** st; + SubBlock_set_free(sb); + st = &Block_start(ths); + + if (*st != 0) { + sb->prev = (*st)->prev; + sb->prev->next = sb; + sb->next = *st; + (*st)->prev = sb; + *st = sb; + *st = SubBlock_merge_prev(*st, st); + SubBlock_merge_next(*st, st); + } else { + *st = sb; + sb->prev = sb; + sb->next = sb; + } + if (ths->max_size < SubBlock_size(*st)) + ths->max_size = SubBlock_size(*st); +} + +static inline Block* __unlink(__mem_pool_obj* pool_obj, Block* bp) { + Block* result = bp->next; + if (result == bp) { + result = 0; + } + + if (pool_obj->start_ == bp) { + pool_obj->start_ = result; + } + + if (result != 0) { + result->prev = bp->prev; + result->prev->next = result; + } + + bp->next = 0; + bp->prev = 0; + return result; +} + +/* 80362D78-8036300C 35D6B8 0294+00 2/2 0/0 0/0 .text deallocate_from_var_pools */ +static void deallocate_from_var_pools(__mem_pool_obj* pool_obj, void* ptr) { + SubBlock* sb = SubBlock_from_pointer(ptr); + SubBlock* _sb; + + Block* bp = SubBlock_block(sb); + Block_link(bp, sb); + + if (Block_empty(bp)) { + __unlink(pool_obj, bp); + __sys_free(bp); + } +} + +inline void __init_pool_obj(__mem_pool* pool_obj) { + memset(pool_obj, 0, sizeof(__mem_pool_obj)); +} + +static inline __mem_pool* get_malloc_pool(void) { + static __mem_pool protopool; + static unsigned char init = 0; + if (!init) { + __init_pool_obj(&protopool); + init = 1; + } + + return &protopool; +} + +/* 80362C20-80362D78 35D560 0158+00 1/1 0/0 0/0 .text deallocate_from_fixed_pools */ +void deallocate_from_fixed_pools(__mem_pool_obj* pool_obj, void* ptr, unsigned long size) { + unsigned long i = 0; + FixSubBlock* p; + FixBlock* b; + FixStart* fs; + + while (size > fix_pool_sizes[i]) { + ++i; + } + + fs = &pool_obj->fix_start[i]; + p = FixSubBlock_from_pointer(ptr); + b = p->block_; + + if (b->start_ == 0 && fs->head_ != b) { + if (fs->tail_ == b) { + fs->head_ = fs->head_->prev_; + fs->tail_ = fs->tail_->prev_; + } else { + b->prev_->next_ = b->next_; + b->next_->prev_ = b->prev_; + b->next_ = fs->head_; + b->prev_ = b->next_->prev_; + b->prev_->next_ = b; + b->next_->prev_ = b; + fs->head_ = b; + } + } + + p->next_ = b->start_; + b->start_ = p; + + if (--b->n_allocated_ == 0) { + if (fs->head_ == b) { + fs->head_ = b->next_; + } + + if (fs->tail_ == b) { + fs->tail_ = b->prev_; + } + + b->prev_->next_ = b->next_; + b->next_->prev_ = b->prev_; + + if (fs->head_ == b) { + fs->head_ = 0; + } + + if (fs->tail_ == b) { + fs->tail_ = 0; + } + + deallocate_from_var_pools(pool_obj, b); + } +} + +/* 80362BC8-80362C20 35D508 0058+00 1/1 0/0 0/0 .text __pool_free */ +void __pool_free(__mem_pool* pool, void* ptr) { + __mem_pool_obj* pool_obj; + unsigned long size; + + if (ptr == 0) { + return; + } + + pool_obj = (__mem_pool_obj*)pool; + size = __msize_inline(ptr); + + if (size <= 68) { + deallocate_from_fixed_pools(pool_obj, ptr, size); + } else { + deallocate_from_var_pools(pool_obj, ptr); + } +} + +/* 80362B58-80362BC8 35D498 0070+00 0/0 2/2 0/0 .text free */ +void free(void* ptr) { + __begin_critical_region(malloc_pool_access); + __pool_free(get_malloc_pool(), ptr); + __end_critical_region(malloc_pool_access); +} diff --git a/libs/MSL_C/MSL_Common/Src/ansi_files.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c similarity index 88% rename from libs/MSL_C/MSL_Common/Src/ansi_files.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c index 5bce73d129..94571b4ba2 100644 --- a/libs/MSL_C/MSL_Common/Src/ansi_files.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c @@ -1,10 +1,7 @@ -#include "MSL_C/MSL_Common/Src/ansi_files.h" -#include "MSL_C/MSL_Common/Src/file_io.h" +#include "ansi_files.h" +#include "file_io.h" +#include "critical_regions.h" -void __end_critical_region(int); -void __begin_critical_region(int); - -/* ############################################################################################## */ /* 8044D778-8044D878 07A498 0100+00 1/0 0/0 0/0 .bss stdin_buff */ static unsigned char stdin_buff[0x100]; @@ -123,7 +120,7 @@ void __close_all(void) { FILE* file = &__files._stdin; FILE* last_file; - __begin_critical_region(2); + __begin_critical_region(stdin_access); while (file != NULL) { if (file->file_mode.file_kind != __closed_file) { @@ -143,7 +140,7 @@ void __close_all(void) { } } - __end_critical_region(2); + __end_critical_region(stdin_access); } /* 8036300C-8036307C 35D94C 0070+00 0/0 2/2 0/0 .text __flush_all */ @@ -152,7 +149,7 @@ unsigned int __flush_all(void) { FILE* file = &__files._stdin; while (file) { - if (file->file_mode.file_kind != 0 && fflush(file)) { + if (file->file_mode.file_kind != __closed_file && fflush(file)) { ret = -1; } file = file->next_file; diff --git a/libs/MSL_C/MSL_Common/Src/arith.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c similarity index 66% rename from libs/MSL_C/MSL_Common/Src/arith.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c index 1ed1cc596e..6978f06b5d 100644 --- a/libs/MSL_C/MSL_Common/Src/arith.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c @@ -1,8 +1,14 @@ -#include "MSL_C/MSL_Common/Src/arith.h" +#include "arith.h" + +/* 803650D0-803650E0 35FA10 0010+00 0/0 66/66 225/225 .text abs */ +int abs(int n) { + if (n < 0) + return (-n); + else + return (n); +} /* 80365078-803650D0 35F9B8 0058+00 0/0 1/1 0/0 .text div */ -#ifdef NONMATCHING -// matches but causes function reordering div_t div(int numerator, int denominator) { div_t ret; int i = 1; @@ -22,21 +28,3 @@ div_t div(int numerator, int denominator) { ret.rem = numerator * i - j * (ret.quot * denominator); return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm div_t div(int numerator, int denominator) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/arith/div.s" -} -#pragma pop -#endif - -/* 803650D0-803650E0 35FA10 0010+00 0/0 66/66 225/225 .text abs */ -int abs(int n) { - if (n < 0) - return (-n); - else - return (n); -} diff --git a/libs/MSL_C/MSL_Common/Src/buffer_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c similarity index 96% rename from libs/MSL_C/MSL_Common/Src/buffer_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c index 376ead3b18..cb6de6fc69 100644 --- a/libs/MSL_C/MSL_Common/Src/buffer_io.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/buffer_io.h" +#include "buffer_io.h" void __convert_from_newlines(unsigned char* buf, size_t* n) {} diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c new file mode 100644 index 0000000000..80c35a49f3 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c @@ -0,0 +1,100 @@ +#include "char_io.h" +#include "FILE_POS.h" +#include "buffer_io.h" +#include "critical_regions.h" +#include "misc_io.h" +#include "wchar_io.h" + +/* 803652AC-80365464 35FBEC 01B8+00 1/1 0/0 0/0 .text __put_char */ +int __put_char(int c, FILE* stream) { + int ret; + + int file_kind = stream->file_mode.file_kind; + stream->buffer_length = 0; + + if (stream->file_state.error != 0 || file_kind == __closed_file) { + return -1; + } + + if (file_kind == __console_file) { + __stdio_atexit(); + } + + if (stream->file_state.io_state == __neutral && (stream->file_mode.io_mode & __write)) { + if ((stream->file_mode.io_mode & __append) && fseek(stream, 0, 2) != 0) { + return 0; + } + + stream->file_state.io_state = __writing; + __prep_buffer(stream); + } + + if (stream->file_state.io_state != __writing) { + stream->file_state.error = 1; + ret = -1; + stream->buffer_length = 0; + } else if ((stream->file_mode.buffer_mode == 2 || + stream->buffer_size == + (unsigned int)stream->buffer_ptr - (unsigned int)stream->buffer) && + __flush_buffer(stream, NULL) != 0) + { + stream->file_state.error = 1; + ret = -1; + stream->buffer_length = 0; + } else { + stream->buffer_length--; + *stream->buffer_ptr++ = c; + + if (stream->file_mode.buffer_mode != 2) { + if ((stream->file_mode.buffer_mode == 0 || c == 10) && + __flush_buffer(stream, NULL) != 0) + { + stream->file_state.error = 1; + ret = -1; + stream->buffer_length = 0; + goto exit; + } + stream->buffer_length = 0; + } + + ret = c & 0xFF; + } + +exit: + return ret; +} + +/* 803651D8-803652AC 35FB18 00D4+00 0/0 1/1 0/0 .text fputs */ +int fputs(const char* s, FILE* stream) { + char c; + int var_r3; + unsigned long len; + int ret = 0; + + __begin_critical_region(stdin_access); + while (c = *s++, c != 0) { + if (fwide(stream, -1) >= 0) { + var_r3 = -1; + } else { + len = stream->buffer_length; + stream->buffer_length = len - 1; + + if (len != 0) { + char* buf = (char*)stream->buffer_ptr; + stream->buffer_ptr++; + + *buf = var_r3 = c & 0xFF; + } else { + var_r3 = __put_char(c, stream); + } + } + + if (var_r3 == -1) { + ret = -1; + break; + } + } + __end_critical_region(stdin_access); + + return ret; +} diff --git a/libs/MSL_C/MSL_Common/Src/ctype.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c similarity index 97% rename from libs/MSL_C/MSL_Common/Src/ctype.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c index e3ef04d049..bb8591c05c 100644 --- a/libs/MSL_C/MSL_Common/Src/ctype.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/ctype.h" +#include "ctype.h" #define ctrl __control_char #define motn __motion_char @@ -12,7 +12,6 @@ #define uhex (hexd | uppc) #define lhex (hexd | lowc) -/* ############################################################################################## */ /* 803D2C18-803D2D18 02FD38 0100+00 0/0 3/3 0/0 .data __ctype_map */ unsigned char __ctype_map[256] = { // clang-format off diff --git a/libs/MSL_C/MSL_Common/Src/direct_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c similarity index 90% rename from libs/MSL_C/MSL_Common/Src/direct_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c index d9c61c49c6..ab47acc94e 100644 --- a/libs/MSL_C/MSL_Common/Src/direct_io.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c @@ -1,19 +1,16 @@ -#include "MSL_C/MSL_Common/Src/direct_io.h" -#include "MSL_C/MSL_Common/Src/misc_io.h" -#include "MSL_C/MSL_Common/Src/string.h" -#include "MSL_C/MSL_Common/Src/wchar_io.h" -#include "dol2asm.h" - -void __end_critical_region(); -void __begin_critical_region(); +#include "direct_io.h" +#include "critical_regions.h" +#include "misc_io.h" +#include "string.h" +#include "wchar_io.h" /* 80365494-803657A0 35FDD4 030C+00 1/1 0/0 0/0 .text __fwrite */ size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { size_t retval; - __begin_critical_region(2); + __begin_critical_region(stdin_access); retval = __fwrite(buffer, size, count, stream); - __end_critical_region(2); + __end_critical_region(stdin_access); return (retval); } @@ -85,7 +82,8 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { stream->buffer_length -= num_bytes; } if (!stream->buffer_length || newline != NULL || - (stream->file_mode.buffer_mode == _IONBF)) { + (stream->file_mode.buffer_mode == _IONBF)) + { ioresult = __flush_buffer(stream, NULL); if (ioresult) { diff --git a/libs/MSL_C/MSL_Common/Src/errno.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c similarity index 100% rename from libs/MSL_C/MSL_Common/Src/errno.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c new file mode 100644 index 0000000000..5a24eff006 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c @@ -0,0 +1,28 @@ +#include "extras.h" +#include "ctype.h" +#include "file_io.h" + +/* 8036CA94-8036CB20 3673D4 008C+00 0/0 1/1 0/0 .text stricmp */ +int stricmp(const char* str1, const char* str2) { + char a_var; + char b_var; + + do { + b_var = _tolower(*str1++); + a_var = _tolower(*str2++); + + if (b_var < a_var) { + return -1; + } + if (b_var > a_var) { + return 1; + } + } while (b_var != 0); + + return 0; +} + +/* 8036CA74-8036CA94 3673B4 0020+00 0/0 1/1 0/0 .text strnicmp */ +int strnicmp(const char* str1, const char* str2, int n) { + return __msl_strnicmp(str1, str2, n); +} diff --git a/libs/MSL_C/MSL_Common/Src/file_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c similarity index 63% rename from libs/MSL_C/MSL_Common/Src/file_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c index f726818667..75c8ec671d 100644 --- a/libs/MSL_C/MSL_Common/Src/file_io.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c @@ -1,16 +1,6 @@ -#include "MSL_C/MSL_Common/Src/file_io.h" -#include "MSL_C/MSL_Common/Src/buffer_io.h" -#include "MSL_C/MSL_Common/Src/ctype.h" - -/* 8036581C-803658C0 36015C 00A4+00 0/0 1/1 0/0 .text __msl_strnicmp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int __msl_strnicmp(const char* str1, const char* str2, size_t n) { - nofralloc -#include "asm/MSL_C/MSL_Common/Src/file_io/__msl_strnicmp.s" -} -#pragma pop +#include "file_io.h" +#include "buffer_io.h" +#include "ctype.h" /* 803659F8-80365BB4 360338 01BC+00 0/0 1/1 0/0 .text fclose */ int fclose(FILE* file) { @@ -45,20 +35,20 @@ int fflush(FILE* file) { return -1; } - if (file->file_mode.io_mode == 1) { + if (file->file_mode.io_mode == __read) { return 0; } - if (file->file_state.io_state >= 3) { - file->file_state.io_state = 2; + if (file->file_state.io_state >= __rereading) { + file->file_state.io_state = __reading; } - if (file->file_state.io_state == 2) { + if (file->file_state.io_state == __reading) { file->buffer_length = 0; } - if (file->file_state.io_state != 1) { - file->file_state.io_state = 0; + if (file->file_state.io_state != __writing) { + file->file_state.io_state = __neutral; return 0; } @@ -74,8 +64,33 @@ int fflush(FILE* file) { return -1; } - file->file_state.io_state = 0; + file->file_state.io_state = __neutral; file->position = pos; file->buffer_length = 0; return 0; } + +/* 8036581C-803658C0 36015C 00A4+00 0/0 1/1 0/0 .text __msl_strnicmp */ +int __msl_strnicmp(const char* str1, const char* str2, int n) { + int i; + char c1, c2; + + for (i = 0; i < n; i++) { + c1 = _tolower(*str1++); + c2 = _tolower(*str2++); + + if (c1 < c2) { + return -1; + } + + if (c1 > c2) { + return 1; + } + + if (c1 == '\0') { + return 0; + } + } + + return 0; +} diff --git a/libs/MSL_C/MSL_Common/Src/float.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c similarity index 75% rename from libs/MSL_C/MSL_Common/Src/float.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c index a2ff1ce209..ca80111bc8 100644 --- a/libs/MSL_C/MSL_Common/Src/float.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/float.h" +#include "float.h" /* 80450AE0-80450AE4 000560 0004+00 0/0 204/204 1060/1060 .sdata __float_nan */ unsigned long __float_nan[] = {0x7FFFFFFF}; @@ -11,7 +11,3 @@ unsigned long __float_max[] = {0x7F7FFFFF}; /* 80450AEC-80450AF0 00056C 0004+00 0/0 28/28 0/0 .sdata __float_epsilon */ unsigned long __float_epsilon[] = {0x34000000}; - -/* 80450AF0-80450AF4 000570 0004+00 0/0 1/1 0/0 .sdata None */ -extern float data_80450AF0; -float data_80450AF0 = -0.0f; diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c new file mode 100644 index 0000000000..09c183bfcd --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c @@ -0,0 +1,65 @@ +#include "mbstring.h" +#include "string.h" + +inline static int unicode_to_UTF8(char* s, wchar_t wchar) { + int number_of_bytes; + wchar_t wide_char; + char* target_ptr; + char first_byte_mark[4] = { 0x00, 0x00, 0xc0, 0xe0 }; + + if (!s) + return (0); + + wide_char = wchar; + if (wide_char < 0x0080) + number_of_bytes = 1; + else if (wide_char < 0x0800) + number_of_bytes = 2; + else + number_of_bytes = 3; + + target_ptr = s + number_of_bytes; + + switch (number_of_bytes) { + case 3: + *--target_ptr = (wide_char & 0x003f) | 0x80; + wide_char >>= 6; + case 2: + *--target_ptr = (wide_char & 0x003f) | 0x80; + wide_char >>= 6; + case 1: + *--target_ptr = wide_char | first_byte_mark[number_of_bytes]; + } + + return number_of_bytes; +} + +inline int wctomb(char* s, wchar_t wchar) { return (unicode_to_UTF8(s, wchar)); } + +/* 80365F74-8036608C 3608B4 0118+00 0/0 1/1 0/0 .text wcstombs */ +size_t wcstombs(char* s, const wchar_t* pwcs, size_t n) { + int chars_written = 0; + int result; + char temp[3]; + wchar_t* source; + + if (!s || !pwcs) + return (0); + + source = (wchar_t*)pwcs; + while (chars_written <= n) { + if (!*source) { + *(s + chars_written) = '\0'; + break; + } else { + result = wctomb(temp, *source++); + if ((chars_written + result) <= n) { + strncpy(s + chars_written, temp, result); + chars_written += result; + } else + break; + } + } + + return chars_written; +} diff --git a/libs/MSL_C/MSL_Common/Src/mem.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c similarity index 98% rename from libs/MSL_C/MSL_Common/Src/mem.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c index 5bd78f113a..f055455c7b 100644 --- a/libs/MSL_C/MSL_Common/Src/mem.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/mem.h" +#include "string.h" /* 80366130-803661FC 360A70 00CC+00 0/0 2/2 0/0 .text memmove */ void* memmove(void* dst, const void* src, size_t n) { diff --git a/libs/MSL_C/MSL_Common/Src/mem_funcs.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c similarity index 99% rename from libs/MSL_C/MSL_Common/Src/mem_funcs.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c index 9c737aa420..8880dfca90 100644 --- a/libs/MSL_C/MSL_Common/Src/mem_funcs.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/mem_funcs.h" +#include "mem_funcs.h" #define cps ((unsigned char*)src) #define cpd ((unsigned char*)dst) diff --git a/libs/MSL_C/MSL_Common/Src/misc_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c similarity index 52% rename from libs/MSL_C/MSL_Common/Src/misc_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c index 86cda57b23..e2e6a21b8b 100644 --- a/libs/MSL_C/MSL_Common/Src/misc_io.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c @@ -1,6 +1,6 @@ -#include "MSL_C/MSL_Common/Src/misc_io.h" -#include "MSL_C/MSL_Common/Src/abort_exit.h" -#include "MSL_C/MSL_Common/Src/ansi_files.h" +#include "misc_io.h" +#include "abort_exit.h" +#include "ansi_files.h" /* 803664CC-803664DC 360E0C 0010+00 0/0 2/2 0/0 .text __stdio_atexit */ void __stdio_atexit(void) { diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c new file mode 100644 index 0000000000..19d3d666d1 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -0,0 +1,1267 @@ +#include "printf.h" +#include "ansi_fp.h" +#include "critical_regions.h" +#include "ctype.h" +#include "string.h" +#include "scanf.h" +#include "stdio.h" +#include "stdlib.h" +#include "string.h" +#include "wchar_io.h" + +#define TARGET_FLOAT_BITS 64 +#define TARGET_FLOAT_BYTES (TARGET_FLOAT_BITS / 8) +#define TARGET_FLOAT_MAX_EXP LDBL_MAX_EXP +#define TARGET_FLOAT_MANT_DIG LDBL_MANT_DIG +#define TARGET_FLOAT_IMPLICIT_J_BIT 1 +#define TARGET_FLOAT_MANT_BITS (TARGET_FLOAT_MANT_DIG - TARGET_FLOAT_IMPLICIT_J_BIT) +#define TARGET_FLOAT_EXP_BITS (TARGET_FLOAT_BITS - TARGET_FLOAT_MANT_BITS - 1) + +#define PTRDIFF __typeof__((char*)0 - (char*)0) +typedef PTRDIFF ptrdiff_t; + +enum justification_options { left_justification, right_justification, zero_fill }; + +enum sign_options { only_minus, sign_always, space_holder }; + +enum argument_options { + normal_argument, + char_argument, + short_argument, + long_argument, + long_long_argument, + long_double_argument, + wchar_argument +}; + +typedef struct { + unsigned char justification_options; + unsigned char sign_options; + unsigned char precision_specified; + unsigned char alternate_form; + unsigned char argument_options; + unsigned char conversion_char; + int field_width; + int precision; +} print_format; + +/* 80368288-8036878C 362BC8 0504+00 3/1 0/0 0/0 .text parse_format */ +static const char* parse_format(const char* format_string, va_list* arg, print_format* format) { + print_format f; + const char* s = format_string; + int c; + int flag_found; + f.justification_options = right_justification; + f.sign_options = only_minus; + f.precision_specified = 0; + f.alternate_form = 0; + f.argument_options = normal_argument; + f.field_width = 0; + f.precision = 0; + + if ((c = *++s) == '%') { + f.conversion_char = c; + *format = f; + return ((const char*)s + 1); + } + + for (;;) { + flag_found = 1; + + switch (c) { + case '-': + f.justification_options = left_justification; + break; + case '+': + f.sign_options = sign_always; + break; + case ' ': + if (f.sign_options != sign_always) { + f.sign_options = space_holder; + } + break; + case '#': + f.alternate_form = 1; + break; + case '0': + if (f.justification_options != left_justification) { + f.justification_options = zero_fill; + } + break; + default: + flag_found = 0; + break; + } + + if (flag_found) { + c = *++s; + } else { + break; + } + } + + if (c == '*') { + if ((f.field_width = va_arg(*arg, int)) < 0) { + f.justification_options = left_justification; + f.field_width = -f.field_width; + } + + c = *++s; + } else { + while (isdigit(c)) { + f.field_width = (f.field_width * 10) + (c - '0'); + c = *++s; + } + } + + if (f.field_width > 509) { + f.conversion_char = 0xFF; + *format = f; + return ((const char*)s + 1); + } + + if (c == '.') { + f.precision_specified = 1; + + if ((c = *++s) == '*') { + if ((f.precision = va_arg(*arg, int)) < 0) { + f.precision_specified = 0; + } + + c = *++s; + } else { + while (isdigit(c)) { + f.precision = (f.precision * 10) + (c - '0'); + c = *++s; + } + } + } + + flag_found = 1; + + switch (c) { + case 'h': + f.argument_options = short_argument; + + if (s[1] == 'h') { + f.argument_options = char_argument; + c = *++s; + } + + break; + + case 'l': + f.argument_options = long_argument; + + if (s[1] == 'l') { + f.argument_options = long_long_argument; + c = *++s; + } + + break; + + case 'L': + f.argument_options = long_double_argument; + break; + default: + flag_found = 0; + break; + } + + if (flag_found) { + c = *++s; + } + + f.conversion_char = c; + + switch (c) { + case 'd': + case 'i': + case 'u': + case 'o': + case 'x': + case 'X': + if (f.argument_options == long_double_argument) { + f.conversion_char = 0xFF; + break; + } + + if (!f.precision_specified) { + f.precision = 1; + } else if (f.justification_options == zero_fill) { + f.justification_options = right_justification; + } + break; + + case 'f': + case 'F': + if (f.argument_options == short_argument || f.argument_options == long_long_argument) { + f.conversion_char = 0xFF; + break; + } + + if (!f.precision_specified) { + f.precision = 6; + } + break; + + case 'a': + case 'A': + if (!f.precision_specified) { + f.precision = 0xD; + } + + if (f.argument_options == short_argument || f.argument_options == long_long_argument || + f.argument_options == char_argument) + { + f.conversion_char = 0xFF; + } + + break; + + case 'g': + case 'G': + if (!f.precision) { + f.precision = 1; + } + + case 'e': + case 'E': + if (f.argument_options == short_argument || f.argument_options == long_long_argument || + f.argument_options == char_argument) + { + f.conversion_char = 0xFF; + break; + } + + if (!f.precision_specified) { + f.precision = 6; + } + break; + + case 'p': + f.conversion_char = 'x'; + f.alternate_form = 1; + f.argument_options = long_argument; + f.precision = 8; + break; + + case 'c': + if (f.argument_options == long_argument) { + f.argument_options = wchar_argument; + } else { + if (f.precision_specified || f.argument_options != normal_argument) { + f.conversion_char = 0xFF; + } + } + + break; + + case 's': + if (f.argument_options == long_argument) { + f.argument_options = wchar_argument; + } else { + if (f.argument_options != normal_argument) { + f.conversion_char = 0xFF; + } + } + + break; + + case 'n': + if (f.argument_options == long_double_argument) { + f.conversion_char = 0xFF; + } + + break; + + default: + f.conversion_char = 0xFF; + break; + } + + *format = f; + return ((const char*)s + 1); +} + +/* 80368030-80368288 362970 0258+00 3/2 0/0 0/0 .text long2str */ +static char* long2str(signed long num, char* buff, print_format format) { + unsigned long unsigned_num, base; + char* p; + int n, digits; + int minus = 0; + unsigned_num = num; + minus = 0; + + p = buff; + *--p = 0; + digits = 0; + + if (!num && !format.precision && !(format.alternate_form && format.conversion_char == 'o')) { + return p; + } + + switch (format.conversion_char) { + case 'd': + case 'i': + base = 10; + + if (num < 0) { + unsigned_num = -unsigned_num; + minus = 1; + } + break; + + case 'o': + base = 8; + format.sign_options = only_minus; + break; + + case 'u': + base = 10; + format.sign_options = only_minus; + break; + + case 'x': + case 'X': + base = 16; + format.sign_options = only_minus; + break; + } + + do { + n = unsigned_num % base; + unsigned_num /= base; + + if (n < 10) { + n += '0'; + } else { + n -= 10; + + if (format.conversion_char == 'x') { + n += 'a'; + } else { + n += 'A'; + } + } + + *--p = n; + ++digits; + } while (unsigned_num != 0); + + if (base == 8 && format.alternate_form && *p != '0') { + *--p = '0'; + ++digits; + } + + if (format.justification_options == zero_fill) { + format.precision = format.field_width; + + if (minus || format.sign_options != only_minus) + --format.precision; + + if (base == 16 && format.alternate_form) + format.precision -= 2; + } + + if (buff - p + format.precision > 509) + return (0); + + while (digits < format.precision) { + *--p = '0'; + ++digits; + } + + if (base == 16 && format.alternate_form) { + *--p = format.conversion_char; + *--p = '0'; + } + + if (minus) { + *--p = '-'; + } else if (format.sign_options == sign_always) { + *--p = '+'; + } else if (format.sign_options == space_holder) { + *--p = ' '; + } + + return p; +} + +/* 80367D1C-80368030 36265C 0314+00 2/1 0/0 0/0 .text longlong2str */ +static char* longlong2str(signed long long num, char* pBuf, print_format fmt) { + unsigned long long unsigned_num, base; + char* p; + int n, digits; + int minus = 0; + unsigned_num = num; + minus = 0; + p = pBuf; + *--p = 0; + digits = 0; + + if (!num && !fmt.precision && !(fmt.alternate_form && fmt.conversion_char == 'o')) { + return p; + } + + switch (fmt.conversion_char) { + case 'd': + case 'i': + base = 10; + + if (num < 0) { + unsigned_num = -unsigned_num; + minus = 1; + } + break; + case 'o': + base = 8; + fmt.sign_options = only_minus; + break; + case 'u': + base = 10; + fmt.sign_options = only_minus; + break; + case 'x': + case 'X': + base = 16; + fmt.sign_options = only_minus; + break; + } + + do { + n = unsigned_num % base; + unsigned_num /= base; + + if (n < 10) { + n += '0'; + } else { + n -= 10; + if (fmt.conversion_char == 'x') { + n += 'a'; + } else { + n += 'A'; + } + } + + *--p = n; + ++digits; + } while (unsigned_num != 0); + + if (base == 8 && fmt.alternate_form && *p != '0') { + *--p = '0'; + ++digits; + } + + if (fmt.justification_options == zero_fill) { + fmt.precision = fmt.field_width; + + if (minus || fmt.sign_options != only_minus) { + --fmt.precision; + } + + if (base == 16 && fmt.alternate_form) { + fmt.precision -= 2; + } + } + + if (pBuf - p + fmt.precision > 509) { + return 0; + } + + while (digits < fmt.precision) { + *--p = '0'; + ++digits; + } + + if (base == 16 && fmt.alternate_form) { + *--p = fmt.conversion_char; + *--p = '0'; + } + + if (minus) { + *--p = '-'; + } else if (fmt.sign_options == sign_always) { + *--p = '+'; + } else if (fmt.sign_options == space_holder) { + *--p = ' '; + } + + return p; +} + +/* 803679E4-80367D1C 362324 0338+00 1/1 0/0 0/0 .text double2hex */ +static char* double2hex(long double num, char* buff, print_format format) { + int offset, what_nibble = 0; + char* wrk_byte_ptr; + char *p, *q; + char working_byte; + long double ld; + signed short* sptr; + signed short snum; + signed long exp; + print_format exp_format; + int hex_precision; + decform form; + decimal dec; + + p = buff; + ld = num; + sptr = (signed short*)&ld; + + if (format.precision > 509) { + return 0; + } + + form.style = (char)0; + form.digits = 0x20; + __num2dec(&form, num, &dec); + + if (*dec.sig.text == 'I') { + if (*sptr & 0x8000) { + p = buff - 5; + if (format.conversion_char == 'A') + strcpy(p, "-INF"); + else + strcpy(p, "-inf"); + } else { + p = buff - 4; + if (format.conversion_char == 'A') + strcpy(p, "INF"); + else + strcpy(p, "inf"); + } + + return p; + } else if (*dec.sig.text == 'N') { + if (*(char*)&num & 0x80) { + p = buff - 5; + if (format.conversion_char == 'A') + strcpy(p, "-NAN"); + else + strcpy(p, "-nan"); + } else { + p = buff - 4; + if (format.conversion_char == 'A') + strcpy(p, "NAN"); + else + strcpy(p, "nan"); + } + + return p; + } + + exp_format.justification_options = right_justification; + exp_format.sign_options = sign_always; + exp_format.precision_specified = 0; + exp_format.alternate_form = 0; + exp_format.argument_options = normal_argument; + exp_format.field_width = 0; + exp_format.precision = 1; + exp_format.conversion_char = 'd'; + + snum = (*sptr & 0x7ff0) >> 4; + + exp = snum - 0x3FF; + + p = long2str(exp, buff, exp_format); + if (format.conversion_char == 'a') + *--p = 'p'; + else + *--p = 'P'; + + q = (char*)# + + for (hex_precision = format.precision; hex_precision >= 1; hex_precision--) { + working_byte = *(q + (hex_precision / 2) + 1); + if (hex_precision % 2) + working_byte = working_byte & 0x0f; + else + working_byte = (working_byte >> 4) & 0x0f; + + if (working_byte < 10) { + working_byte += '0'; + } else { + working_byte -= 10; + + if (format.conversion_char == 'a') { + working_byte += 'a'; + } else { + working_byte += 'A'; + } + } + + *--p = working_byte; + } + + if (format.precision || format.alternate_form) { + *--p = '.'; + } + + *--p = '1'; + + if (format.conversion_char == 'a') { + *--p = 'x'; + } else { + *--p = 'X'; + } + + *--p = '0'; + + if (*sptr & 0x8000) { + *--p = '-'; + } else if (format.sign_options == sign_always) { + *--p = '+'; + } else if (format.sign_options == space_holder) { + *--p = ' '; + } + + return p; +} + +/* 803678B8-803679E4 3621F8 012C+00 1/1 0/0 0/0 .text round_decimal */ +static void round_decimal(decimal* dec, int new_length) { + char c; + char* p; + int carry; + + if (new_length < 0) { + return_zero: + dec->exp = 0; + dec->sig.length = 1; + *dec->sig.text = '0'; + return; + } + + if (new_length >= dec->sig.length) { + return; + } + + p = (char*)dec->sig.text + new_length + 1; + c = *--p - '0'; + + if (c == 5) { + char* q = &((char*)dec->sig.text)[dec->sig.length]; + + while (--q > p && *q == '0') + ; + carry = (q == p) ? p[-1] & 1 : 1; + } else { + carry = (c > 5); + } + + while (new_length != 0) { + c = *--p - '0' + carry; + + if ((carry = (c > 9)) != 0 || c == 0) { + --new_length; + } else { + *p = c + '0'; + break; + } + } + + if (carry != 0) { + dec->exp += 1; + dec->sig.length = 1; + *dec->sig.text = '1'; + return; + } else if (new_length == 0) { + goto return_zero; + } + + dec->sig.length = new_length; +} + +/* 8036719C-803678B8 361ADC 071C+00 1/1 0/0 0/0 .text float2str */ +static char* float2str(long double num, char* buff, print_format format) { + decimal dec; + decform form; + char* p; + char* q; + int n, digits, sign; + int int_digits, frac_digits; + int radix_marker; + + radix_marker = '.'; + + if (format.precision > 509) { + return 0; + } + + form.style = 0; + form.digits = 0x20; + __num2dec(&form, num, &dec); + p = (char*)dec.sig.text + dec.sig.length; + + while (dec.sig.length > 1 && *--p == '0') { + --dec.sig.length; + ++dec.exp; + } + + switch (*dec.sig.text) { + case '0': + dec.exp = 0; + break; + case 'I': + if (num < 0) { + p = buff - 5; + + if (isupper(format.conversion_char)) { + strcpy(p, "-INF"); + } else { + strcpy(p, "-inf"); + } + } else { + p = buff - 4; + if (isupper(format.conversion_char)) { + strcpy(p, "INF"); + } else { + strcpy(p, "inf"); + } + } + + return p; + + case 'N': + if (dec.sign) { + p = buff - 5; + + if (isupper(format.conversion_char)) { + strcpy(p, "-NAN"); + } else { + strcpy(p, "-nan"); + } + } else { + p = buff - 4; + if (isupper(format.conversion_char)) { + strcpy(p, "NAN"); + } else { + strcpy(p, "nan"); + } + } + + return p; + } + + dec.exp += dec.sig.length - 1; + p = buff; + *--p = 0; + + switch (format.conversion_char) { + case 'g': + case 'G': + + if (dec.sig.length > format.precision) { + round_decimal(&dec, format.precision); + } + + if (dec.exp < -4 || dec.exp >= format.precision) { + if (format.alternate_form) { + --format.precision; + } else { + format.precision = dec.sig.length - 1; + } + + if (format.conversion_char == 'g') { + format.conversion_char = 'e'; + } else { + format.conversion_char = 'E'; + } + + goto e_format; + } + + if (format.alternate_form) { + format.precision -= dec.exp + 1; + } else { + if ((format.precision = dec.sig.length - (dec.exp + 1)) < 0) { + format.precision = 0; + } + } + + goto f_format; + + case 'e': + case 'E': + e_format: + + if (dec.sig.length > format.precision + 1) { + round_decimal(&dec, format.precision + 1); + } + + n = dec.exp; + sign = '+'; + + if (n < 0) { + n = -n; + sign = '-'; + } + + for (digits = 0; n || digits < 2; ++digits) { + *--p = n % 10 + '0'; + n /= 10; + } + + *--p = sign; + *--p = format.conversion_char; + + if (buff - p + format.precision > 509) { + return 0; + } + + if (dec.sig.length < format.precision + 1) { + for (n = format.precision + 1 - dec.sig.length + 1; --n;) { + *--p = '0'; + } + } + + for (n = dec.sig.length, q = (char*)dec.sig.text + dec.sig.length; --n;) { + *--p = *--q; + } + + if (format.precision || format.alternate_form) { + *--p = radix_marker; + } + + *--p = *dec.sig.text; + + if (dec.sign) + *--p = '-'; + else if (format.sign_options == sign_always) + *--p = '+'; + else if (format.sign_options == space_holder) + *--p = ' '; + + break; + + case 'f': + case 'F': + f_format: + + if ((frac_digits = -dec.exp + dec.sig.length - 1) < 0) + frac_digits = 0; + + if (frac_digits > format.precision) { + round_decimal(&dec, dec.sig.length - (frac_digits - format.precision)); + + if ((frac_digits = -dec.exp + dec.sig.length - 1) < 0) + frac_digits = 0; + } + + if ((int_digits = dec.exp + 1) < 0) + int_digits = 0; + + if (int_digits + frac_digits > 509) + return 0; + + q = (char*)dec.sig.text + dec.sig.length; + + for (digits = 0; digits < (format.precision - frac_digits); ++digits) + *--p = '0'; + + for (digits = 0; digits < frac_digits && digits < dec.sig.length; ++digits) + *--p = *--q; + + for (; digits < frac_digits; ++digits) + *--p = '0'; + + if (format.precision || format.alternate_form) + *--p = radix_marker; + + if (int_digits) { + for (digits = 0; digits < int_digits - dec.sig.length; ++digits) { + *--p = '0'; + } + + for (; digits < int_digits; ++digits) { + *--p = *--q; + } + } else { + *--p = '0'; + } + + if (dec.sign) { + *--p = '-'; + } else if (format.sign_options == sign_always) { + *--p = '+'; + } else if (format.sign_options == space_holder) { + *--p = ' '; + } + + break; + } + + return p; +} + +/* 80366A28-8036719C 361368 0774+00 6/6 0/0 0/0 .text __pformatter */ +static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProcArg, + const char* format_str, va_list arg) { + int num_chars, chars_written, field_width; + const char* format_ptr; + const char* curr_format; + print_format format; + signed long long_num; + signed long long long_long_num; + long double long_double_num; + char buff[512]; + char* buff_ptr; + char* string_end; + char fill_char = ' '; + + format_ptr = format_str; + chars_written = 0; + + while (*format_ptr) { + if (!(curr_format = strchr(format_ptr, '%'))) { + num_chars = strlen(format_ptr); + chars_written += num_chars; + + if (num_chars && !(*WriteProc)(WriteProcArg, format_ptr, num_chars)) { + return -1; + } + + break; + } + + num_chars = curr_format - format_ptr; + chars_written += num_chars; + + if (num_chars && !(*WriteProc)(WriteProcArg, format_ptr, num_chars)) { + return -1; + } + + format_ptr = curr_format; + format_ptr = parse_format(format_ptr, (va_list*)arg, &format); + + switch (format.conversion_char) { + case 'd': + case 'i': + if (format.argument_options == long_argument) { + long_num = va_arg(arg, signed long); + } else if (format.argument_options == long_long_argument) { + long_long_num = va_arg(arg, signed long long); + } else { + long_num = va_arg(arg, int); + } + + if (format.argument_options == short_argument) { + long_num = (signed short)long_num; + } + + if (format.argument_options == char_argument) { + long_num = (signed char)long_num; + } + + if ((format.argument_options == long_long_argument)) { + if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) { + goto conversion_error; + } + } else { + if (!(buff_ptr = long2str(long_num, buff + 512, format))) { + goto conversion_error; + } + } + + num_chars = buff + 512 - 1 - buff_ptr; + break; + + case 'o': + case 'u': + case 'x': + case 'X': + if (format.argument_options == long_argument) { + long_num = va_arg(arg, unsigned long); + } else if (format.argument_options == long_long_argument) { + long_long_num = va_arg(arg, signed long long); + } else { + long_num = va_arg(arg, unsigned int); + } + + if (format.argument_options == short_argument) { + long_num = (unsigned short)long_num; + } + + if (format.argument_options == char_argument) { + long_num = (unsigned char)long_num; + } + + if ((format.argument_options == long_long_argument)) { + if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) { + goto conversion_error; + } + } else { + if (!(buff_ptr = long2str(long_num, buff + 512, format))) { + goto conversion_error; + } + } + + num_chars = buff + 512 - 1 - buff_ptr; + break; + + case 'f': + case 'F': + case 'e': + case 'E': + case 'g': + case 'G': + if (format.argument_options == long_double_argument) { + long_double_num = va_arg(arg, long double); + } else { + long_double_num = va_arg(arg, f64); + } + + if (!(buff_ptr = float2str(long_double_num, buff + 512, format))) { + goto conversion_error; + } + + num_chars = buff + 512 - 1 - buff_ptr; + break; + + case 'a': + case 'A': + if (format.argument_options == long_double_argument) { + long_double_num = va_arg(arg, long double); + } else { + long_double_num = va_arg(arg, f64); + } + + if (!(buff_ptr = double2hex(long_double_num, buff + 512, format))) { + goto conversion_error; + } + + num_chars = buff + 512 - 1 - buff_ptr; + break; + + case 's': + if (format.argument_options == wchar_argument) { + wchar_t* wcs_ptr = va_arg(arg, wchar_t*); + + if (wcs_ptr == NULL) { + wcs_ptr = L""; + } + + if ((num_chars = wcstombs(buff, wcs_ptr, sizeof(buff))) < 0) { + goto conversion_error; + } + + buff_ptr = &buff[0]; + } else { + buff_ptr = va_arg(arg, char*); + } + + if (buff_ptr == NULL) { + buff_ptr = ""; + } + + if (format.alternate_form) { + num_chars = (unsigned char)*buff_ptr++; + + if (format.precision_specified && num_chars > format.precision) { + num_chars = format.precision; + } + } else if (format.precision_specified) { + num_chars = format.precision; + + if ((string_end = (char*)memchr((unsigned char*)buff_ptr, 0, num_chars)) != 0) { + num_chars = string_end - buff_ptr; + } + } else { + num_chars = strlen(buff_ptr); + } + + break; + + case 'n': + buff_ptr = va_arg(arg, char*); + + switch (format.argument_options) { + case normal_argument: + *(int*)buff_ptr = chars_written; + break; + case short_argument: + *(signed short*)buff_ptr = chars_written; + break; + case long_argument: + *(signed long*)buff_ptr = chars_written; + break; + case long_long_argument: + *(signed long long*)buff_ptr = chars_written; + break; + } + + continue; + + case 'c': + buff_ptr = buff; + *buff_ptr = va_arg(arg, int); + num_chars = 1; + break; + + case '%': + buff_ptr = buff; + *buff_ptr = '%'; + num_chars = 1; + break; + + case 0xFF: + default: + conversion_error: + num_chars = strlen(curr_format); + chars_written += num_chars; + + if (num_chars && !(*WriteProc)(WriteProcArg, curr_format, num_chars)) { + return -1; + } + + return chars_written; + break; + } + + field_width = num_chars; + + if (format.justification_options != left_justification) { + fill_char = (format.justification_options == zero_fill) ? '0' : ' '; + + if (((*buff_ptr == '+') || (*buff_ptr == '-') || (*buff_ptr == ' ')) && + (fill_char == '0')) + { + if ((*WriteProc)(WriteProcArg, buff_ptr, 1) == 0) { + return -1; + } + + ++buff_ptr; + num_chars--; + } + + while (field_width < format.field_width) { + if ((*WriteProc)(WriteProcArg, &fill_char, 1) == 0) { + return -1; + } + + ++field_width; + } + } + + if (num_chars && !(*WriteProc)(WriteProcArg, buff_ptr, num_chars)) { + return -1; + } + + if (format.justification_options == left_justification) { + while (field_width < format.field_width) { + char blank = ' '; + + if ((*WriteProc)(WriteProcArg, &blank, 1) == 0) { + return -1; + } + + ++field_width; + } + } + + chars_written += field_width; + } + + return chars_written; +} + +/* 803669D0-80366A28 361310 0058+00 3/3 0/0 0/0 .text __FileWrite */ +static void* __FileWrite(void* pFile, const char* pBuffer, size_t char_num) { + return (fwrite(pBuffer, 1, char_num, (FILE*)pFile) == char_num ? pFile : 0); +} + +/* 80366964-803669D0 3612A4 006C+00 3/3 0/0 0/0 .text __StringWrite */ +static void* __StringWrite(void* pCtrl, const char* pBuffer, size_t char_num) { + size_t chars; + __OutStrCtrl* ctrl = (__OutStrCtrl*)pCtrl; + void* res; + + chars = ((ctrl->CharsWritten + char_num) <= ctrl->MaxCharCount) ? + char_num : + ctrl->MaxCharCount - ctrl->CharsWritten; + res = memcpy(ctrl->CharStr + ctrl->CharsWritten, pBuffer, chars); + ctrl->CharsWritten += chars; + return (void*)1; +} + +/* 8036687C-80366964 3611BC 00E8+00 0/0 4/4 0/0 .text printf */ +int printf(const char* format, ...) { + int res; + + if (fwide(stdout, -1) >= 0) { + return -1; + } + + __begin_critical_region(stdin_access); + { + va_list args; + va_start(args, format); + res = __pformatter(&__FileWrite, (void*)stdout, format, args); + } + __end_critical_region(stdin_access); + return res; +} + +/* 8036679C-8036687C 3610DC 00E0+00 0/0 9/9 0/0 .text fprintf */ +int fprintf(FILE* file, const char* format, ...) { + int res; + + if (fwide(file, -1) >= 0) { + return -1; + } + + __begin_critical_region(stdin_access); + { + va_list args; + va_start(args, format); + res = __pformatter(&__FileWrite, (void*)file, format, args); + } + __end_critical_region(stdin_access); + return res; +} + +/* 80366704-8036679C 361044 0098+00 0/0 2/2 0/0 .text vprintf */ +int vprintf(const char* format, va_list arg) { + int ret; + + if (fwide(stdout, -1) >= 0) { + return -1; + } + + __begin_critical_region(stdin_access); + ret = __pformatter(&__FileWrite, (void*)stdout, format, arg); + __end_critical_region(stdin_access); + return ret; +} + +/* 80366690-80366704 360FD0 0074+00 0/0 8/8 0/0 .text vsnprintf */ +int vsnprintf(char* s, size_t n, const char* format, va_list arg) { + int end; + __OutStrCtrl osc; + osc.CharStr = s; + osc.MaxCharCount = n; + osc.CharsWritten = 0; + + end = __pformatter(&__StringWrite, &osc, format, arg); + + if (s) { + s[(end < n) ? end : n - 1] = '\0'; + } + + return end; +} + +/* 803665BC-80366690 360EFC 00D4+00 0/0 19/19 0/0 .text snprintf */ +int snprintf(char* s, size_t n, const char* format, ...) { + va_list args; + va_start(args, format); + return vsnprintf(s, n, format, args); +} + +/* 803664DC-803665BC 360E1C 00E0+00 0/0 32/32 14/14 .text sprintf */ +int sprintf(char* s, const char* format, ...) { + va_list args; + va_start(args, format); + return vsnprintf(s, 0xFFFFFFFF, format, args); +} diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c new file mode 100644 index 0000000000..5e4e271f26 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c @@ -0,0 +1,34 @@ +#include "scanf.h" + +/* 8036878C-8036881C 3630CC 0090+00 0/0 2/2 0/0 .text __StringRead */ +int __StringRead(void* pPtr, int ch, int act) { + char ret; + __InStrCtrl* Iscp = (__InStrCtrl*)pPtr; + + switch (act) { + case __GetAChar: + ret = *(Iscp->NextChar); + + if (ret == '\0') { + Iscp->NullCharDetected = 1; + return -1; + } else { + Iscp->NextChar++; + return (unsigned char)ret; + } + + case __UngetAChar: + if (Iscp->NullCharDetected == 0) { + Iscp->NextChar--; + } else { + Iscp->NullCharDetected = 0; + } + + return ch; + + case __TestForError: + return Iscp->NullCharDetected; + } + + return 0; +} diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c new file mode 100644 index 0000000000..d7b6a23dd2 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c @@ -0,0 +1,39 @@ +#include "signal.h" +#include "abort_exit.h" +#include "critical_regions.h" + +#define __std(ref) ref + +/* 8044D878-8044D890 07A598 0018+00 1/1 0/0 0/0 .bss signal_funcs */ +__signal_func_ptr signal_funcs[6]; + +/* 8036881C-803688DC 36315C 00C0+00 0/0 1/1 0/0 .text raise */ +int raise(int sig) { + __signal_func_ptr signal_func; + + if (sig < 1 || sig > 6) { + return -1; + } + + __begin_critical_region(stderr_access); + signal_func = signal_funcs[sig - 1]; + + if (signal_func != ((__std(__signal_func_ptr))1)) { + signal_funcs[sig - 1] = ((__std(__signal_func_ptr))0); + } + + __end_critical_region(stderr_access); + + if (signal_func == ((__std(__signal_func_ptr))1) || + (signal_func == ((__std(__signal_func_ptr))0) && sig == 1)) + { + return 0; + } + + if (signal_func == ((__std(__signal_func_ptr))0)) { + exit(0); + } + + (*signal_func)(sig); + return 0; +} diff --git a/libs/MSL_C/MSL_Common/Src/string.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c similarity index 99% rename from libs/MSL_C/MSL_Common/Src/string.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c index 51e74fcda7..a9f99d8221 100644 --- a/libs/MSL_C/MSL_Common/Src/string.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/string.h" +#include "string.h" #define K1 0x80808080 #define K2 0xFEFEFEFF diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c new file mode 100644 index 0000000000..91e66bf826 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -0,0 +1,203 @@ +#include "strtoul.h" +#include "ctype.h" +#include "errno.h" +#include "limits.h" +#include "scanf.h" + +enum scan_states { + start = 0x01, + check_for_zero = 0x02, + leading_zero = 0x04, + need_digit = 0x08, + digit_loop = 0x10, + finished = 0x20, + failure = 0x40 +}; + +#define final_state(scan_state) (scan_state & (finished | failure)) +#define success(scan_state) (scan_state & (leading_zero | digit_loop | finished)) +#define fetch() (count++, (*ReadProc)(ReadProcArg, 0, __GetAChar)) +#define unfetch(c) (*ReadProc)(ReadProcArg, c, __UngetAChar) + +/* 80368D9C-80369114 3636DC 0378+00 3/2 0/0 0/0 .text __strtoul */ +unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), + void* ReadProcArg, int* chars_scanned, int* negative, int* overflow) { + int scan_state = start; + int count = 0; + int spaces = 0; + unsigned long value = 0; + unsigned long value_max = 0; + int c; + + *negative = *overflow = 0; + + if (base < 0 || base == 1 || base > 36 || max_width < 1) { + scan_state = failure; + } else { + c = fetch(); + } + + if (base != 0) { + value_max = ULONG_MAX / base; + } + + while (count <= max_width && c != -1 && !final_state(scan_state)) { + switch (scan_state) { + case start: + if (isspace(c)) { + c = fetch(); + count--; + spaces++; + break; + } + + if (c == '+') { + c = fetch(); + } else if (c == '-') { + c = fetch(); + *negative = 1; + } + + scan_state = check_for_zero; + break; + + case check_for_zero: + if (base == 0 || base == 16) { + if (c == '0') { + scan_state = leading_zero; + c = fetch(); + break; + } + } + + scan_state = need_digit; + break; + + case 4: + if (c == 'X' || c == 'x') { + base = 16; + scan_state = need_digit; + c = fetch(); + break; + } + + if (base == 0) { + base = 8; + } + + scan_state = digit_loop; + break; + + case need_digit: + case digit_loop: + if (base == 0) { + base = 10; + } + + if (!value_max) { + value_max = ULONG_MAX / base; + } + + if (isdigit(c)) { + if ((c -= '0') >= base) { + if (scan_state == digit_loop) { + scan_state = finished; + } else { + scan_state = failure; + } + + c += '0'; + break; + } + } else if (!isalpha(c) || (toupper(c) - 'A' + 10) >= base) { + if (scan_state == digit_loop) { + scan_state = finished; + } else { + scan_state = failure; + } + + break; + } else { + c = toupper(c) - 'A' + 10; + } + + if (value > value_max) { + *overflow = 1; + } + + value *= base; + + if (c > (ULONG_MAX - value)) { + *overflow = 1; + } + + value += c; + scan_state = digit_loop; + c = fetch(); + break; + } + } + + if (!success(scan_state)) { + count = 0; + value = 0; + *chars_scanned = 0; + } else { + count--; + *chars_scanned = count + spaces; + } + + unfetch(c); + return value; +} + +/* 80368CF0-80368D9C 363630 00AC+00 0/0 2/2 0/0 .text strtoul */ +unsigned long strtoul(const char* str, char** end, int base) { + unsigned long value; + int count, negative, overflow; + + __InStrCtrl isc; + isc.NextChar = (char*)str; + isc.NullCharDetected = 0; + + value = __strtoul(base, 0x7FFFFFFF, &__StringRead, (void*)&isc, &count, &negative, &overflow); + + if (end) { + *end = (char*)str + count; + } + + if (overflow) { + value = ULONG_MAX; + errno = 0x22; + } else if (negative) { + value = -value; + } + + return value; +} + +/* 80368C00-80368CF0 363540 00F0+00 0/0 3/3 0/0 .text strtol */ +long strtol(const char* str, char** end, int base) { + unsigned long uvalue; + long svalue; + int count, negative, overflow; + + __InStrCtrl isc; + isc.NextChar = (char*)str; + isc.NullCharDetected = 0; + + uvalue = __strtoul(base, 0x7FFFFFFF, &__StringRead, (void*)&isc, &count, &negative, &overflow); + + if (end) { + *end = (char*)str + count; + } + + if (overflow || (!negative && uvalue > LONG_MAX) || (negative && uvalue > -LONG_MIN)) { + svalue = (negative ? -LONG_MIN : LONG_MAX); + errno = ERANGE; + } else { + svalue = (negative ? (long)-uvalue : (long)uvalue); + } + + return svalue; +} diff --git a/libs/MSL_C/MSL_Common/Src/wchar_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c similarity index 93% rename from libs/MSL_C/MSL_Common/Src/wchar_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c index e88208d69e..3c6f4767e2 100644 --- a/libs/MSL_C/MSL_Common/Src/wchar_io.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c @@ -1,4 +1,4 @@ -#include "MSL_C/MSL_Common/Src/wchar_io.h" +#include "wchar_io.h" /* 80369114-8036919C 363A54 0088+00 0/0 5/5 0/0 .text fwide */ int fwide(FILE* file, int mode) { diff --git a/libs/MSL_C/Math/Double_precision/e_acos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c similarity index 99% rename from libs/MSL_C/Math/Double_precision/e_acos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index 2ac420f4eb..1bbd7a6e38 100644 --- a/libs/MSL_C/Math/Double_precision/e_acos.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -35,7 +35,7 @@ * Function needed: sqrt */ -#include "MSL_C/math.h" +#include "math.h" #ifdef __STDC__ static const double diff --git a/libs/MSL_C/Math/Double_precision/e_asin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c similarity index 99% rename from libs/MSL_C/Math/Double_precision/e_asin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 11a5b6771f..8f40d90225 100644 --- a/libs/MSL_C/Math/Double_precision/e_asin.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -41,7 +41,7 @@ * */ -#include "MSL_C/math.h" +#include "math.h" #ifdef __STDC__ static const double diff --git a/libs/MSL_C/Math/Double_precision/e_atan2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/e_atan2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c diff --git a/libs/MSL_C/Math/Double_precision/e_exp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/e_exp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c diff --git a/libs/MSL_C/Math/Double_precision/e_fmod.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/e_fmod.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c diff --git a/libs/MSL_C/Math/Double_precision/e_pow.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c similarity index 99% rename from libs/MSL_C/Math/Double_precision/e_pow.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index 82991412d9..fb139480c6 100644 --- a/libs/MSL_C/Math/Double_precision/e_pow.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -112,7 +112,7 @@ #include "types.h" #include "errno.h" -#include "MSL_C/math.h" +#include "math.h" #ifndef _DOUBLE_IS_32BITS diff --git a/libs/MSL_C/Math/Double_precision/e_rem_pio2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c similarity index 99% rename from libs/MSL_C/Math/Double_precision/e_rem_pio2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c index 2a17e7b5a8..96987b8515 100644 --- a/libs/MSL_C/Math/Double_precision/e_rem_pio2.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c @@ -18,7 +18,7 @@ * use __kernel_rem_pio2() */ -#include "MSL_C/math.h" +#include "math.h" /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi diff --git a/libs/MSL_C/Math/Double_precision/e_sqrt.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c similarity index 99% rename from libs/MSL_C/Math/Double_precision/e_sqrt.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c index 0158f2f119..162bd7c284 100644 --- a/libs/MSL_C/Math/Double_precision/e_sqrt.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c @@ -81,7 +81,7 @@ */ #include "errno.h" -#include "MSL_C/math.h" +#include "math.h" #ifdef __STDC__ static const double one = 1.0, tiny = 1.0e-300; diff --git a/libs/MSL_C/Math/Double_precision/k_cos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/k_cos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c diff --git a/libs/MSL_C/Math/Double_precision/k_rem_pio2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/k_rem_pio2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c diff --git a/libs/MSL_C/Math/Double_precision/k_sin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/k_sin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c diff --git a/libs/MSL_C/Math/Double_precision/k_tan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c similarity index 99% rename from libs/MSL_C/Math/Double_precision/k_tan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c index 0c27515ca7..e90d19fde1 100644 --- a/libs/MSL_C/Math/Double_precision/k_tan.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c @@ -99,7 +99,7 @@ * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "MSL_C/math.h" +#include "math.h" static const double one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ pio4lo = 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ diff --git a/libs/MSL_C/Math/Double_precision/s_atan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_atan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c diff --git a/libs/MSL_C/Math/Double_precision/s_ceil.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_ceil.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c diff --git a/libs/MSL_C/Math/Double_precision/s_copysign.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_copysign.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c diff --git a/libs/MSL_C/Math/Double_precision/s_cos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_cos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c diff --git a/libs/MSL_C/Math/Double_precision/s_floor.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_floor.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c diff --git a/libs/MSL_C/Math/Double_precision/s_frexp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_frexp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c diff --git a/libs/MSL_C/Math/Double_precision/s_ldexp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c similarity index 97% rename from libs/MSL_C/Math/Double_precision/s_ldexp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c index b9bfb2940c..fb238872dd 100644 --- a/libs/MSL_C/Math/Double_precision/s_ldexp.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c @@ -11,7 +11,7 @@ * ==================================================== */ -#include "MSL_C/math.h" /* for isfinite macro */ +#include "math.h" /* for isfinite macro */ static const double two54 diff --git a/libs/MSL_C/Math/Double_precision/s_modf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_modf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c diff --git a/libs/MSL_C/Math/Double_precision/s_sin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_sin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c diff --git a/libs/MSL_C/Math/Double_precision/s_tan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/s_tan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c diff --git a/libs/MSL_C/Math/Double_precision/w_acos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_acos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c diff --git a/libs/MSL_C/Math/Double_precision/w_asin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_asin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c diff --git a/libs/MSL_C/Math/Double_precision/w_atan2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_atan2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c diff --git a/libs/MSL_C/Math/Double_precision/w_exp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_exp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c diff --git a/libs/MSL_C/Math/Double_precision/w_fmod.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_fmod.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c diff --git a/libs/MSL_C/Math/Double_precision/w_pow.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_pow.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c diff --git a/libs/MSL_C/Math/Double_precision/w_sqrt.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c similarity index 100% rename from libs/MSL_C/Math/Double_precision/w_sqrt.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c diff --git a/include/fdlibm.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h similarity index 98% rename from include/fdlibm.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h index 9ad06deb19..407419ba58 100644 --- a/include/fdlibm.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h @@ -81,8 +81,8 @@ struct exception { #define HUGE MAXFLOAT /* - * set X_TLOSS = pi*2**52, which is possibly defined in - * (one may replace the following line by "#include ") + * set X_TLOSS = pi*2**52, which is possibly defined in > (bits_not_checked - n); + + while (bits_not_checked) { + if (!(x & mask)) { + result += mask_size; + x >>= mask_size; + bits_not_checked -= mask_size; + } else if (mask == 1) { + break; + } + + if (n > 1) { + n /= 2; + } + + if (mask > 1) { + mask >>= n; + mask_size -= n; + } + } + return result; +} + +static int __count_trailing_zero(double x) { + unsigned long* l = (unsigned long*)&x; + + if (l[1] != 0) { + return __count_trailing_zerol(l[1]); + } + + return (int)(sizeof(unsigned long) * CHAR_BIT + __count_trailing_zerol(l[0] | 0x00100000)); +} + +static int __must_round(const decimal* d, int digits) { + unsigned char const* i = d->sig.text + digits; + + if (*i > 5) { + return 1; + } + + if (*i < 5) { + return -1; + } + + { + unsigned char const* e = d->sig.text + d->sig.length; + + for (i++; i < e; i++) { + if (*i != 0) { + return 1; + } + } + } + + if (d->sig.text[digits - 1] & 1) { + return 1; + } + + return -1; +} + +static void __dorounddecup(decimal* d, int digits) { + unsigned char* b = d->sig.text; + unsigned char* i = b + digits - 1; + + while (1) { + if (*i < 9) { + *i += 1; + break; + } + if (i == b) { + *i = 1; + d->exp++; + break; + } + *i-- = 0; + } +} + +static void __rounddec(decimal* d, int digits) { + if (digits > 0 && digits < d->sig.length) { + int unkBool = __must_round(d, digits); + d->sig.length = digits; + + if (unkBool >= 0) { + __dorounddecup(d, digits); + } + } +} + +void __ull2dec(decimal* result, unsigned long long val) { + result->sign = 0; + + if (val == 0) { + result->exp = 0; + result->sig.length = 1; + result->sig.text[0] = 0; + return; + } + + if (val < 0) { + val = -val; + result->sign = 1; + } + + result->sig.length = 0; + + for (; val != 0; val /= 10) { + result->sig.text[result->sig.length++] = (unsigned char)(val % 10); + } + + { + unsigned char* i = result->sig.text; + unsigned char* j = result->sig.text + result->sig.length; + + for (; i < --j; ++i) { + unsigned char t = *i; + *i = *j; + *j = t; + } + } + + result->exp = result->sig.length - 1; +} + +/* 80364E00-80365078 35F740 0278+00 2/2 0/0 0/0 .text __timesdec */ +void __timesdec(decimal* result, const decimal* x, const decimal* y) { + unsigned long accumulator = 0; + unsigned char mantissa[SIGDIGLEN * 2]; + int i = x->sig.length + y->sig.length - 1; + unsigned char* pDigit; + unsigned char* ip = mantissa + i + 1; + unsigned char* ep = ip; + + result->sign = 0; + + for (; i > 0; i--) { + int k = y->sig.length - 1; + int j = i - k - 1; + int l; + int t; + const unsigned char* jp; + const unsigned char* kp; + + if (j < 0) { + j = 0; + k = i - 1; + } + + jp = x->sig.text + j; + kp = y->sig.text + k; + l = k + 1; + t = x->sig.length - j; + + if (l > t) + l = t; + + for (; l > 0; l--, jp++, kp--) { + accumulator += *jp * *kp; + } + + *--ip = (unsigned char)(accumulator % 10); + accumulator /= 10; + } + + result->exp = (short)(x->exp + y->exp); + + if (accumulator) { + *--ip = (unsigned char)(accumulator); + result->exp++; + } + + for (i = 0; i < SIGDIGLEN && ip < ep; i++, ip++) { + result->sig.text[i] = *ip; + } + result->sig.length = (unsigned char)(i); + + if (ip < ep && *ip >= 5) { + if (*ip == 5) { + unsigned char* jp = ip + 1; + for (; jp < ep; jp++) { + if (*jp != 0) + goto round; + } + if ((ip[-1] & 1) == 0) + return; + } + round: + __dorounddecup(result, result->sig.length); + } +} + +void __str2dec(decimal* d, const char* s, short exp) { + int i; + + d->exp = exp; + d->sign = 0; + + for (i = 0; i < SIGDIGLEN && *s;) { + d->sig.text[i++] = *s++ - '0'; + } + d->sig.length = i; + + if (*s != 0) { + if (*s < 5) + return; + if (*s > 5) + goto round; + + { + const char* p = s + 1; + + for (; *p != 0; p++) { + if (*p != '0') + goto round; + } + + if ((d->sig.text[i - 1] & 1) == 0) + return; + } + round: + __dorounddecup(d, d->sig.length); + } +} + +static const char* const unused = "179769313486231580793729011405303420"; + +/* 8036367C-80364E00 35DFBC 1784+00 2/1 0/0 0/0 .text __two_exp */ +void __two_exp(decimal* result, long exp) { + switch (exp) { + case -64: + __str2dec(result, "542101086242752217003726400434970855712890625", -20); + return; + case -53: + __str2dec(result, "11102230246251565404236316680908203125", -16); + return; + case -32: + __str2dec(result, "23283064365386962890625", -10); + return; + case -16: + __str2dec(result, "152587890625", -5); + return; + case -8: + __str2dec(result, "390625", -3); + return; + case -7: + __str2dec(result, "78125", -3); + return; + case -6: + __str2dec(result, "15625", -2); + return; + case -5: + __str2dec(result, "3125", -2); + return; + case -4: + __str2dec(result, "625", -2); + return; + case -3: + __str2dec(result, "125", -1); + return; + case -2: + __str2dec(result, "25", -1); + return; + case -1: + __str2dec(result, "5", -1); + return; + case 0: + __str2dec(result, "1", 0); + return; + case 1: + __str2dec(result, "2", 0); + return; + case 2: + __str2dec(result, "4", 0); + return; + case 3: + __str2dec(result, "8", 0); + return; + case 4: + __str2dec(result, "16", 1); + return; + case 5: + __str2dec(result, "32", 1); + return; + case 6: + __str2dec(result, "64", 1); + return; + case 7: + __str2dec(result, "128", 2); + return; + case 8: + __str2dec(result, "256", 2); + return; + } + + { + decimal x2, temp; + + __two_exp(&x2, exp / 2); + __timesdec(result, &x2, &x2); + + if (exp & 1) { + temp = *result; + if (exp > 0) { + __str2dec(&x2, "2", 0); + } else { + __str2dec(&x2, "5", -1); + } + __timesdec(result, &temp, &x2); + } + } +} + +int __equals_dec(const decimal* x, const decimal* y) { + if (x->sig.text[0] == 0) { + if (y->sig.text[0] == 0) + return 1; + return 0; + } + if (y->sig.text[0] == 0) { + if (x->sig.text[0] == 0) + return 1; + return 0; + } + + if (x->exp == y->exp) { + int i; + int l = x->sig.length; + + if (l > y->sig.length) { + l = y->sig.length; + } + + for (i = 0; i < l; i++) { + if (x->sig.text[i] != y->sig.text[i]) { + return 0; + } + } + + if (l == x->sig.length) { + for (; i < y->sig.length; ++i) { + if (y->sig.text[i] != 0) { + return 0; + } + } + } else { + for (; i < x->sig.length; ++i) { + if (x->sig.text[i] != 0) { + return 0; + } + } + } + + return 1; + } + return 0; +} + +int __less_dec(const decimal* x, const decimal* y) { + if (x->sig.text[0] == 0) { + if (y->sig.text[0] != 0) + return 1; + return 0; + } + + if (y->sig.text[0] == 0) { + return 0; + } + + if (x->exp == y->exp) { + int i; + int l = x->sig.length; + + if (l > y->sig.length) { + l = y->sig.length; + } + + for (i = 0; i < l; i++) { + if (x->sig.text[i] < y->sig.text[i]) { + return 1; + } else if (y->sig.text[i] < x->sig.text[i]) { + return 0; + } + } + + if (l == x->sig.length) { + for (; i < y->sig.length; i++) { + if (y->sig.text[i] != 0) { + return 1; + } + } + } + return 0; + } + + return x->exp < y->exp; +} + +void __minus_dec(decimal* z, const decimal* x, const decimal* y) { + int zlen, dexp; + unsigned char *ib, *i, *ie; + unsigned char const *jb, *j, *jn; + + *z = *x; + + if (y->sig.text[0] == 0) + return; + + zlen = z->sig.length; + if (zlen < y->sig.length) + zlen = y->sig.length; + + dexp = z->exp - y->exp; + zlen += dexp; + + if (zlen > SIGDIGLEN) + zlen = SIGDIGLEN; + + while (z->sig.length < zlen) { + z->sig.text[z->sig.length++] = 0; + } + + ib = z->sig.text; + i = ib + zlen; + + if (y->sig.length + dexp < zlen) { + i = ib + (y->sig.length + dexp); + } + + jb = y->sig.text; + j = jb + (i - ib - dexp); + jn = j; + + while (i > ib && j > jb) { + i--; + j--; + if (*i < *j) { + unsigned char* k = i - 1; + while (*k == 0) + k--; + while (k != i) { + --*k; + *++k += 10; + } + } + *i -= *j; + } + + if (jn - jb < y->sig.length) { + int round_down = 0; + if (*jn < 5) + round_down = 1; + else if (*jn == 5) { + unsigned char const* ibPtr = y->sig.text + y->sig.length; + + for (j = jn + 1; j < ibPtr; j++) { + if (*j != 0) + goto done; + } + i = ib + (jn - jb) + dexp - 1; + if (*i & 1) + round_down = 1; + } + if (round_down) { + if (*i < 1) { + unsigned char* k = i - 1; + while (*k == 0) + k--; + while (k != i) { + --*k; + *++k += 10; + } + } + *i -= 1; + } + } +done: + for (i = ib; *i == 0; ++i) { + } + + if (i > ib) { + unsigned char dl = (unsigned char)(i - ib); + z->exp -= dl; + ie = ib + z->sig.length; + for (; i < ie; ++i, ++ib) + *ib = *i; + z->sig.length -= dl; + } + + ib = z->sig.text; + for (i = ib + z->sig.length; i > ib;) { + i--; + if (*i != 0) + break; + } + z->sig.length = (unsigned char)(i - ib + 1); +} + +/* 803632C8-8036367C 35DC08 03B4+00 1/1 0/0 0/0 .text __num2dec_internal */ +void __num2dec_internal(decimal* d, double x) { + signed char sign = (signed char)(signbit(x) != 0); + + if (x == 0) { + d->sign = sign; + d->exp = 0; + d->sig.length = 1; + d->sig.text[0] = 0; + return; + } + + if (!isfinite(x)) { + d->sign = sign; + d->exp = 0; + d->sig.length = 1; + d->sig.text[0] = fpclassify(x) == 1 ? 'N' : 'I'; + return; + } + + if (sign != 0) { + x = -x; + } + + { + int exp; + double frac = frexp(x, &exp); + long num_bits_extract = DBL_MANT_DIG - __count_trailing_zero(frac); + double integer; + decimal int_d, pow2_d; + + __two_exp(&pow2_d, exp - num_bits_extract); + frac = modf(ldexp(frac, num_bits_extract), &integer); + __ull2dec(&int_d, (unsigned long long)integer); + __timesdec(d, &int_d, &pow2_d); + d->sign = sign; + } +} + +/* 80363124-803632C8 35DA64 01A4+00 0/0 2/2 0/0 .text __num2dec */ +void __num2dec(const decform* form, double x, decimal* d) { + short digits = form->digits; + int i; + __num2dec_internal(d, x); + + if (d->sig.text[0] > 9) { + return; + } + + if (digits > SIGDIGLEN) { + digits = SIGDIGLEN; + } + + __rounddec(d, digits); + + while (d->sig.length < digits) { + d->sig.text[d->sig.length++] = 0; + } + + d->exp -= d->sig.length - 1; + + for (i = 0; i < d->sig.length; i++) { + d->sig.text[i] += '0'; + } +} diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/Makefile b/libs/PowerPC_EABI_Support/MSL/MSL_C/Makefile new file mode 100644 index 0000000000..aefddcccdb --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/Makefile @@ -0,0 +1,151 @@ +# +# Generated By: dol2asm +# + +LIBMSL_C_PPCEABI_BARE_H_A_CPP_FILES := \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c \ + libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c \ + +LIBMSL_C_PPCEABI_BARE_H_A_O_FILES := \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.o \ + +LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS := \ + -O4,p \ + -lang=c \ + -fp_contract on \ + -use_lmw_stmw on \ + -inline deferred,auto \ + +LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS := \ + -nodefaults \ + -fp hard \ + -proc gekko \ + -linkmode moreram \ + +$(BUILD_DIR)/libMSL_C.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) + @echo linking... $(BUILD_DIR)/libMSL_C.a + @echo $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) > build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles + @$(LD) -xm l $(LIBMSL_C_PPCEABI_BARE_H_A_LDFLAGS) -o $(BUILD_DIR)/libMSL_C.a @build/LIBMSL_C_PPCEABI_BARE_H_A_ofiles + +$(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/%.o: libs/PowerPC_EABI_Support/MSL/MSL_C/%.c $(BUILD_DIR)/libs/PowerPC_EABI_Support/MSL/MSL_C/%.d + @mkdir -p $(@D) + @echo building... $< + @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c + @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBMSL_C_PPCEABI_BARE_H_A_D_FILES := $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES:.o=.d) +$(LIBMSL_C_PPCEABI_BARE_H_A_D_FILES): +include $(wildcard $(LIBMSL_C_PPCEABI_BARE_H_A_D_FILES)) +endif + diff --git a/include/MSL_C/PPC_EABI/Src/critical_regions.gamecube.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h similarity index 100% rename from include/MSL_C/PPC_EABI/Src/critical_regions.gamecube.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h diff --git a/include/MSL_C/PPC_EABI/Src/math_ppc.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h similarity index 100% rename from include/MSL_C/PPC_EABI/Src/math_ppc.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h diff --git a/include/MSL_C/PPC_EABI/Src/uart_console_io_gcn.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h similarity index 75% rename from include/MSL_C/PPC_EABI/Src/uart_console_io_gcn.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h index a821c1e851..e428ccd31d 100644 --- a/include/MSL_C/PPC_EABI/Src/uart_console_io_gcn.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h @@ -1,6 +1,6 @@ #ifndef PPC_EABI_SRC_UART_CONSOLE_IO_GCN_H #define PPC_EABI_SRC_UART_CONSOLE_IO_GCN_H -#include "MSL_C/MSL_Common/Src/ansi_files.h" +#include "ansi_files.h" #endif /* PPC_EABI_SRC_UART_CONSOLE_IO_GCN_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c new file mode 100644 index 0000000000..bb9b68f165 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c @@ -0,0 +1,10 @@ +#include "critical_regions.gamecube.h" + +/* 8036546C-80365470 35FDAC 0004+00 0/0 2/2 0/0 .text __kill_critical_regions */ +void __kill_critical_regions() {} + +/* 80365468-8036546C 35FDA8 0004+00 0/0 12/12 0/0 .text __begin_critical_region */ +void __begin_critical_region() {} + +/* 80365464-80365468 35FDA4 0004+00 0/0 12/12 0/0 .text __end_critical_region */ +void __end_critical_region() {} \ No newline at end of file diff --git a/libs/MSL_C/PPC_EABI/Src/math_ppc.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c similarity index 54% rename from libs/MSL_C/PPC_EABI/Src/math_ppc.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c index c118d913c9..c1cef60e8d 100644 --- a/libs/MSL_C/PPC_EABI/Src/math_ppc.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c @@ -1,40 +1,22 @@ -// -// Generated By: dol2asm -// Translation Unit: PPC_EABI/Src/math_ppc -// - -#include "MSL_C/PPC_EABI/Src/math_ppc.h" +#include "math_ppc.h" #include "fdlibm.h" -// -// Forward References: -// - -float tanf(float); -float sinf(float); -float cosf(float); -float acosf(float); - -// -// Declarations: -// - /* 8036CA30-8036CA54 367370 0024+00 0/0 1/1 0/0 .text acosf */ -float acosf(float x) { +__declspec(weak) float acosf(float x) { return acos(x); } /* 8036CA0C-8036CA30 36734C 0024+00 0/0 4/4 0/0 .text cosf */ -float cosf(float x) { +__declspec(weak) float cosf(float x) { return cos(x); } /* 8036C9E8-8036CA0C 367328 0024+00 0/0 4/4 0/0 .text sinf */ -float sinf(float x) { +__declspec(weak) float sinf(float x) { return sin(x); } /* 8036C9C4-8036C9E8 367304 0024+00 0/0 2/2 0/0 .text tanf */ -float tanf(float x) { +__declspec(weak) float tanf(float x) { return tan(x); } diff --git a/libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c similarity index 95% rename from libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c index da80f4720a..190770e1e5 100644 --- a/libs/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c @@ -1,4 +1,4 @@ -#include "MSL_C/PPC_EABI/Src/uart_console_io_gcn.h" +#include "uart_console_io_gcn.h" #include "dolphin/os/OS.h" int InitializeUART(size_t); diff --git a/include/Runtime.PPCEABI.H/CPlusLibPPC.h b/libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h similarity index 100% rename from include/Runtime.PPCEABI.H/CPlusLibPPC.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h diff --git a/include/Runtime.PPCEABI.H/GCN_mem_alloc.h b/libs/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h similarity index 100% rename from include/Runtime.PPCEABI.H/GCN_mem_alloc.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h diff --git a/include/Runtime.PPCEABI.H/Gecko_ExceptionPPC.h b/libs/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h similarity index 100% rename from include/Runtime.PPCEABI.H/Gecko_ExceptionPPC.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h diff --git a/include/Runtime.PPCEABI.H/NMWException.h b/libs/PowerPC_EABI_Support/Runtime/Inc/NMWException.h similarity index 100% rename from include/Runtime.PPCEABI.H/NMWException.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/NMWException.h diff --git a/include/Runtime.PPCEABI.H/__init_cpp_exceptions.h b/libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h similarity index 100% rename from include/Runtime.PPCEABI.H/__init_cpp_exceptions.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h diff --git a/include/Runtime.PPCEABI.H/__va_arg.h b/libs/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h similarity index 100% rename from include/Runtime.PPCEABI.H/__va_arg.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h diff --git a/include/Runtime.PPCEABI.H/global_destructor_chain.h b/libs/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h similarity index 100% rename from include/Runtime.PPCEABI.H/global_destructor_chain.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h diff --git a/include/Runtime.PPCEABI.H/ptmf.h b/libs/PowerPC_EABI_Support/Runtime/Inc/ptmf.h similarity index 100% rename from include/Runtime.PPCEABI.H/ptmf.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/ptmf.h diff --git a/include/Runtime.PPCEABI.H/runtime.h b/libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h similarity index 100% rename from include/Runtime.PPCEABI.H/runtime.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h diff --git a/libs/Runtime.PPCEABI.H/CPlusLibPPC.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cpp similarity index 86% rename from libs/Runtime.PPCEABI.H/CPlusLibPPC.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cpp index 4d775b002f..ff76e3cbb3 100644 --- a/libs/Runtime.PPCEABI.H/CPlusLibPPC.cpp +++ b/libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cpp @@ -1,4 +1,4 @@ -#include "Runtime.PPCEABI.H/CPlusLibPPC.h" +#include "CPlusLibPPC.h" /* 80361C3C-80361C6C 35C57C 0030+00 0/0 0/0 4/4 .text __copy */ extern "C" void* __copy(char *dest, char *src, size_t size) { diff --git a/libs/Runtime.PPCEABI.H/GCN_Mem_Alloc.c b/libs/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c similarity index 100% rename from libs/Runtime.PPCEABI.H/GCN_Mem_Alloc.c rename to libs/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c diff --git a/libs/Runtime.PPCEABI.H/Gecko_ExceptionPPC.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cpp similarity index 95% rename from libs/Runtime.PPCEABI.H/Gecko_ExceptionPPC.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cpp index 0174c3f045..e12002a30a 100644 --- a/libs/Runtime.PPCEABI.H/Gecko_ExceptionPPC.cpp +++ b/libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cpp @@ -3,7 +3,7 @@ // Translation Unit: Gecko_ExceptionPPC // -#include "Runtime.PPCEABI.H/Gecko_ExceptionPPC.h" +#include "Gecko_ExceptionPPC.h" #include "dolphin/types.h" // diff --git a/libs/PowerPC_EABI_Support/Runtime/Src/Makefile b/libs/PowerPC_EABI_Support/Runtime/Src/Makefile new file mode 100644 index 0000000000..d5a0201935 --- /dev/null +++ b/libs/PowerPC_EABI_Support/Runtime/Src/Makefile @@ -0,0 +1,64 @@ +# +# Generated By: dol2asm +# + +LIBRUNTIME_PPCEABI_H_A_CPP_FILES := \ + libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c \ + libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.cpp \ + libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cpp \ + libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cpp \ + libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c \ + libs/PowerPC_EABI_Support/Runtime/Src/runtime.cpp \ + libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp \ + libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cpp \ + libs/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c \ + +LIBRUNTIME_PPCEABI_H_A_O_FILES := \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/NMWException.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/ptmf.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/runtime.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.o \ + $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.o \ + +LIBRUNTIME_PPCEABI_H_A_CFLAGS := \ + -O4,p \ + +LIBRUNTIME_PPCEABI_H_A_LDFLAGS := \ + -nodefaults \ + -fp hard \ + -proc gekko \ + -linkmode moreram \ + +$(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.o: CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O4,p -nodefaults -str readonly -RTTI off -maxerrors 5 -enum int $(INCLUDES) -lang=c +$(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.o: CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O4,p -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) -lang=c + + +$(BUILD_DIR)/libRuntime.PPCEABI.H.a: $(LIBRUNTIME_PPCEABI_H_A_O_FILES) + @echo linking... $(BUILD_DIR)/libRuntime.PPCEABI.H.a + @echo $(LIBRUNTIME_PPCEABI_H_A_O_FILES) > build/LIBRUNTIME_PPCEABI_H_A_ofiles + @$(LD) -xm l $(LIBRUNTIME_PPCEABI_H_A_LDFLAGS) -o $(BUILD_DIR)/libRuntime.PPCEABI.H.a @build/LIBRUNTIME_PPCEABI_H_A_ofiles + +$(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/%.o: libs/PowerPC_EABI_Support/Runtime/Src/%.cpp $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/%.d + @mkdir -p $(@D) + @echo building... $< + @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp + @$(CC) $(CFLAGS) $(LIBRUNTIME_PPCEABI_H_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +$(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/%.o: libs/PowerPC_EABI_Support/Runtime/Src/%.c $(BUILD_DIR)/libs/PowerPC_EABI_Support/Runtime/Src/%.d + @mkdir -p $(@D) + @echo building... $< + @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c + @$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c + @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi + +ifndef DISABLE_DEPS +LIBRUNTIME_PPCEABI_H_A_D_FILES := $(LIBRUNTIME_PPCEABI_H_A_O_FILES:.o=.d) +$(LIBRUNTIME_PPCEABI_H_A_D_FILES): +include $(wildcard $(LIBRUNTIME_PPCEABI_H_A_D_FILES)) +endif + diff --git a/libs/Runtime.PPCEABI.H/NMWException.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cpp similarity index 98% rename from libs/Runtime.PPCEABI.H/NMWException.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cpp index 166b3d2348..97b5e61c0a 100644 --- a/libs/Runtime.PPCEABI.H/NMWException.cpp +++ b/libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cpp @@ -3,7 +3,7 @@ // Translation Unit: NMWException // -#include "Runtime.PPCEABI.H/NMWException.h" +#include "NMWException.h" #include "dol2asm.h" // diff --git a/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp similarity index 98% rename from libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp index f01bca5796..6d58ad5cda 100644 --- a/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp +++ b/libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp @@ -3,7 +3,7 @@ // Translation Unit: __init_cpp_exceptions // -#include "Runtime.PPCEABI.H/__init_cpp_exceptions.h" +#include "__init_cpp_exceptions.h" #include "dol2asm.h" // diff --git a/libs/Runtime.PPCEABI.H/__va_arg.c b/libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c similarity index 96% rename from libs/Runtime.PPCEABI.H/__va_arg.c rename to libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c index c6e8bc63d8..a95dddd2eb 100644 --- a/libs/Runtime.PPCEABI.H/__va_arg.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c @@ -1,4 +1,4 @@ -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "__va_arg.h" #undef __va_arg diff --git a/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.cpp similarity index 95% rename from libs/Runtime.PPCEABI.H/global_destructor_chain.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.cpp index 085ee760cc..b31b94b9d2 100644 --- a/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.cpp @@ -3,7 +3,7 @@ // Translation Unit: global_destructor_chain // -#include "Runtime.PPCEABI.H/global_destructor_chain.h" +#include "global_destructor_chain.h" #include "dolphin/types.h" // diff --git a/libs/Runtime.PPCEABI.H/ptmf.c b/libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c similarity index 97% rename from libs/Runtime.PPCEABI.H/ptmf.c rename to libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c index 28cac8b026..11d0592905 100644 --- a/libs/Runtime.PPCEABI.H/ptmf.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c @@ -1,4 +1,4 @@ -#include "Runtime.PPCEABI.H/ptmf.h" +#include "ptmf.h" /* ############################################################################################## */ /* 803A2180-803A2190 02E7E0 000C+04 0/0 23/23 249/249 .rodata __ptmf_null */ diff --git a/libs/Runtime.PPCEABI.H/runtime.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/runtime.cpp similarity index 99% rename from libs/Runtime.PPCEABI.H/runtime.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/runtime.cpp index 21dbf6f506..40996ecf48 100644 --- a/libs/Runtime.PPCEABI.H/runtime.cpp +++ b/libs/PowerPC_EABI_Support/Runtime/Src/runtime.cpp @@ -3,7 +3,7 @@ // Translation Unit: runtime // -#include "Runtime.PPCEABI.H/runtime.h" +#include "runtime.h" #include "dol2asm.h" // diff --git a/libs/Runtime.PPCEABI.H/Makefile b/libs/Runtime.PPCEABI.H/Makefile deleted file mode 100644 index 21ca78fcac..0000000000 --- a/libs/Runtime.PPCEABI.H/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Generated By: dol2asm -# - -LIBRUNTIME_PPCEABI_H_A_CPP_FILES := \ - libs/Runtime.PPCEABI.H/__va_arg.c \ - libs/Runtime.PPCEABI.H/global_destructor_chain.cpp \ - libs/Runtime.PPCEABI.H/CPlusLibPPC.cpp \ - libs/Runtime.PPCEABI.H/NMWException.cpp \ - libs/Runtime.PPCEABI.H/ptmf.c \ - libs/Runtime.PPCEABI.H/runtime.cpp \ - libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp \ - libs/Runtime.PPCEABI.H/Gecko_ExceptionPPC.cpp \ - libs/Runtime.PPCEABI.H/GCN_Mem_Alloc.c \ - -LIBRUNTIME_PPCEABI_H_A_O_FILES := \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/__va_arg.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/global_destructor_chain.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/CPlusLibPPC.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/NMWException.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/ptmf.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/runtime.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/Gecko_ExceptionPPC.o \ - $(BUILD_DIR)/libs/Runtime.PPCEABI.H/GCN_Mem_Alloc.o \ - -LIBRUNTIME_PPCEABI_H_A_CFLAGS := \ - -O4,p \ - -LIBRUNTIME_PPCEABI_H_A_LDFLAGS := \ - -nodefaults \ - -fp hard \ - -proc gekko \ - -linkmode moreram \ - -$(BUILD_DIR)/libs/Runtime.PPCEABI.H/GCN_Mem_Alloc.o: CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O4,p -nodefaults -str readonly -RTTI off -maxerrors 5 -enum int $(INCLUDES) -lang=c -$(BUILD_DIR)/libs/Runtime.PPCEABI.H/__va_arg.o: CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O4,p -nodefaults -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) -lang=c - - -$(BUILD_DIR)/libRuntime.PPCEABI.H.a: $(LIBRUNTIME_PPCEABI_H_A_O_FILES) - @echo linking... $(BUILD_DIR)/libRuntime.PPCEABI.H.a - @echo $(LIBRUNTIME_PPCEABI_H_A_O_FILES) > build/LIBRUNTIME_PPCEABI_H_A_ofiles - @$(LD) -xm l $(LIBRUNTIME_PPCEABI_H_A_LDFLAGS) -o $(BUILD_DIR)/libRuntime.PPCEABI.H.a @build/LIBRUNTIME_PPCEABI_H_A_ofiles - -$(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.cpp $(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.d - @mkdir -p $(@D) - @echo building... $< - @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBRUNTIME_PPCEABI_H_A_CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).cpp - @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi - -$(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.c $(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.d - @mkdir -p $(@D) - @echo building... $< - @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).c - @$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $(dir $@) $(basename $@).c - @if [ -z '$(DISABLE_DEPS)' ]; then tools/transform-dep.py '$(basename $@).d' '$(basename $@).d'; touch -c $@; fi - -ifndef DISABLE_DEPS -LIBRUNTIME_PPCEABI_H_A_D_FILES := $(LIBRUNTIME_PPCEABI_H_A_O_FILES:.o=.d) -$(LIBRUNTIME_PPCEABI_H_A_D_FILES): -include $(wildcard $(LIBRUNTIME_PPCEABI_H_A_D_FILES)) -endif - diff --git a/libs/SSystem/SComponent/c_API.cpp b/libs/SSystem/SComponent/c_API.cpp index cf86dccd53..1d9648089b 100644 --- a/libs/SSystem/SComponent/c_API.cpp +++ b/libs/SSystem/SComponent/c_API.cpp @@ -1,29 +1,20 @@ -// -// Generated By: dol2asm -// Translation Unit: c_API -// +/** + * c_API.cpp + * + */ #include "SSystem/SComponent/c_API.h" -#include "dolphin/types.h" -// -// External References: -// - -void mDoGph_BlankingON(); -void mDoGph_BlankingOFF(); -void mDoGph_BeforeOfDraw(); -void mDoGph_AfterOfDraw(); -void mDoGph_Painter(); -void mDoGph_Create(); - -// -// Declarations: -// +extern void mDoGph_BlankingON(); +extern void mDoGph_BlankingOFF(); +extern void mDoGph_BeforeOfDraw(); +extern void mDoGph_AfterOfDraw(); +extern void mDoGph_Painter(); +extern void mDoGph_Create(); /* ############################################################################################## */ /* 803C3528-803C3540 0018+00 s=0 e=3 z=0 None .data g_cAPI_Interface */ -cAPIGph_Mthd g_cAPI_Interface[6] = { +cAPI_Interface g_cAPI_Interface = { mDoGph_Create, mDoGph_BeforeOfDraw, mDoGph_AfterOfDraw, mDoGph_Painter, mDoGph_BlankingON, mDoGph_BlankingOFF, }; diff --git a/libs/SSystem/SComponent/c_API_controller_pad.cpp b/libs/SSystem/SComponent/c_API_controller_pad.cpp index f48e944c1e..bda669e842 100644 --- a/libs/SSystem/SComponent/c_API_controller_pad.cpp +++ b/libs/SSystem/SComponent/c_API_controller_pad.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: c_API_controller_pad -// +/** + * c_API_controller_pad.cpp + * Controller Pad API utilities + */ #include "SSystem/SComponent/c_API_controller_pad.h" #include "m_Do/m_Do_controller_pad.h" diff --git a/libs/SSystem/SComponent/c_API_graphic.cpp b/libs/SSystem/SComponent/c_API_graphic.cpp index 4a216a1648..853bc777f6 100644 --- a/libs/SSystem/SComponent/c_API_graphic.cpp +++ b/libs/SSystem/SComponent/c_API_graphic.cpp @@ -1,27 +1,22 @@ -// -// Generated By: dol2asm -// Translation Unit: c_API_graphic -// +/** + * c_API_graphic.cpp + * + */ #include "SSystem/SComponent/c_API_graphic.h" #include "SSystem/SComponent/c_API.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 802632C8-802632F8 0030+00 s=0 e=1 z=0 None .text cAPIGph_Painter__Fv */ -void cAPIGph_Painter(void) { - g_cAPI_Interface[3](); +void cAPIGph_Painter() { + g_cAPI_Interface.painterMtd(); } /* 802632F8-80263328 0030+00 s=0 e=1 z=0 None .text cAPIGph_BeforeOfDraw__Fv */ -void cAPIGph_BeforeOfDraw(void) { - g_cAPI_Interface[1](); +void cAPIGph_BeforeOfDraw() { + g_cAPI_Interface.beforeOfDrawMtd(); } /* 80263328-80263358 0030+00 s=0 e=1 z=0 None .text cAPIGph_AfterOfDraw__Fv */ -void cAPIGph_AfterOfDraw(void) { - g_cAPI_Interface[2](); +void cAPIGph_AfterOfDraw() { + g_cAPI_Interface.afterOfDrawMtd(); } diff --git a/libs/SSystem/SComponent/c_angle.cpp b/libs/SSystem/SComponent/c_angle.cpp index 866196afb9..5a2c51cc9b 100644 --- a/libs/SSystem/SComponent/c_angle.cpp +++ b/libs/SSystem/SComponent/c_angle.cpp @@ -1,17 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: c_angle -// +/** + * c_angle.cpp + * + */ #include "SSystem/SComponent/c_angle.h" #include "dolphin/types.h" extern f32 cM_atan2f(f32, f32); -// -// Declarations: -// - const cSAngle cSAngle::_0(static_cast(0)); const cSAngle cSAngle::_1(static_cast(0xb6)); const cSAngle cSAngle::_90(static_cast(0x4000)); diff --git a/libs/SSystem/SComponent/c_bg_s_chk.cpp b/libs/SSystem/SComponent/c_bg_s_chk.cpp index 5d18dfaf53..1455d73699 100644 --- a/libs/SSystem/SComponent/c_bg_s_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_chk.cpp @@ -1,38 +1,33 @@ -// -// Generated By: dol2asm -// Translation Unit: c_bg_s_chk -// +/** + * c_bg_s_chk.cpp + * + */ #include "SSystem/SComponent/c_bg_s_chk.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80267B4C-80267B70 26248C 0024+00 0/0 7/7 0/0 .text __ct__8cBgS_ChkFv */ -cBgS_Chk::cBgS_Chk(void) { +cBgS_Chk::cBgS_Chk() { mPolyPassChk = 0; mGrpPassChk = 0; unk_0x0C = 1; } /* 80267B70-80267BB8 2624B0 0048+00 1/0 7/7 0/0 .text __dt__8cBgS_ChkFv */ -cBgS_Chk::~cBgS_Chk(void) {} +cBgS_Chk::~cBgS_Chk() {} /* 80267BB8-80267BDC 2624F8 0024+00 0/0 4/4 0/0 .text SetExtChk__8cBgS_ChkFR8cBgS_Chk */ -void cBgS_Chk::SetExtChk(cBgS_Chk& pOther) { - mPolyPassChk = pOther.mPolyPassChk; - mGrpPassChk = pOther.mGrpPassChk; - mActorPid = pOther.mActorPid; - unk_0x0C = pOther.unk_0x0C; +void cBgS_Chk::SetExtChk(cBgS_Chk& other) { + mPolyPassChk = other.mPolyPassChk; + mGrpPassChk = other.mGrpPassChk; + mActorPid = other.mActorPid; + unk_0x0C = other.unk_0x0C; } /* 80267BDC-80267C1C 26251C 0040+00 0/0 7/7 0/0 .text ChkSameActorPid__8cBgS_ChkCFUi */ -bool cBgS_Chk::ChkSameActorPid(unsigned int pUint) const { - if (mActorPid == -1 || pUint == UINT32_MAX || unk_0x0C == 0) { - return 0; +bool cBgS_Chk::ChkSameActorPid(unsigned int pid) const { + if (mActorPid == -1 || pid == UINT32_MAX || unk_0x0C == 0) { + return FALSE; } else { - return (mActorPid == pUint) ? 1 : 0; + return (mActorPid == pid) ? TRUE : FALSE; } } diff --git a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp index b70e43b0b1..ab43431f0f 100644 --- a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp @@ -1,23 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: c_bg_s_gnd_chk -// +/** + * c_bg_s_gnd_chk.cpp + * + */ #include "SSystem/SComponent/c_bg_s_gnd_chk.h" -#include "dolphin/types.h" - -// -// Types: -// - -// -// Declarations: -// /* 80267C1C-80267C94 26255C 0078+00 0/0 2/2 123/123 .text __ct__11cBgS_GndChkFv */ cBgS_GndChk::cBgS_GndChk() { m_pos = cXyz::Zero; - SetActorPid(0xFFFFFFFF); + SetActorPid(UINT32_MAX); mFlags = 2; } @@ -25,14 +16,14 @@ cBgS_GndChk::cBgS_GndChk() { cBgS_GndChk::~cBgS_GndChk() {} /* 80267D0C-80267D28 26264C 001C+00 0/0 0/0 62/62 .text SetPos__11cBgS_GndChkFPC3Vec */ -void cBgS_GndChk::SetPos(Vec const* pVec) { - m_pos = *pVec; +void cBgS_GndChk::SetPos(Vec const* pos) { + m_pos = *pos; } /* 80267D28-80267D44 262668 001C+00 0/0 51/51 185/185 .text SetPos__11cBgS_GndChkFPC4cXyz */ -void cBgS_GndChk::SetPos(cXyz const* pVec) { - m_pos = *pVec; +void cBgS_GndChk::SetPos(cXyz const* pos) { + m_pos = *pos; } /* 80267D44-80267D54 262684 0010+00 0/0 1/1 0/0 .text PreCheck__11cBgS_GndChkFv */ diff --git a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp index 3ce90aae62..e513eaa728 100644 --- a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -1,19 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: c_bg_s_lin_chk -// +/** + * c_bg_s_lin_chk.cpp + * + */ #include "SSystem/SComponent/c_bg_s_lin_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80267D5C-80267DBC 26269C 0060+00 0/0 2/2 0/0 .text __ct__11cBgS_LinChkFv */ cBgS_LinChk::cBgS_LinChk() { - this->ct(); + ct(); } /* 80267DBC-80267E48 2626FC 008C+00 2/1 2/2 0/0 .text __dt__11cBgS_LinChkFv */ @@ -21,19 +15,20 @@ cBgS_LinChk::~cBgS_LinChk() {} /* 80267E48-80267ED0 262788 0088+00 1/1 0/0 0/0 .text ct__11cBgS_LinChkFv */ void cBgS_LinChk::ct() { - cXyz xyz(cXyz::Zero); - mLin.SetStartEnd(xyz, xyz); - field_0x40 = xyz; - SetActorPid(0xFFFFFFFF); + cXyz start_end(cXyz::Zero); + mLin.SetStartEnd(start_end, start_end); + field_0x40 = start_end; + + SetActorPid(UINT32_MAX); field_0x4c = 0; mFrontFlag = 1; mBackFlag = 0; } /* 80267ED0-80267F40 262810 0070+00 0/0 2/2 0/0 .text Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi */ -void cBgS_LinChk::Set2(cXyz const* pStart, cXyz const* pEnd, unsigned int actorPid) { - mLin.SetStartEnd(*pStart, *pEnd); - field_0x40 = *pEnd; +void cBgS_LinChk::Set2(cXyz const* startPos, cXyz const* endPos, unsigned int actorPid) { + mLin.SetStartEnd(*startPos, *endPos); + field_0x40 = *endPos; SetActorPid(actorPid); field_0x4c &= ~0x10; ClearPi(); diff --git a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp index 9ba72c820e..1f247e5134 100644 --- a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp +++ b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp @@ -1,10 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: c_bg_s_poly_info -// +/** + * c_bg_s_poly_info.cpp + * + */ #include "SSystem/SComponent/c_bg_s_poly_info.h" -#include "dolphin/types.h" /* 80268074-802680B0 2629B4 003C+00 0/0 7/7 9/9 .text __ct__13cBgS_PolyInfoFv */ cBgS_PolyInfo::cBgS_PolyInfo() { diff --git a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp index 0d92ff4985..84e874452a 100644 --- a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp +++ b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: c_bg_s_shdw_draw -// +/** + * c_bg_s_shdw_draw.cpp + * + */ #include "SSystem/SComponent/c_bg_s_shdw_draw.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80267F88-80267FD0 2628C8 0048+00 0/0 1/1 0/0 .text __ct__13cBgS_ShdwDrawFv */ cBgS_ShdwDraw::cBgS_ShdwDraw() {} @@ -19,12 +13,12 @@ cBgS_ShdwDraw::~cBgS_ShdwDraw() {} /* 80268048-8026806C 262988 0024+00 0/0 1/1 0/0 .text Set__13cBgS_ShdwDrawFR4cXyzR4cXyz */ -void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) { - mM3dGAab.Set(¶m_0, ¶m_1); +void cBgS_ShdwDraw::Set(cXyz& bound_min, cXyz& bound_max) { + mM3dGAab.Set(&bound_min, &bound_max); } /* 8026806C-80268074 -00001 0008+00 0/0 0/0 0/0 .text * SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i */ -void cBgS_ShdwDraw::SetCallback(cBgS_ShdwDraw_Callback pCallback) { - mCallbackFun = pCallback; +void cBgS_ShdwDraw::SetCallback(cBgS_ShdwDraw_Callback callback) { + mCallbackFun = callback; } diff --git a/libs/SSystem/SComponent/c_bg_w.cpp b/libs/SSystem/SComponent/c_bg_w.cpp index d3f3acce58..5a8de7a5de 100644 --- a/libs/SSystem/SComponent/c_bg_w.cpp +++ b/libs/SSystem/SComponent/c_bg_w.cpp @@ -1,18 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: c_bg_w -// +/** + * c_bg_w.cpp + * + */ #include "SSystem/SComponent/c_bg_w.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 802681C0-802681C8 262B00 0008+00 0/0 1/1 0/0 .text Regist__9cBgW_BgIdFi */ -void cBgW_BgId::Regist(int a1) { - m_id = a1; +void cBgW_BgId::Regist(int id) { + m_id = id; } /* 802681C8-802681D4 262B08 000C+00 0/0 2/2 0/0 .text Release__9cBgW_BgIdFv */ @@ -26,18 +21,18 @@ bool cBgW_BgId::ChkUsed() const { } /* 802681E4-802681FC 262B24 0018+00 1/1 22/22 8/8 .text cBgW_CheckBGround__Ff */ -bool cBgW_CheckBGround(float a1) { - return a1 >= 0.5f; +bool cBgW_CheckBGround(float y) { + return y >= 0.5f; } /* 802681FC-80268210 262B3C 0014+00 1/1 6/6 0/0 .text cBgW_CheckBRoof__Ff */ -bool cBgW_CheckBRoof(float a1) { - return a1 < (-4.0f / 5.0f); +bool cBgW_CheckBRoof(float y) { + return y < (-4.0f / 5.0f); } /* 80268210-80268260 262B50 0050+00 0/0 16/16 4/4 .text cBgW_CheckBWall__Ff */ -bool cBgW_CheckBWall(float a1) { - if (!cBgW_CheckBGround(a1) && !cBgW_CheckBRoof(a1)) +bool cBgW_CheckBWall(float y) { + if (!cBgW_CheckBGround(y) && !cBgW_CheckBRoof(y)) return true; return false; diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 8fddb02028..3ae8601816 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -1,10 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: c_cc_d -// +/** + * c_cc_d.cpp + * + */ #include "SSystem/SComponent/c_cc_d.h" -#include "dolphin/types.h" /* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr */ @@ -21,7 +20,8 @@ void cCcD_DivideInfo::Set(u32 xDivInfo, u32 yDivInfo, u32 zDivInfo) { */ bool cCcD_DivideInfo::Chk(cCcD_DivideInfo const& other) const { if ((mXDivInfo & other.mXDivInfo) == 0 || (mZDivInfo & other.mZDivInfo) == 0 || - (mYDivInfo & other.mYDivInfo) == 0) { + (mYDivInfo & other.mYDivInfo) == 0) + { return false; } else { return true; @@ -122,8 +122,7 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab cons /* 802636A0-80263894 25DFE0 01F4+00 0/0 3/3 0/0 .text * CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab */ -void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, - cM3dGAab const& aab) { +void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, cM3dGAab const& aab) { u32 xDivInfo, yDivInfo, zDivInfo; if (!mXDiffIsZero) { s32 var1 = mInvScaledXDiff * (aab.mMin.x - mMin.x); diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index 5d040ddfd1..ee9f8296d9 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -1,14 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: c_cc_s -// +/** + * c_cc_s.cpp + * + */ #include "SSystem/SComponent/c_cc_s.h" -#include "global.h" - -// -// Declarations: -// /* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */ cCcS::cCcS() {} @@ -19,14 +14,17 @@ void cCcS::Ct() { *obj = NULL; } mObjAtCount = 0; + for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + ARRAY_SIZE(mpObjTg); ++obj) { *obj = NULL; } mObjTgCount = 0; + for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + ARRAY_SIZE(mpObjCo); ++obj) { *obj = NULL; } mObjCoCount = 0; + for (cCcD_Obj** obj = mpObj; obj < mpObj + ARRAY_SIZE(mpObj); ++obj) { *obj = NULL; } @@ -35,7 +33,7 @@ void cCcS::Ct() { /* 80264B60-80264B80 25F4A0 0020+00 0/0 1/1 0/0 .text Dt__4cCcSFv */ void cCcS::Dt() { - this->Ct(); + Ct(); } /* 80264B80-80264BA8 25F4C0 0028+00 1/1 0/0 0/0 .text GetWt__4cCcSCFUc */ @@ -57,18 +55,21 @@ void cCcS::Set(cCcD_Obj* obj) { mObjAtCount++; } } + if (obj->ChkTgSet()) { if (mObjTgCount < ARRAY_SIZE(mpObjTg)) { mpObjTg[mObjTgCount] = obj; mObjTgCount++; } } + if (obj->ChkCoSet()) { if (mObjCoCount < ARRAY_SIZE(mpObjCo)) { mpObjCo[mObjCoCount] = obj; mObjCoCount++; } } + if (mObjCount < ARRAY_SIZE(mpObj)) { mpObj[mObjCount] = obj; mObjCount++; @@ -77,9 +78,10 @@ void cCcS::Set(cCcD_Obj* obj) { /* 80264C5C-80264CF0 25F59C 0094+00 1/1 0/0 0/0 .text ClrCoHitInf__4cCcSFv */ void cCcS::ClrCoHitInf() { - for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + this->mObjCoCount; ++obj) { + for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + mObjCoCount; ++obj) { if (*obj != NULL) { (*obj)->GetGObjInf()->ClrCoHit(); + cCcD_Stts* stts = (*obj)->GetStts(); if (stts != NULL) { stts->ClrCcMove(); @@ -90,9 +92,10 @@ void cCcS::ClrCoHitInf() { /* 80264CF0-80264D90 25F630 00A0+00 1/1 0/0 0/0 .text ClrTgHitInf__4cCcSFv */ void cCcS::ClrTgHitInf() { - for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + this->mObjTgCount; ++obj) { + for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + mObjTgCount; ++obj) { if (*obj != NULL) { (*obj)->GetGObjInf()->ClrTgHit(); + cCcD_Stts* stts = (*obj)->GetStts(); if (stts != NULL) { stts->ClrTg(); @@ -103,9 +106,10 @@ void cCcS::ClrTgHitInf() { /* 80264D90-80264E2C 25F6D0 009C+00 1/1 0/0 0/0 .text ClrAtHitInf__4cCcSFv */ void cCcS::ClrAtHitInf() { - for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + this->mObjAtCount; ++obj) { + for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + mObjAtCount; ++obj) { if (*obj != NULL) { (*obj)->GetGObjInf()->ClrAtHit(); + cCcD_Stts* stts = (*obj)->GetStts(); if (stts != NULL) { stts->ClrAt(); @@ -119,36 +123,40 @@ bool cCcS::ChkNoHitAtTg(cCcD_Obj* obj1, cCcD_Obj* obj2) { fopAc_ac_c* ac1 = obj1->GetAc(); fopAc_ac_c* ac2 = obj2->GetAc(); if ((ac1 != NULL && ac2 != NULL && ac1 == ac2) || (obj1->GetAtGrp() & obj2->GetTgGrp()) == 0 || - (obj1->GetAtType() & obj2->GetTgType()) == 0) { + (obj1->GetAtType() & obj2->GetTgType()) == 0) + { return 1; } else { - return this->ChkNoHitGAtTg(obj1->GetGObjInf(), obj2->GetGObjInf(), - obj1->GetStts()->GetGStts(), obj2->GetStts()->GetGStts()); + return ChkNoHitGAtTg(obj1->GetGObjInf(), obj2->GetGObjInf(), obj1->GetStts()->GetGStts(), + obj2->GetStts()->GetGStts()); } } /* 80264F40-8026515C 25F880 021C+00 1/1 0/0 0/0 .text ChkAtTg__4cCcSFv */ void cCcS::ChkAtTg() { cCcD_Obj** objTgEnd = mpObjTg + mObjTgCount; - this->ClrAtHitInf(); - this->ClrTgHitInf(); + ClrAtHitInf(); + ClrTgHitInf(); for (cCcD_Obj** pObjAt = mpObjAt; pObjAt < mpObjAt + mObjAtCount; ++pObjAt) { if (*pObjAt == NULL || !(*pObjAt)->ChkAtSet()) continue; + cCcD_ShapeAttr* atShapeAttr = (*pObjAt)->GetShapeAttr(); for (cCcD_Obj** pObjTg = mpObjTg; pObjTg < objTgEnd; ++pObjTg) { if (*pObjTg == NULL || !(*pObjTg)->ChkTgSet()) continue; if (!(*pObjAt)->GetDivideInfo().Chk((*pObjTg)->GetDivideInfo())) continue; - if (this->ChkNoHitAtTg(*pObjAt, *pObjTg)) + if (ChkNoHitAtTg(*pObjAt, *pObjTg)) continue; + cCcD_ShapeAttr* tgShapeAttr = (*pObjTg)->GetShapeAttr(); + static cXyz cross; bool didCross = atShapeAttr->CrossAtTg(*tgShapeAttr, &cross); bool anyBsRevHit = (*pObjAt)->ChkBsRevHit() || (*pObjTg)->ChkBsRevHit(); if (!anyBsRevHit && didCross) { - this->SetAtTgCommonHitInf(*pObjAt, *pObjTg, &cross); + SetAtTgCommonHitInf(*pObjAt, *pObjTg, &cross); } else if (anyBsRevHit && !didCross) { cCcD_ShapeAttr* atShape2 = (*pObjAt)->GetShapeAttr(); if (atShape2 == NULL) { @@ -156,7 +164,8 @@ void cCcS::ChkAtTg() { } else { atShape2->GetWorkAab().CalcCenter(&cross); } - this->SetAtTgCommonHitInf(*pObjAt, *pObjTg, &cross); + + SetAtTgCommonHitInf(*pObjAt, *pObjTg, &cross); } } } @@ -169,7 +178,8 @@ bool cCcS::ChkNoHitCo(cCcD_Obj* obj1, cCcD_Obj* obj2) { if (!(((ac1 == NULL || ac2 == NULL) || ac1 != ac2 || obj1->ChkCoSameActorHit() || obj2->ChkCoSameActorHit()) && (obj1->GetCoIGrp() & (obj2->GetCoVsGrp() >> 3)) && - ((obj1->GetCoVsGrp() >> 3) & obj2->GetCoIGrp() && !this->ChkNoHitGCo(obj1, obj2)))) { + ((obj1->GetCoVsGrp() >> 3) & obj2->GetCoIGrp() && !ChkNoHitGCo(obj1, obj2)))) + { return true; } else { return false; @@ -178,27 +188,30 @@ bool cCcS::ChkNoHitCo(cCcD_Obj* obj1, cCcD_Obj* obj2) { /* 80265230-802653A0 25FB70 0170+00 1/1 0/0 0/0 .text ChkCo__4cCcSFv */ void cCcS::ChkCo() { - this->ClrCoHitInf(); + ClrCoHitInf(); if (mObjCoCount <= 1) return; - cCcD_Obj** objCoEnd = this->mpObjCo + this->mObjCoCount; - for (cCcD_Obj** objCo1 = this->mpObjCo; objCo1 < objCoEnd - 1; ++objCo1) { + + cCcD_Obj** objCoEnd = mpObjCo + mObjCoCount; + for (cCcD_Obj** objCo1 = mpObjCo; objCo1 < objCoEnd - 1; ++objCo1) { if (*objCo1 == NULL || !(*objCo1)->ChkCoSet()) continue; + cCcD_ShapeAttr* co1ShapeAttr = (*objCo1)->GetShapeAttr(); for (cCcD_Obj** objCo2 = objCo1 + 1; objCo2 < objCoEnd; ++objCo2) { if (*objCo2 == NULL || !(*objCo2)->ChkCoSet()) continue; if (!(*objCo1)->GetDivideInfo().Chk((*objCo2)->GetDivideInfo())) continue; - if (this->ChkNoHitCo(*objCo1, *objCo2)) + if (ChkNoHitCo(*objCo1, *objCo2)) continue; + cCcD_ShapeAttr* co2ShapeAttr = (*objCo2)->GetShapeAttr(); f32 crossLen; if (co1ShapeAttr->CrossCo(*co2ShapeAttr, &crossLen)) { cXyz& obj2CoCP = co2ShapeAttr->GetCoCP(); cXyz& obj1CoCP = co1ShapeAttr->GetCoCP(); - this->SetCoCommonHitInf(*objCo1, &obj1CoCP, *objCo2, &obj2CoCP, crossLen); + SetCoCommonHitInf(*objCo1, &obj1CoCP, *objCo2, &obj2CoCP, crossLen); } } } @@ -215,21 +228,24 @@ void cCcS::CalcTgPlusDmg(cCcD_Obj* obj1, cCcD_Obj* obj2, cCcD_Stts* stts1, cCcD_ void cCcS::SetAtTgCommonHitInf(cCcD_Obj* obj1, cCcD_Obj* obj2, cXyz* pXyz) { cCcD_Stts* obj1Stts = obj1->GetStts(); cCcD_Stts* obj2Stts = obj2->GetStts(); - if (!this->ChkAtTgHitAfterCross(!obj2->ChkTgNoAtHitInfSet(), !obj1->ChkAtNoTgHitInfSet(), - obj1->GetGObjInf(), obj2->GetGObjInf(), obj1Stts, obj2Stts, - obj1Stts->GetGStts(), obj2Stts->GetGStts())) { + if (!ChkAtTgHitAfterCross(!obj2->ChkTgNoAtHitInfSet(), !obj1->ChkAtNoTgHitInfSet(), + obj1->GetGObjInf(), obj2->GetGObjInf(), obj1Stts, obj2Stts, + obj1Stts->GetGStts(), obj2Stts->GetGStts())) + { if (!obj2->ChkTgNoAtHitInfSet()) { obj1->SetAtHit(obj2); } + bool tmp = !(obj1->ChkAtNoTgHitInfSet() || (obj1->ChkAtType(AT_TYPE_SLINGSHOT) && obj2->ChkTgNoSlingHitInfSet())); if (tmp) { obj2->SetTgHit(obj1); - this->CalcTgPlusDmg(obj1, obj2, obj1Stts, obj2Stts); + CalcTgPlusDmg(obj1, obj2, obj1Stts, obj2Stts); } - this->SetAtTgGObjInf(!obj2->ChkTgNoAtHitInfSet(), tmp, obj1, obj2, obj1->GetGObjInf(), - obj2->GetGObjInf(), obj1Stts, obj2Stts, obj1Stts->GetGStts(), - obj2Stts->GetGStts(), pXyz); + + SetAtTgGObjInf(!obj2->ChkTgNoAtHitInfSet(), tmp, obj1, obj2, obj1->GetGObjInf(), + obj2->GetGObjInf(), obj1Stts, obj2Stts, obj1Stts->GetGStts(), + obj2Stts->GetGStts(), pXyz); } } @@ -241,16 +257,19 @@ void cCcS::SetCoCommonHitInf(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* x if (obj2CoHitInfSet) { obj1->SetCoHit(obj2); } + if (obj1CoHitInfSet) { obj2->SetCoHit(obj1); } + if (obj2CoHitInfSet && obj1CoHitInfSet) { - this->SetPosCorrect(obj1, xyz1, obj2, xyz2, crossLen); + SetPosCorrect(obj1, xyz1, obj2, xyz2, crossLen); } + cCcD_Stts* obj1Stts = obj1->GetStts(); cCcD_Stts* obj2Stts = obj2->GetStts(); - this->SetCoGObjInf(obj2CoHitInfSet, obj1CoHitInfSet, obj1->GetGObjInf(), obj2->GetGObjInf(), - obj1Stts, obj2Stts, obj1Stts->GetGStts(), obj2Stts->GetGStts()); + SetCoGObjInf(obj2CoHitInfSet, obj1CoHitInfSet, obj1->GetGObjInf(), obj2->GetGObjInf(), obj1Stts, + obj2Stts, obj1Stts->GetGStts(), obj2Stts->GetGStts()); } /* 80265750-80265BB4 260090 0464+00 1/0 0/0 0/0 .text @@ -262,11 +281,12 @@ void cCcS::SetPosCorrect(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, return; if (obj1->GetStts()->GetAc() != NULL && obj1->GetStts()->GetAc() == obj2->GetStts()->GetAc()) return; + if (!(fabsf(crossLen) < (1.0f / 125.0f))) { - this->SetCoGCorrectProc(obj1, obj2); + SetCoGCorrectProc(obj1, obj2); bool bothCoSph3DCrr = obj1->ChkCoSph3DCrr() && obj2->ChkCoSph3DCrr(); - WeightType obj1WeightType = this->GetWt(obj1->GetStts()->GetWeightUc()); - WeightType obj2WeightType = this->GetWt(obj2->GetStts()->GetWeightUc()); + WeightType obj1WeightType = GetWt(obj1->GetStts()->GetWeightUc()); + WeightType obj2WeightType = GetWt(obj2->GetStts()->GetWeightUc()); f32 obj1SrcWeight = obj1->GetStts()->GetWeightF(); f32 obj2SrcWeight = obj2->GetStts()->GetWeightF(); f32 combinedWeight = obj1SrcWeight + obj2SrcWeight; @@ -277,6 +297,7 @@ void cCcS::SetPosCorrect(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, obj2SrcWeight = 1; combinedWeight = 2; } + f32 invCombinedWeight = 1 / combinedWeight; if (obj1WeightType == WeightType_0) { if (obj2WeightType == WeightType_0) { @@ -305,6 +326,7 @@ void cCcS::SetPosCorrect(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, obj1Weight = 0; } } + f32 objDistLen; Vec obj1Move; Vec obj2Move; @@ -318,6 +340,7 @@ void cCcS::SetPosCorrect(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, objsDist.z = xyz2->z - xyz1->z; objDistLen = sqrtf(objsDist.x * objsDist.x + objsDist.z * objsDist.z); } + if (!cM3d_IsZero(objDistLen)) { if (bothCoSph3DCrr) { VECScale(&objsDist, &objsDist, crossLen / objDistLen); @@ -348,6 +371,7 @@ void cCcS::SetPosCorrect(cCcD_Obj* obj1, cXyz* xyz1, cCcD_Obj* obj2, cXyz* xyz2, obj2Move.x = obj1Weight; } } + obj1->GetStts()->PlusCcMove(obj1Move.x, obj1Move.y, obj1Move.z); obj2->GetStts()->PlusCcMove(obj2Move.x, obj2Move.y, obj2Move.z); VECAdd(xyz1, &obj1Move, xyz1); @@ -366,6 +390,7 @@ void cCcS::CalcArea() { aab.SetMinMax(objShape->GetWorkAab()); } } + mDivideArea.SetArea(aab); for (cCcD_Obj** pObj = mpObj; pObj < mpObj + mObjCount; ++pObj) { if (*pObj != NULL) { @@ -378,10 +403,10 @@ void cCcS::CalcArea() { /* 80265CCC-80265D30 26060C 0064+00 0/0 1/1 0/0 .text Move__4cCcSFv */ void cCcS::Move() { - this->CalcArea(); - this->ChkAtTg(); - this->ChkCo(); - this->MoveAfterCheck(); + CalcArea(); + ChkAtTg(); + ChkCo(); + MoveAfterCheck(); mObjAtCount = 0; mObjTgCount = 0; mObjCoCount = 0; @@ -390,38 +415,38 @@ void cCcS::Move() { /* 80265D30-80265DF4 260670 00C4+00 0/0 1/1 0/0 .text DrawClear__4cCcSFv */ void cCcS::DrawClear() { - for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + this->mObjAtCount; ++obj) { + for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + mObjAtCount; ++obj) { *obj = NULL; } - this->mObjAtCount = 0; - for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + this->mObjTgCount; ++obj) { + + mObjAtCount = 0; + for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + mObjTgCount; ++obj) { *obj = NULL; } - this->mObjTgCount = 0; - for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + this->mObjCoCount; ++obj) { + + mObjTgCount = 0; + for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + mObjCoCount; ++obj) { *obj = NULL; } - this->mObjCoCount = 0; - for (cCcD_Obj** obj = this->mpObj; obj < this->mpObj + this->mObjCount; ++obj) { + + mObjCoCount = 0; + for (cCcD_Obj** obj = mpObj; obj < mpObj + mObjCount; ++obj) { *obj = NULL; } - this->mObjCount = 0; + + mObjCount = 0; } /* 80265DF4-80265DF8 260734 0004+00 1/0 1/0 0/0 .text * SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj */ -void cCcS::SetCoGCorrectProc(cCcD_Obj* param_0, cCcD_Obj* param_1) { - /* empty function */ -} +void cCcS::SetCoGCorrectProc(cCcD_Obj* param_0, cCcD_Obj* param_1) {} /* 80265DF8-80265DFC 260738 0004+00 1/0 0/0 0/0 .text * SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts */ void cCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2, cCcD_GObjInf* param_3, cCcD_Stts* param_4, cCcD_Stts* param_5, cCcD_GStts* param_6, - cCcD_GStts* param_7) { - /* empty function */ -} + cCcD_GStts* param_7) {} /* 80265DFC-80265E00 26073C 0004+00 1/0 0/0 0/0 .text * SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz @@ -429,9 +454,7 @@ void cCcS::SetCoGObjInf(bool param_0, bool param_1, cCcD_GObjInf* param_2, cCcD_ void cCcS::SetAtTgGObjInf(bool param_0, bool param_1, cCcD_Obj* param_2, cCcD_Obj* param_3, cCcD_GObjInf* param_4, cCcD_GObjInf* param_5, cCcD_Stts* param_6, cCcD_Stts* param_7, cCcD_GStts* param_8, cCcD_GStts* param_9, - cXyz* param_10) { - /* empty function */ -} + cXyz* param_10) {} /* 80265E00-80265E08 260740 0008+00 1/0 0/0 0/0 .text * ChkNoHitGAtTg__4cCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts */ @@ -455,6 +478,4 @@ bool cCcS::ChkNoHitGCo(cCcD_Obj* param_0, cCcD_Obj* param_1) { } /* 80265E18-80265E1C 260758 0004+00 1/0 0/0 0/0 .text MoveAfterCheck__4cCcSFv */ -void cCcS::MoveAfterCheck() { - /* empty function */ -} +void cCcS::MoveAfterCheck() {} diff --git a/libs/SSystem/SComponent/c_counter.cpp b/libs/SSystem/SComponent/c_counter.cpp index 5ecc2e4e0a..9e3447d8e5 100644 --- a/libs/SSystem/SComponent/c_counter.cpp +++ b/libs/SSystem/SComponent/c_counter.cpp @@ -1,10 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: c_counter -// +/** + * c_counter.cpp + * + */ #include "SSystem/SComponent/c_counter.h" -#include "dolphin/types.h" /* ############################################################################################## */ /* 80430CD8-80430CE8 000C+04 s=1 e=12 z=22 None .bss g_Counter */ diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp index 2912206d6f..e69029989c 100644 --- a/libs/SSystem/SComponent/c_lib.cpp +++ b/libs/SSystem/SComponent/c_lib.cpp @@ -1,17 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: c_lib -// +/** + * c_lib.cpp + * + */ #include "SSystem/SComponent/c_lib.h" -#include "MSL_C/string.h" +#include "string.h" #include "SSystem/SComponent/c_math.h" #include "dolphin/mtx/mtxvec.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026F93C-8026F95C 26A27C 0020+00 0/0 3/3 0/0 .text cLib_memCpy__FPvPCvUl */ void cLib_memCpy(void* dst, const void* src, unsigned long size) { @@ -19,8 +14,8 @@ void cLib_memCpy(void* dst, const void* src, unsigned long size) { } /* 8026F95C-8026F97C 26A29C 0020+00 0/0 4/4 0/0 .text cLib_memSet__FPviUl */ -void cLib_memSet(void* ptr, int value, unsigned long size) { - memset(ptr, value, size); +void cLib_memSet(void* dst, int value, unsigned long size) { + memset(dst, value, size); } /* 8026F97C-8026FA3C 26A2BC 00C0+00 0/0 50/50 178/178 .text cLib_addCalc__FPfffff */ diff --git a/libs/SSystem/SComponent/c_list.cpp b/libs/SSystem/SComponent/c_list.cpp index 126a706373..8d44fbaa4b 100644 --- a/libs/SSystem/SComponent/c_list.cpp +++ b/libs/SSystem/SComponent/c_list.cpp @@ -1,67 +1,67 @@ -// -// Generated By: dol2asm -// Translation Unit: c_list -// +/** + * c_list.cpp + * + */ #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_node.h" #include "dolphin/types.h" /* 80265E64-80265E78 0014+00 s=1 e=0 z=0 None .text cLs_Init__FP15node_list_class */ -void cLs_Init(node_list_class* pList) { - pList->mpHead = NULL; - pList->mpTail = NULL; - pList->mSize = 0; +void cLs_Init(node_list_class* list) { + list->mpHead = NULL; + list->mpTail = NULL; + list->mSize = 0; } /* 80265E78-80265EFC 0084+00 s=1 e=4 z=0 None .text cLs_SingleCut__FP10node_class */ -int cLs_SingleCut(node_class* pNode) { - node_list_class* pList = (node_list_class*)pNode->mpData; - if (pNode == pList->mpHead) - pList->mpHead = pNode->mpNextNode; - if (pNode == pList->mpTail) - pList->mpTail = pNode->mpPrevNode; - cNd_SingleCut(pNode); - cNd_ClearObject(pNode); - int newSize = pList->mSize - 1; - pList->mSize = newSize; +int cLs_SingleCut(node_class* node) { + node_list_class* list = (node_list_class*)node->mpData; + if (node == list->mpHead) + list->mpHead = node->mpNextNode; + if (node == list->mpTail) + list->mpTail = node->mpPrevNode; + cNd_SingleCut(node); + cNd_ClearObject(node); + int newSize = list->mSize - 1; + list->mSize = newSize; return newSize > 0; } /* 80265EFC-80265F70 0074+00 s=1 e=4 z=0 None .text * cLs_Addition__FP15node_list_classP10node_class */ -int cLs_Addition(node_list_class* pList, node_class* pNode) { - if (pList->mpTail == NULL) { - pList->mpHead = pNode; +int cLs_Addition(node_list_class* list, node_class* node) { + if (list->mpTail == NULL) { + list->mpHead = node; } else { - cNd_Addition(pList->mpTail, pNode); + cNd_Addition(list->mpTail, node); } - pList->mpTail = cNd_Last(pNode); - cNd_SetObject(pNode, pList); - pList->mSize = cNd_LengthOf(pList->mpHead); - return pList->mSize; + list->mpTail = cNd_Last(node); + cNd_SetObject(node, list); + list->mSize = cNd_LengthOf(list->mpHead); + return list->mSize; } /* 80265F70-80265FF8 0088+00 s=0 e=1 z=0 None .text cLs_Insert__FP15node_list_classiP10node_class */ -int cLs_Insert(node_list_class* pList, int idx, node_class* pNode) { - node_class* pExisting = cNd_Order(pList->mpHead, idx); +int cLs_Insert(node_list_class* list, int idx, node_class* node) { + node_class* pExisting = cNd_Order(list->mpHead, idx); if (pExisting == NULL) { - return cLs_Addition(pList, pNode); + return cLs_Addition(list, node); } else { - cNd_SetObject(pNode, pList); - cNd_Insert(pExisting, pNode); - pList->mpHead = cNd_First(pNode); - pList->mSize = cNd_LengthOf(pList->mpHead); - return pList->mSize; + cNd_SetObject(node, list); + cNd_Insert(pExisting, node); + list->mpHead = cNd_First(node); + list->mSize = cNd_LengthOf(list->mpHead); + return list->mSize; } } /* 80265FF8-80266040 0048+00 s=0 e=1 z=0 None .text cLs_GetFirst__FP15node_list_class */ -node_class* cLs_GetFirst(node_list_class* pList) { - if (pList->mSize != 0) { - node_class* pHead = pList->mpHead; +node_class* cLs_GetFirst(node_list_class* list) { + if (list->mSize != 0) { + node_class* pHead = list->mpHead; cLs_SingleCut(pHead); return pHead; } else { @@ -70,6 +70,6 @@ node_class* cLs_GetFirst(node_list_class* pList) { } /* 80266040-80266060 0020+00 s=0 e=4 z=0 None .text cLs_Create__FP15node_list_class */ -void cLs_Create(node_list_class* pList) { - cLs_Init(pList); +void cLs_Create(node_list_class* list) { + cLs_Init(list); } diff --git a/libs/SSystem/SComponent/c_list_iter.cpp b/libs/SSystem/SComponent/c_list_iter.cpp index f94d3bc7dd..0bc0ec2acd 100644 --- a/libs/SSystem/SComponent/c_list_iter.cpp +++ b/libs/SSystem/SComponent/c_list_iter.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: c_list_iter -// +/** + * c_list_iter.cpp + * + */ #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_list.h" @@ -9,18 +9,18 @@ /* 80266060-80266098 0038+00 s=0 e=5 z=0 None .text * cLsIt_Method__FP15node_list_classPFP10node_classPv_iPv */ -int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) { - if (pList->mSize > 0) - return cNdIt_Method(pList->mpHead, pMethod, pUserData); +int cLsIt_Method(node_list_class* list, cNdIt_MethodFunc method, void* data) { + if (list->mSize > 0) + return cNdIt_Method(list->mpHead, method, data); else return 1; } /* 80266098-802660D0 0038+00 s=0 e=4 z=0 None .text * cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv */ -void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData) { - if (pList->mSize > 0) - return cNdIt_Judge(pList->mpHead, pJudge, pUserData); +void* cLsIt_Judge(node_list_class* list, cNdIt_JudgeFunc judge, void* data) { + if (list->mSize > 0) + return cNdIt_Judge(list->mpHead, judge, data); else return NULL; } diff --git a/libs/SSystem/SComponent/c_m2d.cpp b/libs/SSystem/SComponent/c_m2d.cpp index 37ee7a9d47..6ebc6a2ea1 100644 --- a/libs/SSystem/SComponent/c_m2d.cpp +++ b/libs/SSystem/SComponent/c_m2d.cpp @@ -1,31 +1,15 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m2d -// +/** + * c_m2d.cpp + * + */ #include "SSystem/SComponent/c_m2d.h" #include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_m3d_g_cir.h" -// -// Types: -// - -// -// Forward References: -// - -// -// External References: -// - -// -// Declarations: -// - /* 80268260-80268560 262BA0 0300+00 0/0 4/4 0/0 .text cM2d_CrossCirLin__FR8cM2dGCirffffPfPf */ void cM2d_CrossCirLin(cM2dGCir& param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32* param_5, f32* param_6) { + f32* param_5, f32* param_6) { f32 fVar1 = param_1 - param_0.GetCx(); f32 fVar15 = param_2 - param_0.GetCy(); f32 dVar13 = param_3 * param_3 + param_4 * param_4; @@ -40,7 +24,7 @@ void cM2d_CrossCirLin(cM2dGCir& param_0, f32 param_1, f32 param_2, f32 param_3, } else { f32 dVar10 = ((dVar14 * dVar14) - (4.0f * dVar13) * fVar3); if (cM3d_IsZero(dVar10)) { - in_f31 =(-dVar14 / (2.0f * dVar13)); + in_f31 = (-dVar14 / (2.0f * dVar13)); } else { if (dVar10 < 0.0f) { } else { diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 73e668fdca..8897f1b82d 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -1,10 +1,10 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d -// +/** + * c_m3d.cpp + * + */ #include "SSystem/SComponent/c_m3d.h" -#include "MSL_C/float.h" +#include "math.h" #include "SSystem/SComponent/c_m3d_g_aab.h" #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_m3d_g_lin.h" @@ -283,7 +283,8 @@ bool cM3d_Cross_AabAab(const cM3dGAab* pAabA, const cM3dGAab* pAabB) { cM3d_CrossNumSection(pAabA->GetMinP()->y, pAabA->GetMaxP()->y, pAabB->GetMinP()->y, pAabB->GetMaxP()->y) && cM3d_CrossNumSection(pAabA->GetMinP()->z, pAabA->GetMaxP()->z, pAabB->GetMinP()->z, - pAabB->GetMaxP()->z)) { + pAabB->GetMaxP()->z)) + { return true; } else { return false; @@ -317,8 +318,7 @@ bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) { f32 cx = pSph->GetC().x; if (pAab->GetMinX() > cx + radius) { return false; - } - else if (pAab->GetMaxX() < cx - radius) { + } else if (pAab->GetMaxX() < cx - radius) { return false; } @@ -328,7 +328,7 @@ bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) { } else if (pAab->GetMaxZ() < cz - radius) { return false; } - + f32 cy = pSph->GetC().y; if (pAab->GetMinY() > cy + radius) { return false; @@ -431,7 +431,8 @@ bool cM3d_Cross_LinPla(const cM3dGLin* pLine, const cM3dGPla* pPlane, Vec* pVecO return false; } else { if (startVal >= /* 0.0 */ FLOAT_LABEL(lit_2256) && - endVal <= /* 0.0 */ FLOAT_LABEL(lit_2256)) { + endVal <= /* 0.0 */ FLOAT_LABEL(lit_2256)) + { // if (startVal >= 0 && endVal <= 0) { if (pBoolA) { return cM3d_CrossInfLineVsInfPlane_proc(startVal, endVal, &pLine->GetStartP(), @@ -1003,7 +1004,8 @@ bool cM3d_Cross_CylPnt(const cM3dGCyl* pCylinder, const Vec* pPoint) { f32 dZ = pCylinder->GetCP()->getZDiff(pPoint); f32 maxY = pCylinder->GetCP()->y + pCylinder->GetH(); if (dX * dX + dZ * dZ < pCylinder->GetR() * pCylinder->GetR() && - pCylinder->GetCP()->y < pPoint->y && maxY > pPoint->y) { + pCylinder->GetCP()->y < pPoint->y && maxY > pPoint->y) + { return true; } else { return false; diff --git a/libs/SSystem/SComponent/c_m3d_g_aab.cpp b/libs/SSystem/SComponent/c_m3d_g_aab.cpp index 9f322aa970..e0ac2f9ad8 100644 --- a/libs/SSystem/SComponent/c_m3d_g_aab.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_aab.cpp @@ -1,24 +1,19 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_aab -// +/** + * c_m3d_g_aab.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_aab.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026EC54-8026EC88 0034+00 s=0 e=4 z=0 None .text Set__8cM3dGAabFPC4cXyzPC4cXyz */ -void cM3dGAab::Set(const cXyz* pMin, const cXyz* pMax) { - mMin = *pMin; - mMax = *pMax; +void cM3dGAab::Set(const cXyz* min, const cXyz* max) { + mMin = *min; + mMax = *max; } /* 8026EC88-8026ECD0 0048+00 s=0 e=6 z=0 None .text CrossY__8cM3dGAabCFPC4cXyz */ -bool cM3dGAab::CrossY(const cXyz* pOther) const { - if (mMin.x > pOther->x || mMax.x < pOther->x || mMin.z > pOther->z || mMax.z < pOther->z) { +bool cM3dGAab::CrossY(const cXyz* other) const { + if (mMin.x > other->x || mMax.x < other->x || mMin.z > other->z || mMax.z < other->z) { return false; } else { return true; @@ -26,17 +21,17 @@ bool cM3dGAab::CrossY(const cXyz* pOther) const { } /* 8026ECD0-8026ECE4 0014+00 s=0 e=6 z=0 None .text UnderPlaneYUnder__8cM3dGAabCFf */ -bool cM3dGAab::UnderPlaneYUnder(f32 pY) const { - return mMin.y < pY; +bool cM3dGAab::UnderPlaneYUnder(f32 y) const { + return mMin.y < y; } /* 8026ECE4-8026ECF8 0014+00 s=0 e=6 z=0 None .text TopPlaneYUnder__8cM3dGAabCFf */ -bool cM3dGAab::TopPlaneYUnder(f32 pY) const { - return mMax.y < pY; +bool cM3dGAab::TopPlaneYUnder(f32 y) const { + return mMax.y < y; } /* 8026ECF8-8026ED1C 0024+00 s=0 e=6 z=0 None .text ClearForMinMax__8cM3dGAabFv */ -void cM3dGAab::ClearForMinMax(void) { +void cM3dGAab::ClearForMinMax() { mMin.z = 1000000000.0f; mMin.y = 1000000000.0f; mMin.x = 1000000000.0f; @@ -52,28 +47,28 @@ void cM3dGAab::SetMinMax(const cXyz& pMinMax) { } /* 8026ED60-8026EDA4 0044+00 s=0 e=2 z=0 None .text SetMinMax__8cM3dGAabFRC8cM3dGAab */ -void cM3dGAab::SetMinMax(const cM3dGAab& pOther) { - this->SetMinMax(pOther.mMin); - this->SetMinMax(pOther.mMax); +void cM3dGAab::SetMinMax(const cM3dGAab& other) { + this->SetMinMax(other.mMin); + this->SetMinMax(other.mMax); } /* 8026EDA4-8026EDE4 0040+00 s=1 e=1 z=0 None .text SetMin__8cM3dGAabFRC4cXyz */ -void cM3dGAab::SetMin(const cXyz& pMin) { - mMin.setMin(pMin); +void cM3dGAab::SetMin(const cXyz& min) { + mMin.setMin(min); } /* 8026EDE4-8026EE24 0040+00 s=1 e=1 z=0 None .text SetMax__8cM3dGAabFRC4cXyz */ -void cM3dGAab::SetMax(const cXyz& pMax) { - mMax.setMax(pMax); +void cM3dGAab::SetMax(const cXyz& max) { + mMax.setMax(max); } /* 8026EE24-8026EE68 0044+00 s=0 e=1 z=0 None .text CalcCenter__8cM3dGAabCFP4cXyz */ -void cM3dGAab::CalcCenter(cXyz* pOut) const { - VECAdd(&mMin, &mMax, pOut); - VECScale(pOut, pOut, 0.5f); +void cM3dGAab::CalcCenter(cXyz* out) const { + VECAdd(&mMin, &mMax, out); + VECScale(out, out, 0.5f); } /* 8026EE68-8026EEB4 004C+00 s=0 e=1 z=0 None .text PlusR__8cM3dGAabFf */ -void cM3dGAab::PlusR(f32 pR) { - mMin -= pR; - mMax += pR; +void cM3dGAab::PlusR(f32 r) { + mMin -= r; + mMax += r; } diff --git a/libs/SSystem/SComponent/c_m3d_g_cir.cpp b/libs/SSystem/SComponent/c_m3d_g_cir.cpp index 0b9bd19d93..7468b1bc36 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cir.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cir.cpp @@ -1,28 +1,20 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_cir -// +/** + * c_m3d_g_cir.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_cir.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026EEB4-8026EED0 001C+00 s=0 e=1 z=0 None .text __ct__8cM3dGCirFv */ -cM3dGCir::cM3dGCir(void) {} - -/* 8026EED0-8026EF18 0048+00 s=1 e=0 z=0 None .text __dt__8cM2dGCirFv */ -// cM2dGCir::~cM2dGCir() autogenerated here +cM3dGCir::cM3dGCir() {} /* 8026EF18-8026EF74 005C+00 s=1 e=4 z=386 None .text __dt__8cM3dGCirFv */ -cM3dGCir::~cM3dGCir(void) {} +cM3dGCir::~cM3dGCir() {} /* 8026EF74-8026EF88 0014+00 s=0 e=1 z=0 None .text Set__8cM3dGCirFffff */ -void cM3dGCir::Set(f32 pPosX, f32 pPosY, f32 pPosZ, f32 pRadius) { - mPosX = pPosX; - mPosY = pPosY; - mRadius = pRadius; - mPosZ = pPosZ; +void cM3dGCir::Set(f32 pos_x, f32 pos_y, f32 posz, f32 radius) { + mPosX = pos_x; + mPosY = pos_y; + mRadius = radius; + mPosZ = posz; } diff --git a/libs/SSystem/SComponent/c_m3d_g_cps.cpp b/libs/SSystem/SComponent/c_m3d_g_cps.cpp index 1fe705a5e0..4560549c6c 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cps.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cps.cpp @@ -1,34 +1,29 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_cps -// +/** + * c_m3d_g_cps.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_cps.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026EF88-8026EFA4 2698C8 001C+00 0/0 5/5 20/20 .text __ct__8cM3dGCpsFv */ -cM3dGCps::cM3dGCps(void) {} +cM3dGCps::cM3dGCps() {} /* 8026EFA4-8026F000 2698E4 005C+00 1/0 7/7 6/6 .text __dt__8cM3dGCpsFv */ -cM3dGCps::~cM3dGCps(void) {} +cM3dGCps::~cM3dGCps() {} /* 8026F000-8026F03C 269940 003C+00 1/1 2/2 10/10 .text Set__8cM3dGCpsFRC4cXyzRC4cXyzf */ -void cM3dGCps::Set(const cXyz& pStart, const cXyz& pEnd, f32 pUnkF) { - this->SetStartEnd(pStart, pEnd); - mRadius = pUnkF; +void cM3dGCps::Set(const cXyz& start, const cXyz& end, f32 radius) { + SetStartEnd(start, end); + mRadius = radius; } /* 8026F03C-8026F080 26997C 0044+00 0/0 1/1 10/10 .text Set__8cM3dGCpsFRC9cM3dGCpsS */ void cM3dGCps::Set(const cM3dGCpsS& other) { - this->SetStartEnd(other.mStart, other.mEnd); + SetStartEnd(other.mStart, other.mEnd); mRadius = other.mRadius; } /* 8026F080-8026F0A8 2699C0 0028+00 0/0 1/1 0/0 .text SetCps__8cM3dGCpsFRC8cM3dGCps */ void cM3dGCps::SetCps(const cM3dGCps& other) { - this->Set(other.GetStartP(), other.GetEndP(), other.mRadius); + Set(other.GetStartP(), other.GetEndP(), other.mRadius); } diff --git a/libs/SSystem/SComponent/c_m3d_g_cyl.cpp b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp index 1d285c3052..a18043727f 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cyl.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp @@ -1,72 +1,67 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_cyl -// +/** + * c_m3d_g_cyl.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_m3d.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026F0A8-8026F114 2699E8 006C+00 0/0 1/1 0/0 .text __ct__8cM3dGCylFPC4cXyzff */ -cM3dGCyl::cM3dGCyl(const cXyz* pCenter, f32 pRadius, f32 pHeight) { - this->SetC(*pCenter); - this->SetR(pRadius); - this->SetH(pHeight); +cM3dGCyl::cM3dGCyl(const cXyz* center, f32 radius, f32 height) { + SetC(*center); + SetR(radius); + SetH(height); } /* 8026F114-8026F180 269A54 006C+00 0/0 1/1 4/4 .text Set__8cM3dGCylFRC9cM3dGCylS */ void cM3dGCyl::Set(const cM3dGCylS& other) { - this->SetC(cXyz(other.mCenter)); - this->SetR(other.mRadius); - this->SetH(other.mHeight); + SetC(cXyz(other.mCenter)); + SetR(other.mRadius); + SetH(other.mHeight); } /* 8026F180-8026F1DC 269AC0 005C+00 0/0 2/2 1/1 .text Set__8cM3dGCylFRC4cXyzff */ -void cM3dGCyl::Set(const cXyz& pCenter, f32 pRadius, f32 pHeight) { - this->SetC(pCenter); - this->SetR(pRadius); - this->SetH(pHeight); +void cM3dGCyl::Set(const cXyz& center, f32 radius, f32 height) { + SetC(center); + SetR(radius); + SetH(height); } /* 8026F1DC-8026F1F8 269B1C 001C+00 3/3 13/13 257/257 .text SetC__8cM3dGCylFRC4cXyz */ -void cM3dGCyl::SetC(const cXyz& pCenter) { - mCenter = pCenter; +void cM3dGCyl::SetC(const cXyz& center) { + mCenter = center; } /* 8026F1F8-8026F200 269B38 0008+00 3/3 11/11 197/197 .text SetH__8cM3dGCylFf */ -void cM3dGCyl::SetH(f32 pHeight) { - mHeight = pHeight; +void cM3dGCyl::SetH(f32 height) { + mHeight = height; } /* 8026F200-8026F208 269B40 0008+00 3/3 6/6 204/204 .text SetR__8cM3dGCylFf */ -void cM3dGCyl::SetR(f32 pRadius) { - mRadius = pRadius; +void cM3dGCyl::SetR(f32 radius) { + mRadius = radius; } /* 8026F208-8026F22C 269B48 0024+00 0/0 1/1 0/0 .text cross__8cM3dGCylCFPC8cM3dGSphP4cXyz */ -bool cM3dGCyl::cross(const cM3dGSph* pOther, cXyz* pOut) const { +bool cM3dGCyl::cross(const cM3dGSph* other, cXyz* out) const { f32 f; - return cM3d_Cross_CylSph(this, pOther, pOut, &f); + return cM3d_Cross_CylSph(this, other, out, &f); } /* 8026F22C-8026F24C 269B6C 0020+00 0/0 1/1 0/0 .text cross__8cM3dGCylCFPC8cM3dGCylP4cXyz */ -bool cM3dGCyl::cross(const cM3dGCyl* pOther, cXyz* pOut) const { - return cM3d_Cross_CylCyl(this, pOther, pOut); +bool cM3dGCyl::cross(const cM3dGCyl* other, cXyz* out) const { + return cM3d_Cross_CylCyl(this, other, out); } /* 8026F24C-8026F2A8 269B8C 005C+00 0/0 2/2 0/0 .text calcMinMax__8cM3dGCylFP4cXyzP4cXyz */ -void cM3dGCyl::calcMinMax(cXyz* pMin, cXyz* pMax) { - pMin->x = mCenter.x - mRadius; - pMin->y = mCenter.y; - pMin->z = mCenter.z - mRadius; - pMax->x = mCenter.x + mRadius; - pMax->y = mCenter.y + mHeight; - pMax->z = mCenter.z + mRadius; +void cM3dGCyl::calcMinMax(cXyz* min, cXyz* max) { + min->x = mCenter.x - mRadius; + min->y = mCenter.y; + min->z = mCenter.z - mRadius; + max->x = mCenter.x + mRadius; + max->y = mCenter.y + mHeight; + max->z = mCenter.z + mRadius; } diff --git a/libs/SSystem/SComponent/c_m3d_g_lin.cpp b/libs/SSystem/SComponent/c_m3d_g_lin.cpp index ffe2e4fcfc..c6004e9f78 100644 --- a/libs/SSystem/SComponent/c_m3d_g_lin.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_lin.cpp @@ -1,39 +1,34 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_lin -// +/** + * c_m3d_g_lin.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_lin.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026F2A8-8026F2E8 0040+00 s=0 e=8 z=1 None .text __ct__8cM3dGLinFRC4cXyzRC4cXyz */ -cM3dGLin::cM3dGLin(const cXyz& pStart, const cXyz& pEnd) : mStart(pStart), mEnd(pEnd) {} +cM3dGLin::cM3dGLin(const cXyz& start, const cXyz& end) : mStart(start), mEnd(end) {} /* 8026F2E8-8026F31C 0034+00 s=0 e=8 z=10 None .text SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz */ -void cM3dGLin::SetStartEnd(const cXyz& pStart, const cXyz& pEnd) { - mStart = pStart; - mEnd = pEnd; +void cM3dGLin::SetStartEnd(const cXyz& start, const cXyz& end) { + mStart = start; + mEnd = end; } /* 8026F31C-8026F350 0034+00 s=0 e=7 z=4 None .text SetStartEnd__8cM3dGLinFRC3VecRC3Vec */ -void cM3dGLin::SetStartEnd(const Vec& pStart, const Vec& pEnd) { - mStart = pStart; - mEnd = pEnd; +void cM3dGLin::SetStartEnd(const Vec& start, const Vec& end) { + mStart = start; + mEnd = end; } /* 8026F350-8026F3C0 0070+00 s=0 e=3 z=0 None .text CalcPos__8cM3dGLinCFP3Vecf */ -void cM3dGLin::CalcPos(Vec* pOut, f32 pScale) const { +void cM3dGLin::CalcPos(Vec* out, f32 scale) const { Vec tmp; VECSubtract(&mEnd, &mStart, &tmp); - VECScale(&tmp, &tmp, pScale); - VECAdd(&tmp, &mStart, pOut); + VECScale(&tmp, &tmp, scale); + VECAdd(&tmp, &mStart, out); } /* 8026F3C0-8026F3DC 001C+00 s=0 e=1 z=0 None .text SetEnd__8cM3dGLinFRC4cXyz */ -void cM3dGLin::SetEnd(const cXyz& pEnd) { - mEnd = pEnd; +void cM3dGLin::SetEnd(const cXyz& end) { + mEnd = end; } diff --git a/libs/SSystem/SComponent/c_m3d_g_pla.cpp b/libs/SSystem/SComponent/c_m3d_g_pla.cpp index 69b76891cb..0d5c35bd60 100644 --- a/libs/SSystem/SComponent/c_m3d_g_pla.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_pla.cpp @@ -1,68 +1,63 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_pla -// +/** + * c_m3d_g_pla.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_m3d.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026F3DC-8026F408 269D1C 002C+00 0/0 3/3 0/0 .text __ct__8cM3dGPlaFPC4cXyzf */ -cM3dGPla::cM3dGPla(const cXyz* pNormal, f32 pD) : mNormal(*pNormal), mD(pD) {} +cM3dGPla::cM3dGPla(const cXyz* normal, f32 d) : mNormal(*normal), mD(d) {} /* 8026F408-8026F4C4 269D48 00BC+00 0/0 3/3 0/0 .text crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz */ -bool cM3dGPla::crossInfLin(const cXyz& pStart, const cXyz& pEnd, cXyz& out) const { - f32 tmp1 = (mD + VECDotProduct(&mNormal, &pStart)); - f32 tmp2 = tmp1 - (mD + VECDotProduct(&mNormal, &pEnd)); +bool cM3dGPla::crossInfLin(const cXyz& start, const cXyz& end, cXyz& out) const { + f32 tmp1 = (mD + VECDotProduct(&mNormal, &start)); + f32 tmp2 = tmp1 - (mD + VECDotProduct(&mNormal, &end)); if (fabsf(tmp2) < G_CM3D_F_ABS_MIN) { - out = pEnd; + out = end; return false; } else { - cM3d_InDivPos2(&pStart, &pEnd, (tmp1 / tmp2), &out); + cM3d_InDivPos2(&start, &end, (tmp1 / tmp2), &out); return true; } } /* 8026F4C4-8026F52C 269E04 0068+00 0/0 1/1 0/0 .text SetupNP0__8cM3dGPlaFRC3VecRC3Vec */ -void cM3dGPla::SetupNP0(const Vec& pNormal, const Vec& pPoint) { - mNormal = pNormal; +void cM3dGPla::SetupNP0(const Vec& normal, const Vec& point) { + mNormal = normal; VECNormalize(&mNormal, &mNormal); - mD = -VECDotProduct(&mNormal, &pPoint); + mD = -VECDotProduct(&mNormal, &point); } /* 8026F52C-8026F57C 269E6C 0050+00 0/0 2/2 0/0 .text SetupNP__8cM3dGPlaFRC3VecRC3Vec */ -void cM3dGPla::SetupNP(const Vec& pNormal, const Vec& pPoint) { - mNormal = pNormal; - mD = -VECDotProduct(&mNormal, &pPoint); +void cM3dGPla::SetupNP(const Vec& normal, const Vec& point) { + mNormal = normal; + mD = -VECDotProduct(&mNormal, &point); } /* 8026F57C-8026F5D4 269EBC 0058+00 0/0 2/2 0/0 .text getCrossY__8cM3dGPlaCFRC4cXyzPf */ -bool cM3dGPla::getCrossY(const cXyz& pPoint, f32* pOut) const { +bool cM3dGPla::getCrossY(const cXyz& point, f32* out) const { if (fabsf(mNormal.y) < G_CM3D_F_ABS_MIN) { return false; } else { - *pOut = (-mNormal.x * pPoint.x - mNormal.z * pPoint.z - mD) / mNormal.y; + *out = (-mNormal.x * point.x - mNormal.z * point.z - mD) / mNormal.y; return true; } } /* 8026F5D4-8026F624 269F14 0050+00 0/0 1/1 0/0 .text getCrossYLessD__8cM3dGPlaCFRC3VecPf */ -bool cM3dGPla::getCrossYLessD(const Vec& pPoint, f32* pOut) const { +bool cM3dGPla::getCrossYLessD(const Vec& point, f32* out) const { if (fabsf(mNormal.y) < G_CM3D_F_ABS_MIN) { return false; } else { - *pOut = (-mNormal.x * pPoint.x - mNormal.z * pPoint.z) / mNormal.y; + *out = (-mNormal.x * point.x - mNormal.z * point.z) / mNormal.y; return true; } } /* 8026F624-8026F648 269F64 0024+00 0/0 1/1 0/0 .text Set__8cM3dGPlaFPC8cM3dGPla */ -void cM3dGPla::Set(const cM3dGPla* pOther) { - *this = *pOther; +void cM3dGPla::Set(const cM3dGPla* other) { + *this = *other; } diff --git a/libs/SSystem/SComponent/c_m3d_g_sph.cpp b/libs/SSystem/SComponent/c_m3d_g_sph.cpp index cdbac2af66..be72f92bc4 100644 --- a/libs/SSystem/SComponent/c_m3d_g_sph.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_sph.cpp @@ -1,57 +1,52 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_sph -// +/** + * c_m3d_g_sph.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_sph.h" #include "SSystem/SComponent/c_m3d.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026F648-8026F664 269F88 001C+00 2/2 5/5 254/254 .text SetC__8cM3dGSphFRC4cXyz */ -void cM3dGSph::SetC(const cXyz& pCenter) { - mCenter = pCenter; +void cM3dGSph::SetC(const cXyz& center) { + mCenter = center; } /* 8026F664-8026F6A8 269FA4 0044+00 0/0 3/3 2/2 .text Set__8cM3dGSphFRC4cXyzf */ -void cM3dGSph::Set(const cXyz& pCenter, f32 pRadius) { - this->SetC(pCenter); - this->SetR(pRadius); +void cM3dGSph::Set(const cXyz& center, f32 radius) { + SetC(center); + SetR(radius); } /* 8026F6A8-8026F708 269FE8 0060+00 0/0 2/2 0/0 .text Set__8cM3dGSphFRC9cM3dGSphS */ -void cM3dGSph::Set(const cM3dGSphS& pOther) { - this->SetC(cXyz(pOther.mCenter)); - this->SetR(pOther.mRadius); +void cM3dGSph::Set(const cM3dGSphS& other) { + SetC(cXyz(other.mCenter)); + SetR(other.mRadius); } /* 8026F708-8026F710 26A048 0008+00 2/2 10/10 197/197 .text SetR__8cM3dGSphFf */ -void cM3dGSph::SetR(f32 pRadius) { - mRadius = pRadius; +void cM3dGSph::SetR(f32 radius) { + mRadius = radius; } /* 8026F710-8026F73C 26A050 002C+00 0/0 1/1 0/0 .text cross__8cM3dGSphCFPC8cM3dGSphP4cXyz */ -bool cM3dGSph::cross(const cM3dGSph* pOther, cXyz* pOut) const { - return cM3d_Cross_SphSph(pOther, this, pOut); +bool cM3dGSph::cross(const cM3dGSph* other, cXyz* out) const { + return cM3d_Cross_SphSph(other, this, out); } /* 8026F73C-8026F76C 26A07C 0030+00 0/0 1/1 0/0 .text cross__8cM3dGSphCFPC8cM3dGCylP4cXyz */ -bool cM3dGSph::cross(const cM3dGCyl* pCylinder, cXyz* pOut) const { +bool cM3dGSph::cross(const cM3dGCyl* cyl, cXyz* out) const { f32 f; - return cM3d_Cross_CylSph(pCylinder, this, pOut, &f); + return cM3d_Cross_CylSph(cyl, this, out, &f); } /* 8026F76C-8026F7B0 26A0AC 0044+00 0/0 1/1 0/0 .text GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz */ -void cM3dGSph::GetMinMaxCube(cXyz& pMin, cXyz& pMax) const { - pMin.x = mCenter.x - mRadius; - pMin.y = mCenter.y - mRadius; - pMin.z = mCenter.z - mRadius; - pMax.x = mCenter.x + mRadius; - pMax.y = mCenter.y + mRadius; - pMax.z = mCenter.z + mRadius; +void cM3dGSph::GetMinMaxCube(cXyz& min, cXyz& max) const { + min.x = mCenter.x - mRadius; + min.y = mCenter.y - mRadius; + min.z = mCenter.z - mRadius; + max.x = mCenter.x + mRadius; + max.y = mCenter.y + mRadius; + max.z = mCenter.z + mRadius; } diff --git a/libs/SSystem/SComponent/c_m3d_g_tri.cpp b/libs/SSystem/SComponent/c_m3d_g_tri.cpp index 399f23347b..81a32d0e7b 100644 --- a/libs/SSystem/SComponent/c_m3d_g_tri.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_tri.cpp @@ -1,43 +1,38 @@ -// -// Generated By: dol2asm -// Translation Unit: c_m3d_g_tri -// +/** + * c_m3d_g_tri.cpp + * + */ #include "SSystem/SComponent/c_m3d_g_tri.h" #include "SSystem/SComponent/c_m3d.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 8026F7B0-8026F7DC 26A0F0 002C+00 0/0 1/1 0/0 .text cross__8cM3dGTriCFPC8cM3dGCylP3Vec */ -bool cM3dGTri::cross(const cM3dGCyl* pCylinder, Vec* out) const { - return cM3d_Cross_CylTri(pCylinder, this, out); +bool cM3dGTri::cross(const cM3dGCyl* cyl, Vec* out) const { + return cM3d_Cross_CylTri(cyl, this, out); } /* 8026F7DC-8026F85C 26A11C 0080+00 0/0 0/0 6/6 .text setPos__8cM3dGTriFPC3VecPC3VecPC3Vec */ -void cM3dGTri::setPos(const Vec* pA, const Vec* pB, const Vec* pC) { - mA = *pA; - mB = *pB; - mC = *pC; +void cM3dGTri::setPos(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c) { + mA = *vtx_a; + mB = *vtx_b; + mC = *vtx_c; cM3d_CalcPla(&mA, &mB, &mC, &mNormal, &mD); } /* 8026F85C-8026F8C8 26A19C 006C+00 0/0 2/2 0/0 .text * setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla */ -void cM3dGTri::setBg(const Vec* pA, const Vec* pB, const Vec* pC, const cM3dGPla* pPlane) { - mA = *pA; - mB = *pB; - mC = *pC; - Set(pPlane); +void cM3dGTri::setBg(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c, const cM3dGPla* plane) { + mA = *vtx_a; + mB = *vtx_b; + mC = *vtx_c; + Set(plane); } /* 8026F8C8-8026F93C 26A208 0074+00 0/0 1/1 0/0 .text set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec */ -void cM3dGTri::set(const Vec* pA, const Vec* pB, const Vec* pC, const Vec* pNormal) { - mA = *pA; - mB = *pB; - mC = *pC; - SetupNP(*pNormal, *pA); +void cM3dGTri::set(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c, const Vec* normal) { + mA = *vtx_a; + mB = *vtx_b; + mC = *vtx_c; + SetupNP(*normal, *vtx_a); } diff --git a/libs/SSystem/SComponent/c_malloc.cpp b/libs/SSystem/SComponent/c_malloc.cpp index d2b246e9fa..4e4015257b 100644 --- a/libs/SSystem/SComponent/c_malloc.cpp +++ b/libs/SSystem/SComponent/c_malloc.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: c_malloc -// +/** + * c_malloc.cpp + * + */ #include "SSystem/SComponent/c_malloc.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/libs/SSystem/SComponent/c_math.cpp b/libs/SSystem/SComponent/c_math.cpp index 1ff399838c..f280ea683f 100644 --- a/libs/SSystem/SComponent/c_math.cpp +++ b/libs/SSystem/SComponent/c_math.cpp @@ -1,26 +1,23 @@ -// -// Generated By: dol2asm -// Translation Unit: c_math -// +/** + * c_math.cpp + * Math Helper Utilities + */ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d.h" #include "dolphin/types.h" -// -// Declarations: -// - /* 802675E4-80267640 261F24 005C+00 0/0 23/23 11/11 .text cM_rad2s__Ff */ -s16 cM_rad2s(float f0) { - f32 tmpF = fmod(f0, 6.2831854820251465 /* approx. 2 * PI */); - s32 tmp = (tmpF * 10430.378f /* approx. 32768 / PI */); - if (tmp < -0x8000) { - tmp += 0x10000; - } else if (tmp > 0x7FFF) { - tmp -= 0x10000; +s16 cM_rad2s(float rad) { + f32 rad_mod = fmod(rad, 2 * M_PI); + + s32 s = (rad_mod * (0x8000 / M_PI)); + if (s < -0x8000) { + s += 0x10000; + } else if (s > 0x7FFF) { + s -= 0x10000; } - return tmp; + return s; } /* ############################################################################################## */ @@ -116,57 +113,57 @@ static u16 atntable[1025] = { /* 80267640-80267674 261F80 0034+00 1/1 0/0 0/0 .text U_GetAtanTable__Fff */ u16 U_GetAtanTable(float f0, float f1) { - return atntable[(int)(f0 / f1 * 1024)]; + return atntable[(int)(f0 / f1 * 0x400)]; } /* 80267674-80267814 261FB4 01A0+00 1/1 82/82 822/822 .text cM_atan2s__Fff */ -s16 cM_atan2s(float f0, float f1) { - u32 retVar; - if (fabsf(f0) < G_CM3D_F_ABS_MIN) { - if (f1 >= 0.0f) { - retVar = 0; +s16 cM_atan2s(float y, float x) { + u32 ret; + if (fabsf(y) < G_CM3D_F_ABS_MIN) { + if (x >= 0.0f) { + ret = 0; } else { - retVar = 0x8000; + ret = 0x8000; } - } else if (fabsf(f1) < G_CM3D_F_ABS_MIN) { - if (f0 >= 0.0f) { - retVar = 0x4000; + } else if (fabsf(x) < G_CM3D_F_ABS_MIN) { + if (y >= 0.0f) { + ret = 0x4000; } else { - retVar = 0xC000; + ret = 0xC000; } - } else if (f0 >= 0.0f) { - if (f1 >= 0.0f) { - if (f1 >= f0) { - retVar = U_GetAtanTable(f0, f1); + } else if (y >= 0.0f) { + if (x >= 0.0f) { + if (x >= y) { + ret = U_GetAtanTable(y, x); } else { - retVar = 0x4000 - U_GetAtanTable(f1, f0); + ret = 0x4000 - U_GetAtanTable(x, y); } } else { - if (-f1 < f0) { - retVar = U_GetAtanTable(-f1, f0) + 0x4000; + if (-x < y) { + ret = U_GetAtanTable(-x, y) + 0x4000; } else { - retVar = 0x8000 - U_GetAtanTable(f0, -f1); + ret = 0x8000 - U_GetAtanTable(y, -x); } } - } else if (f1 < 0.0f) { - if (f1 <= f0) { - retVar = U_GetAtanTable(-f0, -f1) + 0x8000; + } else if (x < 0.0f) { + if (x <= y) { + ret = U_GetAtanTable(-y, -x) + 0x8000; } else { - retVar = 0xC000 - U_GetAtanTable(-f1, -f0); + ret = 0xC000 - U_GetAtanTable(-x, -y); } } else { - if (f1 < -f0) { - retVar = U_GetAtanTable(f1, -f0) + 0xC000; + if (x < -y) { + ret = U_GetAtanTable(x, -y) + 0xC000; } else { - retVar = -U_GetAtanTable(-f0, f1); + ret = -U_GetAtanTable(-y, x); } } - return retVar; + return ret; } /* 80267814-8026785C 262154 0048+00 0/0 4/4 5/5 .text cM_atan2f__Fff */ -float cM_atan2f(float f1, float f2) { - return 9.58738E-5f * cM_atan2s(f1, f2); +float cM_atan2f(float y, float x) { + return ((2 * M_PI) / 0x10000) * cM_atan2s(y, x); } /* ############################################################################################## */ @@ -180,28 +177,42 @@ static s32 r1; static s32 r2; /* 8026785C-8026786C 26219C 0010+00 0/0 1/1 0/0 .text cM_initRnd__Fiii */ -void cM_initRnd(int p0, int p1, int p2) { - r0 = p0; - r1 = p1; - r2 = p2; +void cM_initRnd(int s0, int s1, int s2) { + r0 = s0; + r1 = s1; + r2 = s2; } /* 8026786C-80267954 2621AC 00E8+00 2/2 15/15 113/113 .text cM_rnd__Fv */ -float cM_rnd(void) { - r0 = (r0 * 0xAB) % 0x763D; - r1 = (r1 * 0xAC) % 0x7663; - r2 = (r2 * 0xAA) % 0x7673; +/** + * Gets a random value + * @return a random value + */ +float cM_rnd() { + r0 = (r0 * 171) % 30269; + r1 = (r1 * 172) % 30307; + r2 = (r2 * 170) % 30323; return fabsf(fmod(r0 / 30269.0f + r1 / 30307.0f + r2 / 30323.0f, 1.0)); } /* 80267954-8026798C 262294 0038+00 0/0 34/34 951/951 .text cM_rndF__Ff */ -float cM_rndF(float f) { - return cM_rnd() * f; +/** + * Gets a random value between 0 and a given upper bound + * @param max The upper bound the random value can be + * @return a random value between 0 and `max` + */ +float cM_rndF(float max) { + return cM_rnd() * max; } /* 8026798C-802679D4 2622CC 0048+00 0/0 24/24 450/450 .text cM_rndFX__Ff */ -float cM_rndFX(float f) { - return f * (cM_rnd() - 0.5f) * 2.0f; +/** + * Gets a random value between given bounds + * @param max The upper and lower bound the random value can be + * @return a random value between -`max` and +`max` + */ +float cM_rndFX(float max) { + return max * (cM_rnd() - 0.5f) * 2.0f; } /* ############################################################################################## */ @@ -215,26 +226,26 @@ static s32 r12; static s32 r22; /* 802679D4-802679E4 262314 0010+00 0/0 0/0 8/8 .text cM_initRnd2__Fiii */ -void cM_initRnd2(int p0, int p1, int p2) { - r02 = p0; - r12 = p1; - r22 = p2; +void cM_initRnd2(int s0, int s1, int s2) { + r02 = s0; + r12 = s1; + r22 = s2; } /* 802679E4-80267ACC 262324 00E8+00 2/2 0/0 0/0 .text cM_rnd2__Fv */ -float cM_rnd2(void) { - r02 = (r02 * 0xAB) % 0x763D; - r12 = (r12 * 0xAC) % 0x7663; - r22 = (r22 * 0xAA) % 0x7673; +float cM_rnd2() { + r02 = (r02 * 171) % 30269; + r12 = (r12 * 172) % 30307; + r22 = (r22 * 170) % 30323; return fabsf(fmod(r02 / 30269.0f + r12 / 30307.0f + r22 / 30323.0f, 1.0)); } /* 80267ACC-80267B04 26240C 0038+00 0/0 0/0 14/14 .text cM_rndF2__Ff */ -float cM_rndF2(float f) { - return cM_rnd2() * f; +float cM_rndF2(float max) { + return cM_rnd2() * max; } /* 80267B04-80267B4C 262444 0048+00 0/0 0/0 7/7 .text cM_rndFX2__Ff */ -float cM_rndFX2(float f) { - return f * (cM_rnd2() - 0.5f) * 2.0f; +float cM_rndFX2(float max) { + return max * (cM_rnd2() - 0.5f) * 2.0f; } diff --git a/libs/SSystem/SComponent/c_node.cpp b/libs/SSystem/SComponent/c_node.cpp index 262a307d06..814964eda0 100644 --- a/libs/SSystem/SComponent/c_node.cpp +++ b/libs/SSystem/SComponent/c_node.cpp @@ -1,123 +1,123 @@ -// -// Generated By: dol2asm -// Translation Unit: c_node -// +/** + * c_node.cpp + * + */ #include "SSystem/SComponent/c_node.h" #include "dolphin/types.h" /* 802660D0-802660DC 000C+00 s=1 e=0 z=0 None .text cNd_Join__FP10node_classP10node_class */ -void cNd_Join(node_class* pA, node_class* pB) { - pA->mpNextNode = pB; - pB->mpPrevNode = pA; +void cNd_Join(node_class* node_a, node_class* node_b) { + node_a->mpNextNode = node_b; + node_b->mpPrevNode = node_a; } /* 802660DC-8026610C 0030+00 s=0 e=2 z=0 None .text cNd_LengthOf__FP10node_class */ -int cNd_LengthOf(node_class* pNode) { +int cNd_LengthOf(node_class* node) { int count = 0; - while (pNode) { + while (node) { count++; - pNode = NODE_GET_NEXT(pNode); + node = NODE_GET_NEXT(node); } return count; } /* 8026610C-8026613C 0030+00 s=0 e=1 z=0 None .text cNd_First__FP10node_class */ -node_class* cNd_First(node_class* pNode) { - node_class* pRet = NULL; - while (pNode) { - pRet = pNode; - pNode = NODE_GET_PREV(pNode); +node_class* cNd_First(node_class* node) { + node_class* ret = NULL; + while (node) { + ret = node; + node = NODE_GET_PREV(node); } - return pRet; + return ret; } /* 8026613C-8026616C 0030+00 s=1 e=1 z=0 None .text cNd_Last__FP10node_class */ -node_class* cNd_Last(node_class* pNode) { - node_class* pRet = NULL; - while (pNode) { - pRet = pNode; - pNode = NODE_GET_NEXT(pNode); +node_class* cNd_Last(node_class* node) { + node_class* ret = NULL; + while (node) { + ret = node; + node = NODE_GET_NEXT(node); } - return pRet; + return ret; } /* 8026616C-802661BC 0050+00 s=0 e=1 z=0 None .text cNd_Order__FP10node_classi */ -node_class* cNd_Order(node_class* pNode, int idx) { - node_class* pRet = NULL; +node_class* cNd_Order(node_class* node, int idx) { + node_class* ret = NULL; int i = 0; - while (i < idx && pNode) { - pRet = pNode; + while (i < idx && node) { + ret = node; i++; - pNode = NODE_GET_NEXT(pNode); + node = NODE_GET_NEXT(node); } if (i < idx) - return pRet; + return ret; return NULL; } /* 802661BC-802661F0 0034+00 s=0 e=1 z=0 None .text cNd_SingleCut__FP10node_class */ -void cNd_SingleCut(node_class* pNode) { - node_class* pPrev = pNode->mpPrevNode; - node_class* pNext = pNode->mpNextNode; +void cNd_SingleCut(node_class* node) { + node_class* prev = node->mpPrevNode; + node_class* next = node->mpNextNode; - if (pPrev) - pPrev->mpNextNode = pNode->mpNextNode; - if (pNext) - pNext->mpPrevNode = pNode->mpPrevNode; - pNode->mpPrevNode = NULL; - pNode->mpNextNode = NULL; + if (prev) + prev->mpNextNode = node->mpNextNode; + if (next) + next->mpPrevNode = node->mpPrevNode; + node->mpPrevNode = NULL; + node->mpNextNode = NULL; } /* 802661F0-80266210 0020+00 s=1 e=0 z=0 None .text cNd_Cut__FP10node_class */ -void cNd_Cut(node_class* pNode) { - if (pNode->mpPrevNode) - pNode->mpPrevNode->mpNextNode = NULL; - pNode->mpPrevNode = NULL; +void cNd_Cut(node_class* node) { + if (node->mpPrevNode) + node->mpPrevNode->mpNextNode = NULL; + node->mpPrevNode = NULL; } /* 80266210-80266244 0034+00 s=1 e=1 z=0 None .text cNd_Addition__FP10node_classP10node_class */ -void cNd_Addition(node_class* pA, node_class* pB) { - node_class* pLast = cNd_Last(pA); - cNd_Join(pLast, pB); +void cNd_Addition(node_class* node_a, node_class* node_b) { + node_class* pLast = cNd_Last(node_a); + cNd_Join(pLast, node_b); } /* 80266244-802662B0 006C+00 s=0 e=1 z=0 None .text cNd_Insert__FP10node_classP10node_class */ -void cNd_Insert(node_class* pA, node_class* pB) { - node_class* pPrev = pA->mpPrevNode; - if (pPrev == NULL) { - cNd_Addition(pB, pA); +void cNd_Insert(node_class* node_a, node_class* node_b) { + node_class* prev = node_a->mpPrevNode; + if (prev == NULL) { + cNd_Addition(node_b, node_a); } else { - cNd_Cut(pA); - cNd_Addition(pPrev, pB); - cNd_Addition(pB, pA); + cNd_Cut(node_a); + cNd_Addition(prev, node_b); + cNd_Addition(node_b, node_a); } } /* 802662B0-802662D8 0028+00 s=1 e=2 z=0 None .text cNd_SetObject__FP10node_classPv */ -void cNd_SetObject(node_class* pNode, void* pData) { - while (pNode) { - pNode->mpData = pData; - pNode = NODE_GET_NEXT(pNode); +void cNd_SetObject(node_class* node, void* data) { + while (node) { + node->mpData = data; + node = NODE_GET_NEXT(node); } } /* 802662D8-802662FC 0024+00 s=0 e=1 z=0 None .text cNd_ClearObject__FP10node_class */ -void cNd_ClearObject(node_class* pNode) { - cNd_SetObject(pNode, NULL); +void cNd_ClearObject(node_class* node) { + cNd_SetObject(node, NULL); } /* 802662FC-80266310 0014+00 s=0 e=1 z=0 None .text cNd_ForcedClear__FP10node_class */ -void cNd_ForcedClear(node_class* pNode) { - pNode->mpPrevNode = NULL; - pNode->mpNextNode = NULL; - pNode->mpData = NULL; +void cNd_ForcedClear(node_class* node) { + node->mpPrevNode = NULL; + node->mpNextNode = NULL; + node->mpData = NULL; } /* 80266310-80266324 0014+00 s=0 e=2 z=0 None .text cNd_Create__FP10node_classPv */ -void cNd_Create(node_class* pNode, void* pData) { - pNode->mpPrevNode = NULL; - pNode->mpNextNode = NULL; - pNode->mpData = pData; +void cNd_Create(node_class* node, void* data) { + node->mpPrevNode = NULL; + node->mpNextNode = NULL; + node->mpData = data; } diff --git a/libs/SSystem/SComponent/c_node_iter.cpp b/libs/SSystem/SComponent/c_node_iter.cpp index 22ccfbef7f..b25853eaad 100644 --- a/libs/SSystem/SComponent/c_node_iter.cpp +++ b/libs/SSystem/SComponent/c_node_iter.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: c_node_iter -// +/** + * c_node_iter.cpp + * + */ #include "SSystem/SComponent/c_node_iter.h" #include "SSystem/SComponent/c_node.h" @@ -9,15 +9,15 @@ /* 80266324-802663B4 0090+00 s=0 e=1 z=0 None .text * cNdIt_Method__FP10node_classPFP10node_classPv_iPv */ -int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData) { +int cNdIt_Method(node_class* node, cNdIt_MethodFunc method, void* data) { int ret = 1; - node_class* pNext = NODE_GET_NEXT(pNode); + node_class* pNext = NODE_GET_NEXT(node); - while (pNode) { - int methodRet = pMethod(pNode, pUserData); + while (node) { + int methodRet = method(node, data); if (!methodRet) ret = 0; - pNode = pNext; + node = pNext; pNext = NODE_GET_NEXT(pNext); } @@ -26,14 +26,14 @@ int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData) { /* 802663B4-80266440 008C+00 s=0 e=1 z=0 None .text * cNdIt_Judge__FP10node_classPFP10node_classPv_PvPv */ -void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData) { - node_class* pNext = NODE_GET_NEXT(pNode); +void* cNdIt_Judge(node_class* node, cNdIt_JudgeFunc judge, void* data) { + node_class* pNext = NODE_GET_NEXT(node); - while (pNode) { - void* pJudgeRet = pJudge(pNode, pUserData); - if (pJudgeRet != NULL) - return pJudgeRet; - pNode = pNext; + while (node) { + void* ret = judge(node, data); + if (ret != NULL) + return ret; + node = pNext; pNext = NODE_GET_NEXT(pNext); } diff --git a/libs/SSystem/SComponent/c_phase.cpp b/libs/SSystem/SComponent/c_phase.cpp index 7384df2c1a..921dcc90c4 100644 --- a/libs/SSystem/SComponent/c_phase.cpp +++ b/libs/SSystem/SComponent/c_phase.cpp @@ -1,53 +1,48 @@ -// -// Generated By: dol2asm -// Translation Unit: c_phase -// +/** + * c_phase.cpp + * + */ #include "SSystem/SComponent/c_phase.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80266624-80266630 000C+00 s=1 e=2 z=0 None .text * cPhs_Reset__FP30request_of_phase_process_class */ -void cPhs_Reset(request_of_phase_process_class* pPhase) { - pPhase->id = cPhs_INIT_e; +void cPhs_Reset(request_of_phase_process_class* phase) { + phase->id = cPhs_INIT_e; } /* 80266630-80266640 0010+00 s=0 e=3 z=0 None .text * cPhs_Set__FP30request_of_phase_process_classPPFPv_i */ -void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable) { - pPhase->mpHandlerTable = pHandlerTable; - pPhase->id = cPhs_INIT_e; +void cPhs_Set(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl) { + phase->mpHandlerTable = handlerTbl; + phase->id = cPhs_INIT_e; } /* 80266640-80266668 0028+00 s=1 e=0 z=0 None .text * cPhs_UnCompleate__FP30request_of_phase_process_class */ -void cPhs_UnCompleate(request_of_phase_process_class* pPhase) { - pPhase->mpHandlerTable = NULL; - cPhs_Reset(pPhase); +void cPhs_UnCompleate(request_of_phase_process_class* phase) { + phase->mpHandlerTable = NULL; + cPhs_Reset(phase); } /* 80266668-80266678 0010+00 s=2 e=0 z=0 None .text * cPhs_Compleate__FP30request_of_phase_process_class */ -int cPhs_Compleate(request_of_phase_process_class* pPhase) { - pPhase->mpHandlerTable = NULL; +int cPhs_Compleate(request_of_phase_process_class* phase) { + phase->mpHandlerTable = NULL; return cPhs_COMPLEATE_e; } /* 80266678-802666D8 0060+00 s=1 e=0 z=0 None .text cPhs_Next__FP30request_of_phase_process_class */ -int cPhs_Next(request_of_phase_process_class* pPhase) { - if (const cPhs__Handler* handlerTable = pPhase->mpHandlerTable) { - pPhase->id++; - cPhs__Handler handler = handlerTable[pPhase->id]; +int cPhs_Next(request_of_phase_process_class* phase) { + if (const cPhs__Handler* handlerTable = phase->mpHandlerTable) { + phase->id++; + cPhs__Handler handler = handlerTable[phase->id]; // Double null check here actually matters for emitted assembly. // Wee old compilers. if (handler == NULL || handler == NULL) { - return cPhs_Compleate(pPhase); + return cPhs_Compleate(phase); } else { return cPhs_LOADING_e; } @@ -58,47 +53,38 @@ int cPhs_Next(request_of_phase_process_class* pPhase) { /* 802666D8-802667AC 00D4+00 s=1 e=3 z=0 None .text cPhs_Do__FP30request_of_phase_process_classPv */ -#ifdef NONMATCHING -// pUserData loading in too early -int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) { - if (pPhase->mpHandlerTable) { - int newStep = pPhase->mpHandlerTable[pPhase->id](pUserData); +int cPhs_Do(request_of_phase_process_class* phase, void* data) { + cPhs__Handler* handler = phase->mpHandlerTable; + + if (handler) { + handler += phase->id; + int newStep = (*handler)(data); switch (newStep) { case cPhs_LOADING_e: - return cPhs_Next(pPhase); + return cPhs_Next(phase); case cPhs_NEXT_e: - return cPhs_Next(pPhase) == cPhs_LOADING_e ? cPhs_NEXT_e : cPhs_COMPLEATE_e; + return cPhs_Next(phase) == cPhs_LOADING_e ? cPhs_NEXT_e : cPhs_COMPLEATE_e; case cPhs_COMPLEATE_e: - return cPhs_Compleate(pPhase); + return cPhs_Compleate(phase); case cPhs_UNK3_e: - cPhs_UnCompleate(pPhase); + cPhs_UnCompleate(phase); return cPhs_UNK3_e; case cPhs_ERROR_e: - cPhs_UnCompleate(pPhase); + cPhs_UnCompleate(phase); return cPhs_ERROR_e; + case cPhs_INIT_e: default: return newStep; } } - - return cPhs_Compleate(pPhase); + + return cPhs_Compleate(phase); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int cPhs_Do(request_of_phase_process_class* param_0, void* param_1) { - nofralloc -#include "asm/SSystem/SComponent/c_phase/cPhs_Do__FP30request_of_phase_process_classPv.s" -} -#pragma pop -#endif /* 802667AC-802667D4 0028+00 s=0 e=2 z=0 None .text * cPhs_Handler__FP30request_of_phase_process_classPPFPv_iPv */ -int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, - void* pUserData) { - pPhase->mpHandlerTable = pHandlerTable; - return cPhs_Do(pPhase, pUserData); +int cPhs_Handler(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl, void* data) { + phase->mpHandlerTable = handlerTbl; + return cPhs_Do(phase, data); } diff --git a/libs/SSystem/SComponent/c_request.cpp b/libs/SSystem/SComponent/c_request.cpp index e5d21020cc..b4ef5f8dcf 100644 --- a/libs/SSystem/SComponent/c_request.cpp +++ b/libs/SSystem/SComponent/c_request.cpp @@ -1,27 +1,14 @@ -// -// Generated By: dol2asm -// Translation Unit: c_request -// +/** + * c_request.cpp + * + */ #include "SSystem/SComponent/c_request.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -// -// External References: -// - -// -// Declarations: -// /* 802667D4-80266800 261114 002C+00 0/0 3/3 0/0 .text cReq_Is_Done__FP18request_base_class */ -int cReq_Is_Done(request_base_class* param_0) { - if (param_0->field_0x0.flag1 == 1) { - param_0->field_0x0.flag1 = 0; +int cReq_Is_Done(request_base_class* i_this) { + if (i_this->field_0x0.flag1 == 1) { + i_this->field_0x0.flag1 = 0; return 1; } return 0; @@ -29,20 +16,20 @@ int cReq_Is_Done(request_base_class* param_0) { /* 80266800-80266830 261140 0030+00 0/0 3/3 0/0 .text cReq_Done__FP18request_base_class */ -void cReq_Done(request_base_class* param_0) { - param_0->field_0x0.flag0 = 0; - param_0->field_0x0.flag1 = 1; - param_0->field_0x0.flag2 = 0; +void cReq_Done(request_base_class* i_this) { + i_this->field_0x0.flag0 = 0; + i_this->field_0x0.flag1 = 1; + i_this->field_0x0.flag2 = 0; } /* 80266830-80266850 261170 0020+00 0/0 2/2 0/0 .text cReq_Command__FP18request_base_classUc */ -void cReq_Command(request_base_class* param_0, u8 param_1) { - cReq_Create(param_0, param_1); +void cReq_Command(request_base_class* i_this, u8 param_1) { + cReq_Create(i_this, param_1); } /* 80266850-80266880 261190 0030+00 1/1 2/2 0/0 .text cReq_Create__FP18request_base_classUc */ -void cReq_Create(request_base_class* param_0, u8 param_1) { - param_0->field_0x0.flag0 = 1; - param_0->field_0x0.flag1 = 0; - param_0->field_0x0.flag2 = param_1; +void cReq_Create(request_base_class* i_this, u8 param_1) { + i_this->field_0x0.flag0 = 1; + i_this->field_0x0.flag1 = 0; + i_this->field_0x0.flag2 = param_1; } diff --git a/libs/SSystem/SComponent/c_sxyz.cpp b/libs/SSystem/SComponent/c_sxyz.cpp index aa9724fd44..0afe30f75f 100644 --- a/libs/SSystem/SComponent/c_sxyz.cpp +++ b/libs/SSystem/SComponent/c_sxyz.cpp @@ -1,42 +1,37 @@ -// -// Generated By: dol2asm -// Translation Unit: c_sxyz -// +/** + * c_sxyz.cpp + * + */ #include "SSystem/SComponent/c_sxyz.h" -#include "dolphin/types.h" - -// -// Declarations: -// const csXyz csXyz::Zero = csXyz(0, 0, 0); /* 802673F4-80267404 0010+00 s=4 e=19 z=119 None .text __ct__5csXyzFsss */ -csXyz::csXyz(s16 param_0, s16 param_1, s16 param_2) { - x = param_0; - y = param_1; - z = param_2; +csXyz::csXyz(s16 x, s16 y, s16 z) { + this->x = x; + this->y = y; + this->z = z; } /* 80267404-8026745C 0058+00 s=0 e=0 z=3 None .text __pl__5csXyzFR5csXyz */ -csXyz csXyz::operator+(csXyz& param_0) { - return csXyz(x + param_0.x, y + param_0.y, z + param_0.z); +csXyz csXyz::operator+(csXyz& other) { + return csXyz(x + other.x, y + other.y, z + other.z); } /* 8026745C-80267490 0034+00 s=0 e=2 z=11 None .text __apl__5csXyzFR5csXyz */ -void csXyz::operator+=(csXyz& param_0) { - x += param_0.x; - y += param_0.y; - z += param_0.z; +void csXyz::operator+=(csXyz& other) { + x += other.x; + y += other.y; + z += other.z; } /* 80267490-802674E8 0058+00 s=0 e=0 z=1 None .text __mi__5csXyzFR5csXyz */ -csXyz csXyz::operator-(csXyz& param_0) { - return csXyz(x - param_0.x, y - param_0.y, z - param_0.z); +csXyz csXyz::operator-(csXyz& other) { + return csXyz(x - other.x, y - other.y, z - other.z); } /* 802674E8-8026758C 00A4+00 s=0 e=0 z=1 None .text __ml__5csXyzFf */ -csXyz csXyz::operator*(f32 param_0) { - return csXyz(x * param_0, y * param_0, z * param_0); +csXyz csXyz::operator*(f32 mul) { + return csXyz(x * mul, y * mul, z * mul); } diff --git a/libs/SSystem/SComponent/c_tag.cpp b/libs/SSystem/SComponent/c_tag.cpp index 5ce35b0a53..16aa316952 100644 --- a/libs/SSystem/SComponent/c_tag.cpp +++ b/libs/SSystem/SComponent/c_tag.cpp @@ -1,24 +1,23 @@ -// -// Generated By: dol2asm -// Translation Unit: c_tag -// +/** + * c_tag.cpp + * + */ #include "SSystem/SComponent/c_tag.h" #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_tree.h" -#include "dolphin/types.h" /* 80266880-8026688C 000C+00 s=0 e=3 z=0 None .text cTg_IsUse__FP16create_tag_class */ -int cTg_IsUse(create_tag_class* pTag) { - return pTag->mbIsUse; +int cTg_IsUse(create_tag_class* tag) { + return tag->mbIsUse; } /* 8026688C-802668CC 0040+00 s=0 e=4 z=0 None .text cTg_SingleCutFromTree__FP16create_tag_class */ -int cTg_SingleCutFromTree(create_tag_class* pTag) { - if (pTag->mbIsUse == true) { - pTag->mbIsUse = false; - cTr_SingleCut(&pTag->mpNode); +int cTg_SingleCutFromTree(create_tag_class* tag) { + if (tag->mbIsUse == true) { + tag->mbIsUse = false; + cTr_SingleCut(&tag->mpNode); return true; } else { return false; @@ -27,11 +26,11 @@ int cTg_SingleCutFromTree(create_tag_class* pTag) { /* 802668CC-8026691C 0050+00 s=0 e=3 z=0 None .text * cTg_AdditionToTree__FP21node_lists_tree_classiP16create_tag_class */ -int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag) { - if (!pTag->mbIsUse) { - int ret = cTr_Addition(pTree, listIdx, &pTag->mpNode); +int cTg_AdditionToTree(node_lists_tree_class* tree, int listIdx, create_tag_class* tag) { + if (!tag->mbIsUse) { + int ret = cTr_Addition(tree, listIdx, &tag->mpNode); if (ret) { - pTag->mbIsUse = true; + tag->mbIsUse = true; return ret; } } @@ -41,11 +40,11 @@ int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_cla /* 8026691C-8026696C 0050+00 s=0 e=1 z=0 None .text * cTg_InsertToTree__FP21node_lists_tree_classiP16create_tag_classi */ -int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag, int idx) { - if (!pTag->mbIsUse) { - int ret = cTr_Insert(pTree, listIdx, &pTag->mpNode, idx); +int cTg_InsertToTree(node_lists_tree_class* tree, int listIdx, create_tag_class* tag, int idx) { + if (!tag->mbIsUse) { + int ret = cTr_Insert(tree, listIdx, &tag->mpNode, idx); if (ret) { - pTag->mbIsUse = true; + tag->mbIsUse = true; return ret; } } @@ -54,21 +53,21 @@ int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class } /* 8026696C-802669A4 0038+00 s=0 e=1 z=0 None .text cTg_GetFirst__FP15node_list_class */ -node_class* cTg_GetFirst(node_list_class* pList) { - create_tag_class* pTag = (create_tag_class*)cLs_GetFirst(pList); - if (pTag != NULL) { - pTag->mbIsUse = false; +node_class* cTg_GetFirst(node_list_class* list) { + create_tag_class* tag = (create_tag_class*)cLs_GetFirst(list); + if (tag != NULL) { + tag->mbIsUse = false; } else { - pTag = NULL; + tag = NULL; } - return &pTag->mpNode; + return &tag->mpNode; } /* 802669A4-802669E4 0040+00 s=0 e=7 z=0 None .text cTg_SingleCut__FP16create_tag_class */ -int cTg_SingleCut(create_tag_class* pTag) { - if (pTag->mbIsUse == 1) { - pTag->mbIsUse = false; - cLs_SingleCut(&pTag->mpNode); +int cTg_SingleCut(create_tag_class* tag) { + if (tag->mbIsUse == 1) { + tag->mbIsUse = false; + cLs_SingleCut(&tag->mpNode); return 1; } @@ -77,11 +76,11 @@ int cTg_SingleCut(create_tag_class* pTag) { /* 802669E4-80266A34 0050+00 s=0 e=7 z=0 None .text * cTg_Addition__FP15node_list_classP16create_tag_class */ -int cTg_Addition(node_list_class* pList, create_tag_class* pTag) { - if (!pTag->mbIsUse) { - int ret = cLs_Addition(pList, &pTag->mpNode); +int cTg_Addition(node_list_class* list, create_tag_class* tag) { + if (!tag->mbIsUse) { + int ret = cLs_Addition(list, &tag->mpNode); if (ret) { - pTag->mbIsUse = true; + tag->mbIsUse = true; return ret; } } @@ -90,8 +89,8 @@ int cTg_Addition(node_list_class* pList, create_tag_class* pTag) { } /* 80266A34-80266A7C 0048+00 s=0 e=10 z=0 None .text cTg_Create__FP16create_tag_classPv */ -void cTg_Create(create_tag_class* pTag, void* pData) { - cNd_Create(&pTag->mpNode, NULL); - pTag->mpTagData = pData; - pTag->mbIsUse = false; +void cTg_Create(create_tag_class* tag, void* data) { + cNd_Create(&tag->mpNode, NULL); + tag->mpTagData = data; + tag->mbIsUse = false; } diff --git a/libs/SSystem/SComponent/c_tag_iter.cpp b/libs/SSystem/SComponent/c_tag_iter.cpp index 7cf0127ab1..2805ba4953 100644 --- a/libs/SSystem/SComponent/c_tag_iter.cpp +++ b/libs/SSystem/SComponent/c_tag_iter.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: c_tag_iter -// +/** + * c_tag_iter.cpp + * + */ #include "SSystem/SComponent/c_tag_iter.h" #include "SSystem/SComponent/c_tag.h" @@ -9,12 +9,12 @@ /* 80266A7C-80266AB0 0034+00 s=0 e=4 z=0 None .text * cTgIt_MethodCall__FP16create_tag_classP13method_filter */ -int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter) { - return pMethodFilter->mpMethodFunc((node_class*)pTag->mpTagData, pMethodFilter->mpUserData); +int cTgIt_MethodCall(create_tag_class* tag, method_filter* filter) { + return filter->mpMethodFunc((node_class*)tag->mpTagData, filter->mpUserData); } /* 80266AB0-80266AE4 0034+00 s=0 e=5 z=0 None .text * cTgIt_JudgeFilter__FP16create_tag_classP12judge_filter */ -void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter) { - return pJudgeFilter->mpJudgeFunc((node_class*)pTag->mpTagData, pJudgeFilter->mpUserData); +void* cTgIt_JudgeFilter(create_tag_class* tag, judge_filter* filter) { + return filter->mpJudgeFunc((node_class*)tag->mpTagData, filter->mpUserData); } diff --git a/libs/SSystem/SComponent/c_tree.cpp b/libs/SSystem/SComponent/c_tree.cpp index a72eb006cf..16117c8600 100644 --- a/libs/SSystem/SComponent/c_tree.cpp +++ b/libs/SSystem/SComponent/c_tree.cpp @@ -1,41 +1,40 @@ -// -// Generated By: dol2asm -// Translation Unit: c_tree -// +/** + * c_tree.cpp + * + */ #include "SSystem/SComponent/c_tree.h" #include "SSystem/SComponent/c_list.h" -#include "dolphin/types.h" /* 80266440-80266460 0020+00 s=0 e=1 z=0 None .text cTr_SingleCut__FP10node_class */ -int cTr_SingleCut(node_class* pNode) { - return cLs_SingleCut(pNode); +int cTr_SingleCut(node_class* node) { + return cLs_SingleCut(node); } /* 80266460-802664A4 0044+00 s=0 e=1 z=0 None .text * cTr_Addition__FP21node_lists_tree_classiP10node_class */ -int cTr_Addition(node_lists_tree_class* pTree, int listIdx, node_class* pNode) { - if (listIdx >= pTree->mNumLists) +int cTr_Addition(node_lists_tree_class* tree, int listIdx, node_class* node) { + if (listIdx >= tree->mNumLists) return 0; - return cLs_Addition(&pTree->mpLists[listIdx], pNode); + return cLs_Addition(&tree->mpLists[listIdx], node); } /* 802664A4-802664E8 0044+00 s=0 e=1 z=0 None .text * cTr_Insert__FP21node_lists_tree_classiP10node_classi */ -int cTr_Insert(node_lists_tree_class* pTree, int listIdx, node_class* pNode, int idx) { - if (listIdx >= pTree->mNumLists) +int cTr_Insert(node_lists_tree_class* tree, int listIdx, node_class* node, int idx) { + if (listIdx >= tree->mNumLists) return 0; - return cLs_Insert(&pTree->mpLists[listIdx], idx, pNode); + return cLs_Insert(&tree->mpLists[listIdx], idx, node); } /* 802664E8-80266540 0058+00 s=0 e=2 z=0 None .text * cTr_Create__FP21node_lists_tree_classP15node_list_classi */ -void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLists) { - pTree->mpLists = pLists; - pTree->mNumLists = numLists; +void cTr_Create(node_lists_tree_class* tree, node_list_class* lists, int numLists) { + tree->mpLists = lists; + tree->mNumLists = numLists; while (numLists-- > 0) - cLs_Create(pLists++); + cLs_Create(lists++); } diff --git a/libs/SSystem/SComponent/c_tree_iter.cpp b/libs/SSystem/SComponent/c_tree_iter.cpp index b2e9086e7f..1e736e79ce 100644 --- a/libs/SSystem/SComponent/c_tree_iter.cpp +++ b/libs/SSystem/SComponent/c_tree_iter.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: c_tree_iter -// +/** + * c_tree_iter.cpp + * + */ #include "SSystem/SComponent/c_tree_iter.h" #include "SSystem/SComponent/c_list.h" @@ -9,18 +9,14 @@ #include "SSystem/SComponent/c_tree.h" #include "dolphin/types.h" -// -// Declarations: -// - /* 80266540-802665B4 0074+00 s=0 e=2 z=0 None .text * cTrIt_Method__FP21node_lists_tree_classPFP10node_classPv_iPv */ -int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pMethod, void* pUserData) { - node_list_class* pList = pTree->mpLists; - int i = pTree->mNumLists; +int cTrIt_Method(node_lists_tree_class* tree, cNdIt_MethodFunc method, void* data) { + node_list_class* list = tree->mpLists; + int i = tree->mNumLists; int ret = 1; while (i-- > 0) { - int sub = cLsIt_Method(pList++, pMethod, pUserData); + int sub = cLsIt_Method(list++, method, data); if (sub == 0) ret = 0; } @@ -29,11 +25,11 @@ int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pMethod, void* p /* 802665B4-80266624 0070+00 s=0 e=2 z=0 None .text * cTrIt_Judge__FP21node_lists_tree_classPFP10node_classPv_PvPv */ -void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudge, void* pUserData) { - node_list_class* pList = pTree->mpLists; - int i = pTree->mNumLists; +void* cTrIt_Judge(node_lists_tree_class* tree, cNdIt_JudgeFunc judge, void* data) { + node_list_class* list = tree->mpLists; + int i = tree->mNumLists; while (i-- > 0) { - void* pJudgeRet = cLsIt_Judge(pList++, pJudge, pUserData); + void* pJudgeRet = cLsIt_Judge(list++, judge, data); if (pJudgeRet != NULL) return pJudgeRet; } diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp index 1197cbb6e4..fe9ad6fcbb 100644 --- a/libs/SSystem/SComponent/c_xyz.cpp +++ b/libs/SSystem/SComponent/c_xyz.cpp @@ -1,16 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: c_xyz -// +/** + * c_xyz.cpp + * + */ #include "SSystem/SComponent/c_xyz.h" -#include "MSL_C/float.h" +#include "math.h" #include "SSystem/SComponent/c_math.h" -// -// Declarations: -// - /* 80266AE4-80266B34 0050+00 s=0 e=103 z=300 None .text __pl__4cXyzCFRC3Vec */ cXyz cXyz::operator+(const Vec& vec) const { Vec ret; @@ -32,16 +28,12 @@ cXyz cXyz::operator*(f32 scale) const { return cXyz(ret); } -inline void vecMul(const Vec* src1, const Vec* src2, Vec* dst) { - dst->x = src1->x * src2->x; - dst->y = src1->y * src2->y; - dst->z = src1->z * src2->z; -} - /* 80266BD0-80266C18 0048+00 s=0 e=7 z=0 None .text __ml__4cXyzCFRC3Vec */ cXyz cXyz::operator*(const Vec& vec) const { cXyz ret; - vecMul(this, &vec, &ret); + ret.x = this->x * vec.x; + ret.y = this->y * vec.y; + ret.z = this->z * vec.z; return cXyz(ret); } @@ -65,14 +57,14 @@ cXyz cXyz::outprod(const Vec& vec) const { } /* 80266CE4-80266D30 004C+00 s=0 e=10 z=1 None .text norm__4cXyzCFv */ -cXyz cXyz::norm(void) const { +cXyz cXyz::norm() const { Vec ret; VECNormalize(this, &ret); return cXyz(ret); } /* 80266D30-80266DC4 0094+00 s=1 e=4 z=0 None .text normZP__4cXyzCFv */ -cXyz cXyz::normZP(void) const { +cXyz cXyz::normZP() const { Vec vec; if (this->isNearZeroSquare() == false) { VECNormalize(this, &vec); @@ -82,6 +74,7 @@ cXyz cXyz::normZP(void) const { return cXyz(vec); } +// doesn't exist in debug rom, but needed to match? inline void normToUpZIfNearZero(Vec& vec) { if (cXyz(vec).isNearZeroSquare()) { vec.x = 0.0f; @@ -93,7 +86,7 @@ inline void normToUpZIfNearZero(Vec& vec) { } /* 80266DC4-80266EF4 0130+00 s=0 e=0 z=2 None .text normZC__4cXyzCFv */ -cXyz cXyz::normZC(void) const { +cXyz cXyz::normZC() const { Vec outVec; if (this->isNearZeroSquare() == false) { VECNormalize(this, &outVec); @@ -105,13 +98,13 @@ cXyz cXyz::normZC(void) const { } /* 80266EF4-80266F48 0054+00 s=0 e=13 z=17 None .text normalize__4cXyzFv */ -cXyz cXyz::normalize(void) { +cXyz cXyz::normalize() { VECNormalize(this, this); return *this; } /* 80266F48-80266FDC 0094+00 s=0 e=19 z=59 None .text normalizeZP__4cXyzFv */ -cXyz cXyz::normalizeZP(void) { +cXyz cXyz::normalizeZP() { if (this->isNearZeroSquare() == false) { VECNormalize(this, this); } else { @@ -121,7 +114,7 @@ cXyz cXyz::normalizeZP(void) { } /* 80266FDC-8026702C 0050+00 s=0 e=2 z=3 None .text normalizeRS__4cXyzFv */ -bool cXyz::normalizeRS(void) { +bool cXyz::normalizeRS() { if (this->isNearZeroSquare()) { return false; } else { @@ -141,19 +134,18 @@ bool cXyz::operator!=(const Vec& vec) const { } /* 802670AC-80267128 007C+00 s=0 e=4 z=7 None .text isZero__4cXyzCFv */ -bool cXyz::isZero(void) const { - return fabsf(this->x) < 32.0f * FLT_EPSILON && - fabsf(this->y) < 32.0f * FLT_EPSILON && +bool cXyz::isZero() const { + return fabsf(this->x) < 32.0f * FLT_EPSILON && fabsf(this->y) < 32.0f * FLT_EPSILON && fabsf(this->z) < 32.0f * FLT_EPSILON; } /* 80267128-80267150 0028+00 s=0 e=81 z=85 None .text atan2sX_Z__4cXyzCFv */ -s16 cXyz::atan2sX_Z(void) const { +s16 cXyz::atan2sX_Z() const { return cM_atan2s(this->x, this->z); } /* 80267150-80267290 0140+00 s=0 e=21 z=33 None .text atan2sY_XZ__4cXyzCFv */ -s16 cXyz::atan2sY_XZ(void) const { +s16 cXyz::atan2sY_XZ() const { f32 mag = this->getMagXZ(); return cM_atan2s(-this->y, sqrtf(mag)); } diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 503ba80bde..227f868c05 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -14,8 +14,8 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "Z2AudioLib/Z2AudioArcLoader.h" #include "Z2AudioLib/Z2SoundHandles.h" -#include "MSL_C/stdio.h" -#include "MSL_C/stdlib.h" +#include "stdio.h" +#include "stdlib.h" #include "dol2asm.h" #include "dolphin/os/OS.h" diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp index d7bd7a7d6e..ba2d32a19c 100644 --- a/libs/Z2AudioLib/Z2Calc.cpp +++ b/libs/Z2AudioLib/Z2Calc.cpp @@ -5,7 +5,7 @@ #include "Z2AudioLib/Z2Calc.h" #include "JSystem/JMath/random.h" -#include "MSL_C/math.h" +#include "math.h" #include "dol2asm.h" // diff --git a/libs/dolphin/ar/ar.c b/libs/dolphin/ar/ar.c index 4dad7a2f07..73e78a47d9 100644 --- a/libs/dolphin/ar/ar.c +++ b/libs/dolphin/ar/ar.c @@ -4,7 +4,7 @@ // #include "dolphin/ar/ar.h" -#include "MSL_C/string.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/base/PPCArch.h" #include "dolphin/dsp/dsp.h" diff --git a/libs/dolphin/dvd/dvdfs.c b/libs/dolphin/dvd/dvdfs.c index bc44151724..3846295785 100644 --- a/libs/dolphin/dvd/dvdfs.c +++ b/libs/dolphin/dvd/dvdfs.c @@ -6,7 +6,7 @@ #include "dolphin/dvd/dvdfs.h" #include "dolphin/dvd/dvd.h" #include "dolphin/os/OS.h" -#include "MSL_C/MSL_Common/Src/ctype.h" +#include "ctype.h" // // Forward References: diff --git a/libs/dolphin/gx/GXLight.c b/libs/dolphin/gx/GXLight.c index c100a57dbc..a05bf23ba5 100644 --- a/libs/dolphin/gx/GXLight.c +++ b/libs/dolphin/gx/GXLight.c @@ -4,7 +4,7 @@ */ #include "dolphin/gx/GXLight.h" -#include "MSL_C/math.h" +#include "math.h" #include "dolphin/gx/GX.h" /* 8035D630-8035D64C 357F70 001C+00 0/0 1/1 0/0 .text GXInitLightAttn */ diff --git a/libs/dolphin/gx/GXTexture.c b/libs/dolphin/gx/GXTexture.c index fa4df5049a..27b4ebc339 100644 --- a/libs/dolphin/gx/GXTexture.c +++ b/libs/dolphin/gx/GXTexture.c @@ -5,7 +5,7 @@ #include "dolphin/gx/GXTexture.h" #include "dolphin/gx/GX.h" -#include "MSL_C/MSL_Common/Src/string.h" +#include "string.h" #include "dol2asm.h" // diff --git a/libs/dolphin/mtx/mtx.c b/libs/dolphin/mtx/mtx.c index 6d9f3effda..79ef1cb818 100644 --- a/libs/dolphin/mtx/mtx.c +++ b/libs/dolphin/mtx/mtx.c @@ -4,7 +4,7 @@ // #include "dolphin/mtx/mtx.h" -#include "MSL_C/math.h" +#include "math.h" #include "dol2asm.h" // diff --git a/libs/dolphin/mtx/mtx44.c b/libs/dolphin/mtx/mtx44.c index a096f62004..46fdd3a20b 100644 --- a/libs/dolphin/mtx/mtx44.c +++ b/libs/dolphin/mtx/mtx44.c @@ -4,7 +4,7 @@ // #include "dolphin/mtx/mtx44.h" -#include "MSL_C/math.h" +#include "math.h" // // Declarations: diff --git a/libs/dolphin/mtx/quat.c b/libs/dolphin/mtx/quat.c index 22221a204b..a845a458ae 100644 --- a/libs/dolphin/mtx/quat.c +++ b/libs/dolphin/mtx/quat.c @@ -4,7 +4,7 @@ */ #include "dolphin/mtx/quat.h" -#include "MSL_C/math.h" +#include "math.h" /* 80347418-80347474 341D58 005C+00 0/0 0/0 2/2 .text PSQUATMultiply */ void PSQUATMultiply(register const Quaternion* a, register const Quaternion* b, register Quaternion* ab) { diff --git a/libs/dolphin/os/OSExec.c b/libs/dolphin/os/OSExec.c index 5e7a88ae6f..8b51b53d6c 100644 --- a/libs/dolphin/os/OSExec.c +++ b/libs/dolphin/os/OSExec.c @@ -9,8 +9,8 @@ #include "dolphin/dvd/dvd.h" #include "dolphin/ai/ai.h" #include "dol2asm.h" -#include "MSL_C/MSL_Common/Src/string.h" -#include "MSL_C/MSL_Common/Src/printf.h" +#include "string.h" +#include "printf.h" /* 8033CA80-8033CC08 3373C0 0188+00 1/1 0/0 0/0 .text PackArgs */ #pragma push diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index 10eaed78a4..c2301a459f 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -420,8 +420,6 @@ BOOL PADInit() { return PADReset(PAD_CHAN0_BIT | PAD_CHAN1_BIT | PAD_CHAN2_BIT | PAD_CHAN3_BIT); } -#define offsetof(type, memb) ((u32) & ((type*)0)->memb) - /* 8034EEA0-8034F1A0 3497E0 0300+00 0/0 1/1 0/0 .text PADRead */ u32 PADRead(PADStatus* status) { BOOL enabled; diff --git a/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp b/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp index ac8ea6a59d..74b3b37f50 100644 --- a/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp +++ b/libs/odemuexi2/Src/OdemuExi2Lib/DebuggerDriver.cpp @@ -50,6 +50,10 @@ void DBOpen() { /* empty function */ } +/* 80450AF0-80450AF4 000570 0004+00 0/0 1/1 0/0 .sdata None */ +extern float data_80450AF0; +float data_80450AF0 = -0.0f; + /* 80372D34-80372F94 36D674 0260+00 0/0 1/1 0/0 .text DBWrite */ #pragma push #pragma optimization_level 0 diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index 8f39add93e..3e40cbd0e5 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "string.h" // // Types: diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index 6694fb1345..d4b30e9442 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -6,7 +6,7 @@ #include "rel/d/a/d_a_bg_obj/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/os/OS.h" diff --git a/rel/d/a/d_a_grass/d_a_grass.cpp b/rel/d/a/d_a_grass/d_a_grass.cpp index 2f721e8b12..c28b764f9b 100644 --- a/rel/d/a/d_a_grass/d_a_grass.cpp +++ b/rel/d/a/d_a_grass/d_a_grass.cpp @@ -12,6 +12,7 @@ #include "d/d_procname.h" #include "dol2asm.h" #include "m_Do/m_Do_lib.h" +#include "string.h" // // Forward References: diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index 5957c09d73..fe48e4dcc9 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -5,7 +5,7 @@ #include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 4e49b65e24..695fa0fbb0 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -5,7 +5,7 @@ #include "rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h" #include "JSystem/JKernel/JKRHeap.h" -#include "MSL_C/MSL_Common/Src/printf.h" +#include "printf.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_player.h" #include "d/d_door_param2.h" diff --git a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp index cea1ac34f3..b549a9cbda 100644 --- a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp @@ -1,490 +1,230 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rgate -// +/** + * d_a_obj_rgate.cpp + * Bulblin Gate + */ #include "rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "rel/d/a/d_a_horse/d_a_horse.h" +#include "rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h" -// -// Types: -// +#define GATE_L_JNT 1 +#define GATE_R_JNT 2 -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; +enum { + ACT_WAIT_EVENT, + ACT_EVENT, + ACT_DEAD, }; -struct fopAc_ac_c {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; +enum { + DEMO_ACT_WAIT, + DEMO_ACT_ADJUSTMENT, + DEMO_ACT_UNLOCK, + DEMO_ACT_OPEN, }; -struct daObjRgate_c { - /* 80CB9DF8 */ void initBaseMtx(); - /* 80CB9F4C */ void setBaseMtx(); - /* 80CBA468 */ void Create(); - /* 80CBA654 */ void CreateHeap(); - /* 80CBA828 */ void create1st(); - /* 80CBA8A8 */ void checkAreaL(cXyz const*, cXyz const*); - /* 80CBAC38 */ void checkAreaR(cXyz const*, cXyz const*); - /* 80CBAFC4 */ void checkOpen(); - /* 80CBB0F0 */ void checkDirL(fopAc_ac_c*); - /* 80CBB180 */ void checkDirR(fopAc_ac_c*); - /* 80CBB210 */ void setAtkSE(); - /* 80CBB28C */ void setCrkSE(); - /* 80CBB308 */ void action(); - /* 80CBB370 */ void action_typeA(); - /* 80CBBA10 */ void actionWaitEvent(); - /* 80CBBAF4 */ void actionEvent(); - /* 80CBBB5C */ void actionDead(); - /* 80CBBB60 */ void event_proc_call(); - /* 80CBBC04 */ void demoProc(); - /* 80CBBD68 */ void getDemoAction(); - /* 80CBBDB0 */ void Execute(f32 (**)[3][4]); - /* 80CBBE18 */ void Draw(); - /* 80CBBF34 */ void Delete(); +enum { + AREA_CHECK_PLAYER = 1, + AREA_CHECK_COACH, + AREA_CHECK_HORSE, }; -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -// -// Forward References: -// - -extern "C" static void search_coach__FPvPv(); -extern "C" static void nodeCallBack__FP8J3DJointi(); -extern "C" void initBaseMtx__12daObjRgate_cFv(); -extern "C" void setBaseMtx__12daObjRgate_cFv(); -extern "C" void Create__12daObjRgate_cFv(); -extern "C" void CreateHeap__12daObjRgate_cFv(); -extern "C" void create1st__12daObjRgate_cFv(); -extern "C" void checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz(); -extern "C" void checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz(); -extern "C" void checkOpen__12daObjRgate_cFv(); -extern "C" void checkDirL__12daObjRgate_cFP10fopAc_ac_c(); -extern "C" void checkDirR__12daObjRgate_cFP10fopAc_ac_c(); -extern "C" void setAtkSE__12daObjRgate_cFv(); -extern "C" void setCrkSE__12daObjRgate_cFv(); -extern "C" void action__12daObjRgate_cFv(); -extern "C" void action_typeA__12daObjRgate_cFv(); -extern "C" void actionWaitEvent__12daObjRgate_cFv(); -extern "C" void actionEvent__12daObjRgate_cFv(); -extern "C" void actionDead__12daObjRgate_cFv(); -extern "C" void event_proc_call__12daObjRgate_cFv(); -extern "C" void demoProc__12daObjRgate_cFv(); -extern "C" void getDemoAction__12daObjRgate_cFv(); -extern "C" void Execute__12daObjRgate_cFPPA3_A4_f(); -extern "C" void Draw__12daObjRgate_cFv(); -extern "C" void Delete__12daObjRgate_cFv(); -extern "C" static void daObjRgate_create1st__FP12daObjRgate_c(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" static void daObjRgate_MoveBGDelete__FP12daObjRgate_c(); -extern "C" static void daObjRgate_MoveBGExecute__FP12daObjRgate_c(); -extern "C" static void daObjRgate_MoveBGDraw__FP12daObjRgate_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80CBC344(void* _this, u8*); -extern "C" extern char const* const d_a_obj_rgate__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __pl__4cXyzCFRC3Vec(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void cLib_addCalcAngleS__FPsssss(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 mCurrentMtx__6J3DSys[48]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - /* 80CB9C98-80CB9CE8 000078 0050+00 3/3 0/0 0/0 .text search_coach__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void search_coach(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/search_coach__FPvPv.s" +static void* search_coach(void* i_actor, void* i_data) { + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH) + { + return i_actor; + } + + return NULL; } -#pragma pop /* 80CB9CE8-80CB9DF8 0000C8 0110+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void nodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/nodeCallBack__FP8J3DJointi.s" +static int nodeCallBack(J3DJoint* i_joint, int param_1) { + if (param_1 == 0) { + int jnt_no = i_joint->getJntNo(); + J3DModel* model_p = j3dSys.getModel(); + daObjRgate_c* actor_p = (daObjRgate_c*)model_p->getUserArea(); + + if (jnt_no == GATE_L_JNT) { + MTXCopy(model_p->i_getAnmMtx(jnt_no), mDoMtx_stack_c::get()); + mDoMtx_stack_c::YrotM(actor_p->mGateLAngle); + model_p->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + + MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + } else if (jnt_no == GATE_R_JNT) { + MTXCopy(model_p->i_getAnmMtx(jnt_no), mDoMtx_stack_c::get()); + mDoMtx_stack_c::YrotM(actor_p->mGateRAngle); + model_p->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + + MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + } + } + + return 1; } -#pragma pop /* ############################################################################################## */ /* 80CBC368-80CBC380 000000 0018+00 7/7 0/0 0/0 .rodata l_cull_box */ -SECTION_RODATA static u8 const l_cull_box[24] = { - 0xC3, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0xC8, 0x00, 0x00, - 0x43, 0xC8, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, +static const Vec l_cull_box[2] = { + {-400.0f, 0.0f, -400.0f}, + {400.0f, 450.0f, 400.0f}, }; -COMPILER_STRIP_GATE(0x80CBC368, &l_cull_box); /* 80CBC380-80CBC3C4 000018 0044+00 0/0 0/0 0/0 .rodata l_cyl_src */ -#pragma push -#pragma force_active on -const static dCcD_SrcCyl l_cyl_src = { +static const dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x0, 0x0, 0x1e}, {0x20, 0x11}, 0x78}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x1e}, {0x20, 0x11}, 0x78}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 350.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 350.0f // mHeight + } // mCyl }; -#pragma pop - -/* 80CBC3C4-80CBC3C8 00005C 0004+00 2/8 0/0 0/0 .rodata @3897 */ -SECTION_RODATA static u8 const lit_3897[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CBC3C4, &lit_3897); - -/* 80CBC3C8-80CBC3CC 000060 0004+00 0/2 0/0 0/0 .rodata @3898 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3898 = 128.0f; -COMPILER_STRIP_GATE(0x80CBC3C8, &lit_3898); -#pragma pop - -/* 80CBC3CC-80CBC3D0 000064 0004+00 0/2 0/0 0/0 .rodata @3899 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3899 = 38.0f; -COMPILER_STRIP_GATE(0x80CBC3CC, &lit_3899); -#pragma pop /* 80CB9DF8-80CB9F4C 0001D8 0154+00 1/1 0/0 0/0 .text initBaseMtx__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/initBaseMtx__12daObjRgate_cFv.s" +void daObjRgate_c::initBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); + MTXCopy(mDoMtx_stack_c::get(), field_0xb14); + mpGateModel->setBaseScale(mScale); + + if (getSwNo() != 0xFF) { + if (mpKeyModel != NULL) { + mpKeyModel->setBaseScale(mScale); + } + + if (mpHookModel != NULL) { + mpHookModel->setBaseScale(mScale); + } + } + + cXyz eff_pos_offset(0.0f, 128.0f, 38.0f); + mDoMtx_stack_c::YrotS(current.angle.y); + mDoMtx_stack_c::multVec(&eff_pos_offset, &eff_pos_offset); + + mEffPos = current.pos; + mEffPos += eff_pos_offset; + mKeyRot.set(0, current.angle.y, 0); + setBaseMtx(); } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC3D0-80CBC3D4 000068 0004+00 0/1 0/0 0/0 .rodata @4033 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4033 = -350.0f; -COMPILER_STRIP_GATE(0x80CBC3D0, &lit_4033); -#pragma pop - -/* 80CBC3D4-80CBC3D8 00006C 0004+00 0/3 0/0 0/0 .rodata @4034 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4034 = 350.0f; -COMPILER_STRIP_GATE(0x80CBC3D4, &lit_4034); -#pragma pop - -/* 80CBC3D8-80CBC3DC 000070 0004+00 0/1 0/0 0/0 .rodata @4035 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4035 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80CBC3D8, &lit_4035); -#pragma pop - -/* 80CBC3DC-80CBC3E0 000074 0004+00 0/1 0/0 0/0 .rodata @4036 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4036 = 50.0f; -COMPILER_STRIP_GATE(0x80CBC3DC, &lit_4036); -#pragma pop - -/* 80CBC3E0-80CBC3E4 000078 0004+00 0/1 0/0 0/0 .rodata @4037 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4037 = 5.0f; -COMPILER_STRIP_GATE(0x80CBC3E0, &lit_4037); -#pragma pop - -/* 80CBC3E4-80CBC3E8 00007C 0004+00 0/1 0/0 0/0 .rodata @4038 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4038 = 14.0f; -COMPILER_STRIP_GATE(0x80CBC3E4, &lit_4038); -#pragma pop - -/* 80CBC3E8-80CBC3EC 000080 0004+00 0/1 0/0 0/0 .rodata @4039 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4039 = -14.0f; -COMPILER_STRIP_GATE(0x80CBC3E8, &lit_4039); -#pragma pop - -/* 80CBC3EC-80CBC3F0 000084 0004+00 0/1 0/0 0/0 .rodata @4040 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4040 = -2.5f; -COMPILER_STRIP_GATE(0x80CBC3EC, &lit_4040); -#pragma pop - -/* 80CBC3F0-80CBC3F4 000088 0004+00 0/1 0/0 0/0 .rodata @4041 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4041 = -20.0f; -COMPILER_STRIP_GATE(0x80CBC3F0, &lit_4041); -#pragma pop - -/* 80CBC3F4-80CBC3F8 00008C 0004+00 0/1 0/0 0/0 .rodata @4042 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4042 = 2.0f; -COMPILER_STRIP_GATE(0x80CBC3F4, &lit_4042); -#pragma pop - -/* 80CBC3F8-80CBC3FC 000090 0004+00 0/1 0/0 0/0 .rodata @4043 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4043 = 0.5f; -COMPILER_STRIP_GATE(0x80CBC3F8, &lit_4043); -#pragma pop - -/* 80CBC3FC-80CBC400 000094 0004+00 0/1 0/0 0/0 .rodata @4044 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4044 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(0x80CBC3FC, &lit_4044); -#pragma pop /* 80CB9F4C-80CBA468 00032C 051C+00 2/2 0/0 0/0 .text setBaseMtx__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setBaseMtx__12daObjRgate_cFv.s" +void daObjRgate_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); + mpGateModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + cXyz sp30(-350.0f, 0.0f, 0.0f); + cXyz sp3C(350.0f, 0.0f, 0.0f); + + mDoMtx_stack_c::YrotS(current.angle.y); + mDoMtx_stack_c::multVec(&sp30, &sp30); + mDoMtx_stack_c::multVec(&sp3C, &sp3C); + + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(sp30); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::YrotM(mGateLAngle); + + MTXCopy(mDoMtx_stack_c::get(), field_0xc30); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); + field_0xbe8 = current.pos + sp30; + + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(sp3C); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::YrotM(0x7FFF); + mDoMtx_stack_c::YrotM(mGateRAngle); + + MTXCopy(mDoMtx_stack_c::get(), field_0xc00); + MTXCopy(mDoMtx_stack_c::get(), field_0xae4); + field_0xbf4 = sp3C; + + if (getSwNo() != 0xFF) { + cXyz sp48(0.0f, 128.0f, 38.0f); + mDoMtx_stack_c::YrotS(current.angle.y); + mDoMtx_stack_c::transM(-350.0f, 0.0f, 0.0f); + mDoMtx_stack_c::YrotM(mGateLAngle); + mDoMtx_stack_c::transM(350.0f, 0.0f, 0.0f); + mDoMtx_stack_c::multVec(&sp48, &sp48); + + cXyz sp54; + cXyz sp60; + sp60 = field_0xbc0; + + mDoMtx_stack_c::YrotS(current.angle.y + mGateLAngle); + mDoMtx_stack_c::multVec(&sp60, &sp60); + sp54 = field_0xbb4; + + s16 var_r29 = field_0xbb0 * cM_scos(mCounter * 3000); + cLib_addCalc(&field_0xbb0, 0.0f, 0.05f, 50.0f, 5.0f); + + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(sp60); + mDoMtx_stack_c::transM(sp48); + mDoMtx_stack_c::YrotM(current.angle.y + mGateLAngle); + mDoMtx_stack_c::XrotM(-0xE38); + mDoMtx_stack_c::XrotM(-field_0xbaa); + mDoMtx_stack_c::transM(14.0f, 0.0f, 0.0f); + mDoMtx_stack_c::ZrotM(field_0xbae); + mDoMtx_stack_c::ZrotM(var_r29); + mDoMtx_stack_c::transM(-14.0f, 0.0f, 0.0f); + mpHookModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + if (mpKeyModel != NULL) { + if (field_0xbae == 0) { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(sp48); + mDoMtx_stack_c::YrotM(current.angle.y + mGateLAngle); + mDoMtx_stack_c::XrotM(-0xE38); + mDoMtx_stack_c::XrotM(-field_0xbaa); + mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + } else { + field_0xbe4 += -2.5f; + if (field_0xbe4 < -20.0f) { + field_0xbe4 = -20.0f; + } + mEffPos.y += field_0xbe4; + + cXyz sp6C(current.pos.x, current.pos.y + 50.0f, current.pos.z); + if (fopAcM_gc_c::gndCheck(&sp6C) && fopAcM_gc_c::getGroundY() > mEffPos.y) { + mEffPos.y = fopAcM_gc_c::getGroundY() + 2.0f; + + if (!mCreatedSmokeEff) { + daObjEff::Act_c::make_land_smoke(&mEffPos, 0.5f); + mCreatedSmokeEff = true; + } + } + + cLib_addCalcAngleS(&mKeyRot.x, -0x4000, 5, 0xC00, 0x400); + mDoMtx_stack_c::transS(mEffPos); + mDoMtx_stack_c::ZXYrotM(mKeyRot); + mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC400-80CBC404 000098 0004+00 1/1 0/0 0/0 .rodata @4114 */ -SECTION_RODATA static f32 const lit_4114 = 150.0f; -COMPILER_STRIP_GATE(0x80CBC400, &lit_4114); - -/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CBC458 = "M_RGate00"; -SECTION_DEAD static char const* const stringBase_80CBC462 = "RIDER_GATE_OPEN00"; -#pragma pop /* 80CBC4A0-80CBC4AC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80CBC4AC-80CBC4C0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -495,611 +235,720 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80CBC4C0-80CBC4C4 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_rgate__stringBase0; - -/* 80CBC5C8-80CBC5CC 000000 0004+00 1/1 0/0 0/0 .bss l_evName$4049 */ -static u8 l_evName[4]; - -/* 80CBC5CC-80CBC5D0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 80CBC5CC 0001+00 data_80CBC5CC None */ -/* 80CBC5CD 0003+00 data_80CBC5CD None */ -static u8 struct_80CBC5CC[4]; +static char* l_arcName = "M_RGate00"; /* 80CBA468-80CBA654 000848 01EC+00 1/0 0/0 0/0 .text Create__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Create__12daObjRgate_cFv.s" +int daObjRgate_c::Create() { + static char* l_evName = "RIDER_GATE_OPEN00"; + + u8 sw_no = getSwNo(); + if (sw_no != 0xFF && !i_fopAcM_isSwitch(this, sw_no) && + !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) + { + mEvtInfo.setArchiveName(l_arcName); + + mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); + mMapToolID = getEventID(); + setAction(ACT_WAIT_EVENT); + } else { + mEventID = -1; + mMapToolID = 0xFF; + setAction(ACT_DEAD); + } + + mAttentionInfo.mPosition.y += 150.0f; + mEyePos.y += 150.0f; + mAttentionInfo.mFlags = 0x20; + + initBaseMtx(); + fopAcM_SetMtx(this, field_0xb14); + fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x, + l_cull_box[1].y, l_cull_box[1].z); + + if (dComIfG_Bgsp().Regist(mpBgW, this)) { +#ifdef DEBUG + OSReport_Error("キコルの門：ＢＧ登録失敗しました\n"); +#endif + return 0; + } else { + for (u16 i = 0; i < mpGateModel->getModelData()->getJointNum(); i++) { + if ((int)i == 1 || (int)i == 2) { + J3DJoint* jnt = mpGateModel->getModelData()->getJointNodePointer(i); + JUT_ASSERT(448, jnt != 0); + + jnt->setCallBack(nodeCallBack); + mpGateModel->setUserArea((u32)this); + } + } + } + + return 1; } -#pragma pop /* 80CBA654-80CBA828 000A34 01D4+00 1/0 0/0 0/0 .text CreateHeap__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/CreateHeap__12daObjRgate_cFv.s" +int daObjRgate_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(472, modelData != 0); + + mpGateModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpGateModel == NULL) { + return 0; + } + + if (getSwNo() != 0xFF) { + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); + JUT_ASSERT(485, modelData != 0); + + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(495, modelData2 != 0); + + mDoExt_setupShareTexture(modelData, modelData2); + mpKeyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpKeyModel == NULL) { + return 0; + } + + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); + JUT_ASSERT(511, modelData != 0); + + mDoExt_setupShareTexture(modelData, modelData2); + mpHookModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpHookModel == NULL) { + return 0; + } + } + + mpBgW = new dBgW(); + if (mpBgW == NULL || + mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 10), cBgW::MOVE_BG_e, &field_0xae4)) + { + mpBgW = NULL; + return 0; + } + + return 1; } -#pragma pop /* 80CBA828-80CBA8A8 000C08 0080+00 1/1 0/0 0/0 .text create1st__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/create1st__12daObjRgate_cFv.s" +int daObjRgate_c::create1st() { + int phase_state = dComIfG_resLoad(&mPhase, l_arcName); + if (phase_state == cPhs_COMPLEATE_e) { + phase_state = MoveBGCreate(l_arcName, 10, NULL, 0x2180, NULL); + + if (phase_state == cPhs_ERROR_e) { + return phase_state; + } + } + + return phase_state; } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC404-80CBC408 00009C 0004+00 0/3 0/0 0/0 .rodata @4288 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4288 = -100.0f; -COMPILER_STRIP_GATE(0x80CBC404, &lit_4288); -#pragma pop - -/* 80CBC408-80CBC40C 0000A0 0004+00 0/2 0/0 0/0 .rodata @4289 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4289 = 400.0f; -COMPILER_STRIP_GATE(0x80CBC408, &lit_4289); -#pragma pop - -/* 80CBC40C-80CBC410 0000A4 0004+00 0/1 0/0 0/0 .rodata @4290 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4290 = 300.0f; -COMPILER_STRIP_GATE(0x80CBC40C, &lit_4290); -#pragma pop - -/* 80CBC410-80CBC414 0000A8 0004+00 0/3 0/0 0/0 .rodata @4291 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4291 = 100.0f; -COMPILER_STRIP_GATE(0x80CBC410, &lit_4291); -#pragma pop - -/* 80CBC414-80CBC418 0000AC 0004+00 0/2 0/0 0/0 .rodata @4292 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4292 = 250.0f; -COMPILER_STRIP_GATE(0x80CBC414, &lit_4292); -#pragma pop - -/* 80CBC418-80CBC41C 0000B0 0004+00 0/2 0/0 0/0 .rodata @4293 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4293 = 90.0f; -COMPILER_STRIP_GATE(0x80CBC418, &lit_4293); -#pragma pop /* 80CBA8A8-80CBAC38 000C88 0390+00 1/1 0/0 0/0 .text checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz.s" -} -#pragma pop +int daObjRgate_c::checkAreaL(cXyz const* unused1, cXyz const* unused2) { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + Mtx m; + cXyz pos; + cXyz offset; + cXyz bound_a; + cXyz bound_b; -/* ############################################################################################## */ -/* 80CBC41C-80CBC420 0000B4 0004+00 0/1 0/0 0/0 .rodata @4426 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4426 = -300.0f; -COMPILER_STRIP_GATE(0x80CBC41C, &lit_4426); -#pragma pop + bound_a.set(0.0f, 0.0f, -100.0f); + bound_b.set(400.0f, 0.0f, 300.0f); + offset.set(0.0f, 0.0f, 100.0f); + + fopAc_ac_c* coach_p = fopAcM_Search(search_coach, this); + if (coach_p != NULL) { + mDoMtx_stack_c::transS(coach_p->current.pos); + mDoMtx_stack_c::YrotM(coach_p->shape_angle.y); + mDoMtx_stack_c::multVec(&offset, &offset); + pos = offset; + + mDoMtx_inverse(field_0xc30, m); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && pos.z <= bound_b.z) { + return AREA_CHECK_COACH; + } + } + + if (daPy_getPlayerActorClass()->checkHorseRide()) { + offset.set(0.0f, 0.0f, 250.0f); + + daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + if (horse_p != NULL) { + mDoMtx_stack_c::transS(horse_p->current.pos); + mDoMtx_stack_c::YrotM(horse_p->shape_angle.y); + mDoMtx_stack_c::multVec(&offset, &offset); + pos = offset; + + mDoMtx_inverse(field_0xc30, m); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && + pos.z <= bound_b.z) + { + return AREA_CHECK_HORSE; + } + } + } + + bound_a.set(0.0f, 0.0f, -100.0f); + bound_b.set(350.0f, 0.0f, 100.0f); + pos = player_p->current.pos; + + if (daPy_py_c::i_checkNowWolf()) { + offset.set(0.0f, 0.0f, 90.0f); + } else { + offset.set(0.0f, 0.0f, 0.0f); + } + + mDoMtx_stack_c::YrotS(player_p->shape_angle.y); + mDoMtx_stack_c::multVec(&offset, &offset); + pos += offset; + + mDoMtx_inverse(field_0xc30, m); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && pos.z <= bound_b.z) { + return AREA_CHECK_PLAYER; + } + + return 0; +} /* 80CBAC38-80CBAFC4 001018 038C+00 1/1 0/0 0/0 .text checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::checkAreaR(cXyz const* param_0, cXyz const* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz.s" +int daObjRgate_c::checkAreaR(cXyz const* unused1, cXyz const* unused2) { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + Mtx m; + Mtx m2; + cXyz pos; + cXyz offset; + cXyz bound_a; + cXyz bound_b; + + bound_a.set(0.0f, 0.0f, -300.0f); + bound_b.set(400.0f, 0.0f, 100.0f); + offset.set(0.0f, 0.0f, 100.0f); + + fopAc_ac_c* coach_p = fopAcM_Search(search_coach, this); + if (coach_p != NULL) { + mDoMtx_stack_c::transS(coach_p->current.pos); + mDoMtx_stack_c::YrotM(coach_p->shape_angle.y); + mDoMtx_stack_c::multVec(&offset, &offset); + pos = offset; + + mDoMtx_inverse(field_0xc00, m); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && pos.z <= bound_b.z) { + return AREA_CHECK_COACH; + } + } + + if (daPy_getPlayerActorClass()->checkHorseRide()) { + offset.set(0.0f, 0.0f, 250.0f); + + daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + if (horse_p != NULL) { + mDoMtx_stack_c::transS(horse_p->current.pos); + mDoMtx_stack_c::YrotM(horse_p->shape_angle.y); + mDoMtx_stack_c::multVec(&offset, &offset); + pos = offset; + + mDoMtx_inverse(field_0xc00, m); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && + pos.z <= bound_b.z) + { + return AREA_CHECK_HORSE; + } + } + } + + bound_a.set(0.0f, 0.0f, -100.0f); + bound_b.set(350.0f, 0.0f, 100.0f); + pos = player_p->current.pos; + + cXyz player_offset; + if (daPy_py_c::i_checkNowWolf()) { + player_offset.set(0.0f, 0.0f, 90.0f); + } else { + player_offset.set(0.0f, 0.0f, 0.0f); + } + + mDoMtx_stack_c::YrotS(player_p->shape_angle.y); + mDoMtx_stack_c::multVec(&player_offset, &player_offset); + pos += player_offset; + + mDoMtx_inverse(field_0xc00, m2); + mDoMtx_stack_c::copy(m2); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && pos.z <= bound_b.z) { + return AREA_CHECK_PLAYER; + } + + return 0; } -#pragma pop /* 80CBAFC4-80CBB0F0 0013A4 012C+00 1/1 0/0 0/0 .text checkOpen__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::checkOpen() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkOpen__12daObjRgate_cFv.s" +BOOL daObjRgate_c::checkOpen() { + if (dComIfGs_getKeyNum() == 0) { + return false; + } + + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (abs((s16)(current.angle.y - player_p->current.angle.y)) < 0x5000) { + return false; + } + + Mtx m; + mDoMtx_inverse(field_0xb14, m); + + cXyz pos(player_p->current.pos); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + cXyz bound_a(-100.0f, 0.0f, 0.0f); + cXyz bound_b(100.0f, 0.0f, 100.0f); + + if (bound_a.x <= pos.x && pos.x <= bound_b.x && bound_a.z <= pos.z && pos.z <= bound_b.z) { + return true; + } + + return false; } -#pragma pop /* 80CBB0F0-80CBB180 0014D0 0090+00 1/1 0/0 0/0 .text checkDirL__12daObjRgate_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::checkDirL(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirL__12daObjRgate_cFP10fopAc_ac_c.s" +BOOL daObjRgate_c::checkDirL(fopAc_ac_c* i_actor) { + Mtx m; + mDoMtx_inverse(field_0xc30, m); + + cXyz pos(i_actor->current.pos); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (pos.z > 0.0f) { + return false; + } else { + return true; + } } -#pragma pop /* 80CBB180-80CBB210 001560 0090+00 1/1 0/0 0/0 .text checkDirR__12daObjRgate_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::checkDirR(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/checkDirR__12daObjRgate_cFP10fopAc_ac_c.s" +BOOL daObjRgate_c::checkDirR(fopAc_ac_c* i_actor) { + Mtx m; + mDoMtx_inverse(field_0xc00, m); + + cXyz pos(i_actor->current.pos); + mDoMtx_stack_c::copy(m); + mDoMtx_stack_c::multVec(&pos, &pos); + + if (pos.z < 0.0f) { + return false; + } else { + return true; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC420-80CBC424 0000B8 0004+00 3/4 0/0 0/0 .rodata @4513 */ -SECTION_RODATA static f32 const lit_4513 = 1.0f; -COMPILER_STRIP_GATE(0x80CBC420, &lit_4513); - -/* 80CBC424-80CBC428 0000BC 0004+00 3/3 0/0 0/0 .rodata @4514 */ -SECTION_RODATA static f32 const lit_4514 = -1.0f; -COMPILER_STRIP_GATE(0x80CBC424, &lit_4514); /* 80CBB210-80CBB28C 0015F0 007C+00 1/1 0/0 0/0 .text setAtkSE__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::setAtkSE() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setAtkSE__12daObjRgate_cFv.s" +void daObjRgate_c::setAtkSE() { + fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_ATK, 0); } -#pragma pop /* 80CBB28C-80CBB308 00166C 007C+00 1/1 0/0 0/0 .text setCrkSE__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::setCrkSE() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/setCrkSE__12daObjRgate_cFv.s" +void daObjRgate_c::setCrkSE() { + fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_CRK, 0); } -#pragma pop /* 80CBB308-80CBB370 0016E8 0068+00 1/1 0/0 0/0 .text action__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action__12daObjRgate_cFv.s" +void daObjRgate_c::action() { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { + mGateLAngle = 0x4000; + mGateRAngle = -0x4000; + } else { + action_typeA(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC428-80CBC42C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4733 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4733 = 2000.0f; -COMPILER_STRIP_GATE(0x80CBC428, &lit_4733); -#pragma pop - -/* 80CBC42C-80CBC430 0000C4 0004+00 0/1 0/0 0/0 .rodata @4734 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4734 = 2500.0f; -COMPILER_STRIP_GATE(0x80CBC42C, &lit_4734); -#pragma pop - -/* 80CBC430-80CBC434 0000C8 0004+00 0/1 0/0 0/0 .rodata @4735 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4735 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80CBC430, &lit_4735); -#pragma pop - -/* 80CBC434-80CBC438 0000CC 0004+00 0/1 0/0 0/0 .rodata @4736 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4736 = -39.0f; -COMPILER_STRIP_GATE(0x80CBC434, &lit_4736); -#pragma pop - -/* 80CBC438-80CBC43C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4737 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4737 = -25.0f; -COMPILER_STRIP_GATE(0x80CBC438, &lit_4737); -#pragma pop - -/* 80CBC43C-80CBC440 0000D4 0004+00 0/1 0/0 0/0 .rodata @4738 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4738 = 1200.0f; -COMPILER_STRIP_GATE(0x80CBC43C, &lit_4738); -#pragma pop - -/* 80CBC440-80CBC444 0000D8 0004+00 0/1 0/0 0/0 .rodata @4739 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4739 = 600.0f; -COMPILER_STRIP_GATE(0x80CBC440, &lit_4739); -#pragma pop - -/* 80CBC444-80CBC448 0000DC 0004+00 0/1 0/0 0/0 .rodata @4740 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4740 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80CBC444, &lit_4740); -#pragma pop - -/* 80CBC448-80CBC44C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4741 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4741 = 20.0f; -COMPILER_STRIP_GATE(0x80CBC448, &lit_4741); -#pragma pop - -/* 80CBC44C-80CBC450 0000E4 0004+00 0/1 0/0 0/0 .rodata @4742 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4742 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80CBC44C, &lit_4742); -#pragma pop - -/* 80CBC450-80CBC458 0000E8 0008+00 0/1 0/0 0/0 .rodata @4744 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4744[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CBC450, &lit_4744); -#pragma pop /* 80CBB370-80CBBA10 001750 06A0+00 1/1 0/0 0/0 .text action_typeA__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::action_typeA() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/action_typeA__12daObjRgate_cFv.s" +void daObjRgate_c::action_typeA() { + u8 sw_no = getSwNo(); + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (i_fopAcM_isSwitch(this, sw_no) || sw_no == 0xFF) { + cXyz unused1; + cXyz unused2; + + int chk_l = checkAreaL(&unused1, &unused2); + int chk_r = checkAreaR(&unused1, &unused2); + s16 prev_l_move = mGateLMove; + s16 prev_r_move = mGateRMove; + + if (player_p->getSpeedF() != 0.0f) { + if (chk_l == AREA_CHECK_PLAYER) { + switch (checkDirL(player_p)) { + case FALSE: + mGateLMove = 500; + break; + case TRUE: + mGateLMove = -500; + break; + } + + field_0xbb0 = 2000.0f; + } + + if (chk_r == AREA_CHECK_PLAYER) { + switch (checkDirR(player_p)) { + case FALSE: + mGateRMove = -500; + break; + case TRUE: + mGateRMove = 500; + break; + } + } + } + + daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + if (horse_p != NULL && horse_p->speedF != 0.0f) { + if (chk_l == AREA_CHECK_HORSE) { + switch (checkDirL(horse_p)) { + case FALSE: + mGateLMove = 800; + break; + case TRUE: + mGateLMove = -800; + break; + } + + field_0xbb0 = 2500.0f; + } + + if (chk_r == AREA_CHECK_HORSE) { + switch (checkDirR(horse_p)) { + case FALSE: + mGateRMove = -800; + break; + case TRUE: + mGateRMove = 800; + break; + } + } + } + + fopAc_ac_c* coach_p = fopAcM_Search(search_coach, this); + if (coach_p != NULL && coach_p->speedF != 0.0f) { + if (chk_l == AREA_CHECK_COACH) { + switch (checkDirL(coach_p)) { + case FALSE: + mGateLMove = 900; + break; + case TRUE: + mGateLMove = -900; + break; + } + + field_0xbb0 = 2500.0f; + } + + if (chk_r == AREA_CHECK_COACH) { + switch (checkDirR(coach_p)) { + case FALSE: + mGateRMove = -900; + break; + case TRUE: + mGateRMove = 900; + break; + } + } + } + + if (abs(abs(prev_l_move) - abs(mGateLMove)) > 400 || + abs(abs(prev_r_move) - abs(mGateRMove)) > 400) + { + setCrkSE(); + } + + if (mGateLMove > 1500) { + mGateLMove = 1500; + } + + if (mGateLMove < -1500) { + mGateLMove = -1500; + } + + if (mGateRMove > 1500) { + mGateRMove = 1500; + } + + if (mGateRMove < -1500) { + mGateRMove = -1500; + } + + mGateLAngle += mGateLMove; + if (mGateLAngle > 0x4000) { + mGateLAngle = 0x4000; + mGateLMove *= -0.7f; + } + + if (mGateLAngle < -0x4000) { + mGateLAngle = -0x4000; + mGateLMove *= -0.7f; + } + + mGateRAngle += mGateRMove; + if (mGateRAngle > 0x4000) { + mGateRAngle = 0x4000; + mGateRMove *= -0.7f; + } + + if (mGateRAngle < -0x4000) { + mGateRAngle = -0x4000; + mGateRMove *= -0.7f; + } + + cLib_addCalcAngleS(&mGateLMove, 0, 10, 100, 10); + cLib_addCalcAngleS(&mGateRMove, 0, 10, 100, 10); + cLib_addCalcAngleS(&field_0xbae, 0x3000, 10, 0x400, 0x100); + cLib_chaseF(&field_0xbb4.x, -39.0f, 1.0f); + cLib_chaseF(&field_0xbc0.x, -25.0f, 1.0f); + cLib_addCalcAngleS(&field_0xbcc, 0x7FFF, 10, 0x400, 0x100); + } else { + cXyz unused1; + cXyz unused2; + + int chk_l = checkAreaL(&unused1, &unused2); + int chk_r = checkAreaR(&unused1, &unused2); + if (chk_l != 0 || chk_r != 0) { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (daPy_py_c::i_checkNowWolf()) { + if (player_p->checkWolfAttackReverse() || player_p->checkFrontRollCrash()) { + field_0xb94 = 1200.0f; + field_0xb90 = 1200.0f; + field_0xbac = 0x800; + setAtkSE(); + } + } else { + if (player_p->checkFrontRollCrash()) { + field_0xb94 = 600.0f; + field_0xb90 = 600.0f; + field_0xbac = 0x800; + setAtkSE(); + } + } + } + + mGateLAngle = field_0xb90 * cM_ssin(mCounter * 4000); + mGateRAngle = field_0xb94 * -cM_ssin(mCounter * 4000); + cLib_addCalc0(&field_0xb90, 0.1f, 20.0f); + cLib_addCalc0(&field_0xb94, 0.1f, 20.0f); + + field_0xbac -= 0x160; + field_0xbaa += field_0xbac; + if (field_0xbaa >= 0) { + return; + } + + field_0xbaa = 0; + field_0xbac = -field_0xbac * 0.7f; + } } -#pragma pop /* 80CBBA10-80CBBAF4 001DF0 00E4+00 1/0 0/0 0/0 .text actionWaitEvent__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::actionWaitEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionWaitEvent__12daObjRgate_cFv.s" +void daObjRgate_c::actionWaitEvent() { + if (mEvtInfo.i_checkCommandDoor()) { + setAction(ACT_EVENT); + dComIfGp_setItemKeyNumCount(-1); + i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_L_OP, 0); + } else if (checkOpen()) { + mEvtInfo.setEventId(mEventID); + mEvtInfo.setMapToolId(mMapToolID); + mEvtInfo.i_onCondition(dEvtCnd_CANDOOR_e); + } } -#pragma pop /* 80CBBAF4-80CBBB5C 001ED4 0068+00 1/0 0/0 0/0 .text actionEvent__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/actionEvent__12daObjRgate_cFv.s" +void daObjRgate_c::actionEvent() { + if (dComIfGp_evmng_endCheck(mEventID)) { + setAction(ACT_DEAD); + i_dComIfGp_event_reset(); + } else { + demoProc(); + } } -#pragma pop /* 80CBBB5C-80CBBB60 001F3C 0004+00 1/0 0/0 0/0 .text actionDead__12daObjRgate_cFv */ -void daObjRgate_c::actionDead() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80CBC4C4-80CBC4D0 -00001 000C+00 0/1 0/0 0/0 .data @4797 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4797[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWaitEvent__12daObjRgate_cFv, -}; -#pragma pop - -/* 80CBC4D0-80CBC4DC -00001 000C+00 0/1 0/0 0/0 .data @4798 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4798[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__12daObjRgate_cFv, -}; -#pragma pop - -/* 80CBC4DC-80CBC4E8 -00001 000C+00 0/1 0/0 0/0 .data @4799 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4799[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionDead__12daObjRgate_cFv, -}; -#pragma pop - -/* 80CBC4E8-80CBC50C 000048 0024+00 0/1 0/0 0/0 .data l_func$4796 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop +void daObjRgate_c::actionDead() {} /* 80CBBB60-80CBBC04 001F40 00A4+00 1/1 0/0 0/0 .text event_proc_call__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::event_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/event_proc_call__12daObjRgate_cFv.s" -} -#pragma pop +void daObjRgate_c::event_proc_call() { + typedef void (daObjRgate_c::*func)(); + static func l_func[] = {&daObjRgate_c::actionWaitEvent, &daObjRgate_c::actionEvent, + &daObjRgate_c::actionDead}; -/* ############################################################################################## */ -/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CBC474 = "K_GATE"; -SECTION_DEAD static char const* const stringBase_80CBC47B = "Timer"; -#pragma pop + (this->*l_func[mAction])(); +} /* 80CBBC04-80CBBD68 001FE4 0164+00 1/1 0/0 0/0 .text demoProc__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::demoProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/demoProc__12daObjRgate_cFv.s" +void daObjRgate_c::demoProc() { + mStaffID = i_dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0); + int demo_action = getDemoAction(); + + if (dComIfGp_evmng_getIsAddvance(mStaffID)) { + switch (demo_action) { + case DEMO_ACT_WAIT: + int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffID, "Timer"); + if (timer_p == NULL) { + mTimer = 1; + } else { + mTimer = *timer_p; + } + break; + case DEMO_ACT_OPEN: + mGateLMove = 1000; + mGateRMove = -1000; + break; + } + } + + switch (demo_action) { + case DEMO_ACT_WAIT: + if (cLib_calcTimer(&mTimer) == 0) { + dComIfGp_evmng_cutEnd(mStaffID); + } + break; + case DEMO_ACT_OPEN: + dComIfGp_evmng_cutEnd(mStaffID); + break; + case DEMO_ACT_UNLOCK: + dComIfGp_evmng_cutEnd(mStaffID); + break; + case DEMO_ACT_ADJUSTMENT: + dComIfGp_evmng_cutEnd(mStaffID); + break; + default: + dComIfGp_evmng_cutEnd(mStaffID); + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CBC481 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CBC486 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_80CBC491 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80CBC498 = "OPEN"; -#pragma pop - -/* 80CBC50C-80CBC51C -00001 0010+00 1/1 0/0 0/0 .data action_table$4852 */ -SECTION_DATA static void* action_table[4] = { - (void*)(((char*)&d_a_obj_rgate__stringBase0) + 0x29), - (void*)(((char*)&d_a_obj_rgate__stringBase0) + 0x2E), - (void*)(((char*)&d_a_obj_rgate__stringBase0) + 0x39), - (void*)(((char*)&d_a_obj_rgate__stringBase0) + 0x40), -}; /* 80CBBD68-80CBBDB0 002148 0048+00 1/1 0/0 0/0 .text getDemoAction__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::getDemoAction() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/getDemoAction__12daObjRgate_cFv.s" +int daObjRgate_c::getDemoAction() { + static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"}; + + return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZE(action_table), 0, 0); } -#pragma pop /* 80CBBDB0-80CBBE18 002190 0068+00 1/0 0/0 0/0 .text Execute__12daObjRgate_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Execute__12daObjRgate_cFPPA3_A4_f.s" +int daObjRgate_c::Execute(Mtx** param_0) { + event_proc_call(); + action(); + mCounter++; + + *param_0 = &mBgMtx; + setBaseMtx(); + mpBgW->Move(); + return 1; } -#pragma pop /* 80CBBE18-80CBBF34 0021F8 011C+00 1/0 0/0 0/0 .text Draw__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Draw__12daObjRgate_cFv.s" +int daObjRgate_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpGateModel, &mTevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpGateModel); + dComIfGd_setList(); + + if (getSwNo() != 0xFF) { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + + if (mpHookModel != NULL) { + g_env_light.setLightTevColorType_MAJI(mpHookModel, &mTevStr); + mDoExt_modelUpdateDL(mpHookModel); + } + + if (mpKeyModel != NULL) { + g_env_light.setLightTevColorType_MAJI(mpKeyModel, &mTevStr); + mDoExt_modelUpdateDL(mpKeyModel); + } + } + + return 1; } -#pragma pop /* 80CBBF34-80CBBFA0 002314 006C+00 1/0 0/0 0/0 .text Delete__12daObjRgate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRgate_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/Delete__12daObjRgate_cFv.s" +int daObjRgate_c::Delete() { + if (mpBgW != NULL && mpBgW->ChkUsed()) { + if (dComIfG_Bgsp().Release(mpBgW)) { +#ifdef DEBUG + OSReport("Release Error\n"); +#endif + } + } + + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CBC51C-80CBC53C -00001 0020+00 1/0 0/0 0/0 .data daObjRgate_METHODS */ -SECTION_DATA static void* daObjRgate_METHODS[8] = { - (void*)daObjRgate_create1st__FP12daObjRgate_c, - (void*)daObjRgate_MoveBGDelete__FP12daObjRgate_c, - (void*)daObjRgate_MoveBGExecute__FP12daObjRgate_c, - (void*)NULL, - (void*)daObjRgate_MoveBGDraw__FP12daObjRgate_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CBC53C-80CBC56C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RiderGate */ -SECTION_DATA extern void* g_profile_Obj_RiderGate[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00810000, (void*)&g_fpcLf_Method, - (void*)0x00000C60, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02580000, (void*)&daObjRgate_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80CBC56C-80CBC578 0000CC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80CBC578-80CBC584 0000D8 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80CBC584-80CBC590 0000E4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80CBC590-80CBC59C 0000F0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80CBC59C-80CBC5C4 0000FC 0028+00 1/1 0/0 0/0 .data __vt__12daObjRgate_c */ -SECTION_DATA extern void* __vt__12daObjRgate_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daObjRgate_cFv, - (void*)Create__12daObjRgate_cFv, - (void*)Execute__12daObjRgate_cFPPA3_A4_f, - (void*)Draw__12daObjRgate_cFv, - (void*)Delete__12daObjRgate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80CBBFA0-80CBC054 002380 00B4+00 1/0 0/0 0/0 .text daObjRgate_create1st__FP12daObjRgate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRgate_create1st(daObjRgate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_create1st__FP12daObjRgate_c.s" +static int daObjRgate_create1st(daObjRgate_c* i_this) { + fopAcM_SetupActor(i_this, daObjRgate_c); + return i_this->create1st(); } -#pragma pop - -/* 80CBC054-80CBC120 002434 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::~dCcD_Cyl() { -extern "C" asm void __dt__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8dCcD_CylFv.s" -} -#pragma pop - -/* 80CBC120-80CBC1A4 002500 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::dCcD_Cyl() { -extern "C" asm void __ct__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__ct__8dCcD_CylFv.s" -} -#pragma pop - -/* 80CBC1A4-80CBC1EC 002584 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80CBC1EC-80CBC234 0025CC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80CBC234-80CBC290 002614 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10dCcD_GSttsFv.s" -} -#pragma pop /* 80CBC290-80CBC2B0 002670 0020+00 1/0 0/0 0/0 .text daObjRgate_MoveBGDelete__FP12daObjRgate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRgate_MoveBGDelete(daObjRgate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDelete__FP12daObjRgate_c.s" +static int daObjRgate_MoveBGDelete(daObjRgate_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80CBC2B0-80CBC2D0 002690 0020+00 1/0 0/0 0/0 .text daObjRgate_MoveBGExecute__FP12daObjRgate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRgate_MoveBGExecute(daObjRgate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGExecute__FP12daObjRgate_c.s" +static int daObjRgate_MoveBGExecute(daObjRgate_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80CBC2D0-80CBC2FC 0026B0 002C+00 1/0 0/0 0/0 .text daObjRgate_MoveBGDraw__FP12daObjRgate_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRgate_MoveBGDraw(daObjRgate_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/daObjRgate_MoveBGDraw__FP12daObjRgate_c.s" +static int daObjRgate_MoveBGDraw(daObjRgate_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80CBC2FC-80CBC344 0026DC 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* ############################################################################################## */ +/* 80CBC51C-80CBC53C -00001 0020+00 1/0 0/0 0/0 .data daObjRgate_METHODS */ +static actor_method_class daObjRgate_METHODS = { + (process_method_func)daObjRgate_create1st, (process_method_func)daObjRgate_MoveBGDelete, + (process_method_func)daObjRgate_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjRgate_MoveBGDraw, +}; -/* 80CBC344-80CBC360 002724 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80CBC344(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/func_80CBC344.s" -} -#pragma pop - -/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CBC53C-80CBC56C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RiderGate */ +extern actor_process_profile_definition g_profile_Obj_RiderGate = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_RiderGate, + &g_fpcLf_Method.mBase, + sizeof(daObjRgate_c), + 0, + 0, + &g_fopAc_Method.base, + 600, + &daObjRgate_METHODS, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp index 944fbf672e..c3d04a837f 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp @@ -4,7 +4,7 @@ // #include "rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h" -#include "MSL_C/MSL_Common/Src/string.h" +#include "string.h" #include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor.h" diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 64283686c8..4cb6d1db4d 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "dol2asm.h" #include "dolphin/os/OS.h" #include "m_Do/m_Do_dvd_thread.h" diff --git a/src/__start.c b/src/__start.c index 0203f4c5a9..c7443fd5e5 100644 --- a/src/__start.c +++ b/src/__start.c @@ -1,4 +1,4 @@ -#include "MSL_C/stdlib.h" +#include "stdlib.h" #include "dol2asm.h" #include "init.h" diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index d57620473b..f6abd887a2 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -5,7 +5,7 @@ #include "d/com/d_com_inf_game.h" #include "JSystem/JKernel/JKRExpHeap.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/a/d_a_alink.h" #include "d/d_item.h" #include "d/d_procname.h" diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index be1134044c..8d3f2add24 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -4,7 +4,7 @@ // #include "d/com/d_com_static.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/d_demo.h" #include "dol2asm.h" #include "rel/d/a/d_a_dshutter/d_a_dshutter.h" diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index a1922734c3..5c59947f31 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -8,6 +8,7 @@ #include "d/d_path.h" #include "d/d_procname.h" #include "dol2asm.h" +#include "string.h" // // Forward References: diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 700017db3d..903bf23776 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -5,7 +5,7 @@ #include "d/d_name.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "d/d_lib.h" #include "dol2asm.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index fe66d0d81b..948c4d069e 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -7,7 +7,8 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include "MSL_C/stdio.h" +#include "stdio.h" +#include "string.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtx.h" diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 5fa251d9dd..59f12eb3ce 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -6,7 +6,7 @@ #include "d/d_stage.h" #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "SSystem/SComponent/c_malloc.h" #include "d/com/d_com_inf_game.h" #include "d/com/d_com_static.h" diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index e1be5d6bd9..d0f09b0348 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -5,7 +5,7 @@ #include "d/event/d_event_manager.h" #include "SSystem/SComponent/c_math.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 179a9a52e4..a10f442e75 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -6,7 +6,7 @@ #include "d/file/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" #include "d/pane/d_pane_class.h" diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index e4b4cdb173..d6e115a54d 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -15,6 +15,7 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" #include "rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h" +#include "string.h" // // Types: diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index 8a4dab111e..1c35e76c13 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -12,6 +12,7 @@ #include "dol2asm.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" +#include "string.h" // // Forward References: diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index 66a4233732..f501894d02 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -12,6 +12,7 @@ #include "d/kankyo/d_kankyo_rain.h" #include "dol2asm.h" #include "global.h" +#include "string.h" #include "m_Do/m_Do_audio.h" // diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 6b2ac9e60a..d52d73966e 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -4,7 +4,7 @@ // #include "d/menu/d_menu_dmap.h" -#include "MSL_C/string.h" +#include "string.h" #include "d/d_lib.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index 7118b2615d..67160e11b3 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -5,8 +5,8 @@ #include "d/menu/d_menu_fmap.h" #include "JSystem/JKernel/JKRArchive.h" -#include "MSL_C/stdio.h" -#include "MSL_C/string.h" +#include "stdio.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "dolphin/types.h" diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index c940eca6ff..a95bcddafb 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTTexture.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" #include "d/meter/d_meter2_info.h" diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp index 8565f3953b..e70b03f963 100644 --- a/src/d/menu/d_menu_item_explain.cpp +++ b/src/d/menu/d_menu_item_explain.cpp @@ -10,7 +10,7 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTTexture.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 03cb118a05..b9baa3f101 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -7,9 +7,9 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "MSL_C/math.h" -#include "MSL_C/stdio.h" -#include "MSL_C/string.h" +#include "math.h" +#include "stdio.h" +#include "string.h" #include "d/com/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index f8c4237166..4784a86808 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -9,7 +9,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "MSL_C/string.h" +#include "string.h" #include "d/com/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index 96080c6c5b..ba71b7cd81 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -8,7 +8,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" -#include "MSL_C/string.h" +#include "string.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_alink.h" #include "d/d_item_data.h" diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 085d8cdf9e..d3b266f1ba 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -6,7 +6,7 @@ #include "d/menu/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 7bb8de40e7..1cf605c192 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -4,7 +4,7 @@ // #include "d/msg/d_msg_class.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "d/msg/d_msg_unit.h" diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index d1c47fbc25..247c8eba44 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -4,7 +4,7 @@ // #include "d/msg/d_msg_object.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_class.h" #include "dol2asm.h" diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp index 14b45033b5..c920f1afb7 100644 --- a/src/d/msg/d_msg_unit.cpp +++ b/src/d/msg/d_msg_unit.cpp @@ -4,8 +4,8 @@ // #include "d/msg/d_msg_unit.h" -#include "MSL_C/stdio.h" -#include "MSL_C/string.h" +#include "stdio.h" +#include "string.h" #include "dol2asm.h" #include "d/kankyo/d_kankyo.h" #include "d/meter/d_meter2_info.h" diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index 4b73afab24..0c83ffb910 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -11,7 +11,7 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/JParticle/JPAEmitterManager.h" #include "JSystem/JParticle/JPAResourceManager.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/os/OS.h" diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index df0f5cbf98..c8a01fed11 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -5,7 +5,7 @@ #include "d/s/d_s_room.h" #include "JSystem/JKernel/JKRExpHeap.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/s/d_s_play.h" diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index c9090ea034..6fa808b199 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -6,7 +6,7 @@ #include "d/save/d_save.h" #include "d/save/d_save_init.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" diff --git a/src/init.c b/src/init.c index 70ef8ec292..dd6927340c 100644 --- a/src/init.c +++ b/src/init.c @@ -4,7 +4,7 @@ // #include "init.h" -#include "MSL_C/string.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 2004d9c5de..a5a6ccbea7 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -6,7 +6,7 @@ #include "m_Do/m_Do_MemCard.h" #include "JSystem/JKernel/JKRAssertHeap.h" #include "JSystem/JKernel/JKRThread.h" -#include "MSL_C/string.h" +#include "string.h" #include "dol2asm.h" #include "dolphin/card/card.h" #include "m_Do/m_Do_ext.h" diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 90e03dee9b..73dc14bf1d 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -5,7 +5,7 @@ #include "m_Do/m_Do_MemCardRWmng.h" #include "JSystem/JUtility/JUTTexture.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/com/d_com_inf_game.h" #include "dolphin/card/card.h" #include "m_Do/m_Do_MemCard.h" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 4b2c37e606..c327616247 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -14,7 +14,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" //#include "JSystem/JUtility/JUTResFont.h" //#include "JSystem/JUtility/JUTCacheFont.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "Z2AudioLib/Z2Creature.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index bd3d93d9a4..dffeefeb7b 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -4,7 +4,7 @@ */ #include "m_Do/m_Do_printf.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "dol2asm.h" #include "dolphin/base/PPCArch.h" #include "dolphin/os/OS.h" diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index b2dd7402cc..1a806d1a92 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -6,7 +6,7 @@ #include "msg/scrn/d_msg_scrn_explain.h" #include "msg/scrn/d_msg_scrn_arrow.h" #include "msg/scrn/d_msg_scrn_3select.h" -#include "MSL_C/stdio.h" +#include "stdio.h" #include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "d/msg/d_msg_out_font.h"