From 2b2dc15d6b79b51ffb09a9d1698bfa687363c242 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 00:07:51 -0400 Subject: match func_801DB92C --- src/code_801DB81C.cpp | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 src/code_801DB81C.cpp (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp new file mode 100644 index 0000000..8940b1d --- /dev/null +++ b/src/code_801DB81C.cpp @@ -0,0 +1,148 @@ +#include "types.h" +#include "unkStruct.h" +#include "SDK/os.h" + +extern "C" { + +// TODO: rename +struct unkClass3 +{ + u8 unk0; + u8 unk1; + u32 unk4; +}; + +// TODO: define, rename, localize +// extern unkClass3 lbl_80491370[32]; +extern u8 lbl_80491370; + + +extern u32 lbl_8063F2F8; +extern u32 lbl_8063F2FC; + +extern u8 lbl_8063F304; +extern u32 lbl_8063F308; + +//static +void func_801DB81C(u8 p1); + +void func_801DB92C(u8 p1, u8 p2, u32 p3); + + + +#ifdef NONMATCHING +// 1. wrong instruction order: loading lbl_80491370@ha before 0 +// 2. r30/r31 register swap + +//static +void func_801DB81C(u8 p1) +{ + for (size_t i = 0; i < 31; i++) + lbl_80491370[i].unk0 = 0xff; + lbl_8063F308 = 0; + lbl_80491370[31].unk0 = 0xff; + LCEnable(); + lbl_8063F2FC = 0xE0000000; + lbl_8063F2F8 = p1 << 9; + if (p1) { + func_801DB92C(0, p1, 1); + lbl_80491370[0].unk0 = 0; + lbl_80491370[0].unk1 = p1; + } + lbl_8063F304 = 0; +} +#else +#define _SDA_BASE_ 0x806452C0; +asm void func_801DB81C(u8 p1) +{ + nofralloc + /* 801DB81C 001D747C 94 21 FF E0 */ stwu r1, -0x20(r1) + /* 801DB820 001D7480 7C 08 02 A6 */ mflr r0 + /* 801DB824 001D7484 90 01 00 24 */ stw r0, 0x24(r1) + /* 801DB828 001D7488 38 00 00 FF */ li r0, 0xff + /* 801DB82C 001D748C 93 E1 00 1C */ stw r31, 0x1c(r1) + /* 801DB830 001D7490 3F E0 80 49 */ lis r31, lbl_80491370@ha + /* 801DB834 001D7494 93 C1 00 18 */ stw r30, 0x18(r1) + /* 801DB838 001D7498 3B C0 00 00 */ li r30, 0 + /* 801DB83C 001D749C 93 A1 00 14 */ stw r29, 0x14(r1) + /* 801DB840 001D74A0 3B BF 13 70 */ addi r29, r31, lbl_80491370@l + /* 801DB844 001D74A4 93 81 00 10 */ stw r28, 0x10(r1) + /* 801DB848 001D74A8 7C 7C 1B 78 */ mr r28, r3 + /* 801DB84C 001D74AC 98 1D 00 00 */ stb r0, 0(r29) + /* 801DB850 001D74B0 98 1D 00 08 */ stb r0, 8(r29) + /* 801DB854 001D74B4 98 1D 00 10 */ stb r0, 0x10(r29) + /* 801DB858 001D74B8 98 1D 00 18 */ stb r0, 0x18(r29) + /* 801DB85C 001D74BC 98 1D 00 20 */ stb r0, 0x20(r29) + /* 801DB860 001D74C0 98 1D 00 28 */ stb r0, 0x28(r29) + /* 801DB864 001D74C4 98 1D 00 30 */ stb r0, 0x30(r29) + /* 801DB868 001D74C8 98 1D 00 38 */ stb r0, 0x38(r29) + /* 801DB86C 001D74CC 98 1D 00 40 */ stb r0, 0x40(r29) + /* 801DB870 001D74D0 98 1D 00 48 */ stb r0, 0x48(r29) + /* 801DB874 001D74D4 98 1D 00 50 */ stb r0, 0x50(r29) + /* 801DB878 001D74D8 98 1D 00 58 */ stb r0, 0x58(r29) + /* 801DB87C 001D74DC 98 1D 00 60 */ stb r0, 0x60(r29) + /* 801DB880 001D74E0 98 1D 00 68 */ stb r0, 0x68(r29) + /* 801DB884 001D74E4 98 1D 00 70 */ stb r0, 0x70(r29) + /* 801DB888 001D74E8 98 1D 00 78 */ stb r0, 0x78(r29) + /* 801DB88C 001D74EC 98 1D 00 80 */ stb r0, 0x80(r29) + /* 801DB890 001D74F0 98 1D 00 88 */ stb r0, 0x88(r29) + /* 801DB894 001D74F4 98 1D 00 90 */ stb r0, 0x90(r29) + /* 801DB898 001D74F8 98 1D 00 98 */ stb r0, 0x98(r29) + /* 801DB89C 001D74FC 98 1D 00 A0 */ stb r0, 0xa0(r29) + /* 801DB8A0 001D7500 98 1D 00 A8 */ stb r0, 0xa8(r29) + /* 801DB8A4 001D7504 98 1D 00 B0 */ stb r0, 0xb0(r29) + /* 801DB8A8 001D7508 98 1D 00 B8 */ stb r0, 0xb8(r29) + /* 801DB8AC 001D750C 98 1D 00 C0 */ stb r0, 0xc0(r29) + /* 801DB8B0 001D7510 98 1D 00 C8 */ stb r0, 0xc8(r29) + /* 801DB8B4 001D7514 98 1D 00 D0 */ stb r0, 0xd0(r29) + /* 801DB8B8 001D7518 98 1D 00 D8 */ stb r0, 0xd8(r29) + /* 801DB8BC 001D751C 98 1D 00 E0 */ stb r0, 0xe0(r29) + /* 801DB8C0 001D7520 98 1D 00 E8 */ stb r0, 0xe8(r29) + /* 801DB8C4 001D7524 98 1D 00 F0 */ stb r0, 0xf0(r29) + /* 801DB8C8 001D7528 93 CD A0 48 */ stw r30, 0xA048(r13) + /* 801DB8CC 001D752C 98 1D 00 F8 */ stb r0, 0xf8(r29) + /* 801DB8D0 001D7530 48 08 EF 8D */ bl LCEnable + /* 801DB8D4 001D7534 57 80 4B EC */ rlwinm r0, r28, 9, 0xf, 0x16 + /* 801DB8D8 001D7538 3C 60 E0 00 */ lis r3, 0xe000 + /* 801DB8DC 001D753C 2C 1C 00 00 */ cmpwi r28, 0 + /* 801DB8E0 001D7540 90 6D A0 3C */ stw r3, 0xA03C(r13) + /* 801DB8E4 001D7544 90 0D A0 38 */ stw r0, 0xA038(r13) + /* 801DB8E8 001D7548 41 82 00 1C */ beq lbl_801DB904 + /* 801DB8EC 001D754C 7F 84 E3 78 */ mr r4, r28 + /* 801DB8F0 001D7550 38 60 00 00 */ li r3, 0 + /* 801DB8F4 001D7554 38 A0 00 01 */ li r5, 1 + /* 801DB8F8 001D7558 48 00 00 35 */ bl func_801DB92C + /* 801DB8FC 001D755C 9B DF 13 70 */ stb r30, 0x1370(r31) + /* 801DB900 001D7560 9B 9D 00 01 */ stb r28, 1(r29) + lbl_801DB904: + /* 801DB904 001D7564 38 00 00 00 */ li r0, 0 + /* 801DB908 001D7568 98 0D A0 44 */ stb r0, 0xA044(r13) + /* 801DB90C 001D756C 83 E1 00 1C */ lwz r31, 0x1c(r1) + /* 801DB910 001D7570 83 C1 00 18 */ lwz r30, 0x18(r1) + /* 801DB914 001D7574 83 A1 00 14 */ lwz r29, 0x14(r1) + /* 801DB918 001D7578 83 81 00 10 */ lwz r28, 0x10(r1) + /* 801DB91C 001D757C 80 01 00 24 */ lwz r0, 0x24(r1) + /* 801DB920 001D7580 7C 08 03 A6 */ mtlr r0 + /* 801DB924 001D7584 38 21 00 20 */ addi r1, r1, 0x20 + /* 801DB928 001D7588 4E 80 00 20 */ blr +} +#pragma peephole on +#endif + +//static +void func_801DB92C(u8 p1, u8 p2, u32 p3) +{ + u32 r6 = 0x80000000; + while (p1--) + r6 >>= 1; + while (p2--) { + lbl_8063F308 = (p3 == 1) ? lbl_8063F308 | r6 : lbl_8063F308 & ~r6; + r6 >>= 1; + } +} + + + + + +} -- cgit v1.2.3 From 5ba0f4b6ea4e02ba406018a74a9fff4b7a0dd9ad Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 01:31:26 -0400 Subject: ordering/reg swap in func_801DB9FC --- src/code_801DB81C.cpp | 96 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index 8940b1d..3870e58 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -3,30 +3,35 @@ #include "SDK/os.h" extern "C" { + +typedef void (*FuncPtr2)(u32, u32, u8); // TODO: rename struct unkClass3 { u8 unk0; u8 unk1; - u32 unk4; + FuncPtr2 unk4; }; // TODO: define, rename, localize -// extern unkClass3 lbl_80491370[32]; -extern u8 lbl_80491370; +extern unkClass3 lbl_80491370[32]; extern u32 lbl_8063F2F8; extern u32 lbl_8063F2FC; - +extern u32 lbl_8063F300; extern u8 lbl_8063F304; extern u32 lbl_8063F308; + + + //static void func_801DB81C(u8 p1); - -void func_801DB92C(u8 p1, u8 p2, u32 p3); +static void func_801DB92C(u8 p1, u8 p2, u32 p3); +u32 func_801DB978(u8 p1); +void func_801DB9FC(void); @@ -129,20 +134,87 @@ asm void func_801DB81C(u8 p1) #pragma peephole on #endif -//static -void func_801DB92C(u8 p1, u8 p2, u32 p3) +// set/clear a field of bits in lbl_8063F308 from +// left to right. +// setOrClear == 1 +// else clear the specfied range + +static void func_801DB92C(u8 left, u8 right, u32 setOrClear) { u32 r6 = 0x80000000; - while (p1--) + while (left--) r6 >>= 1; - while (p2--) { - lbl_8063F308 = (p3 == 1) ? lbl_8063F308 | r6 : lbl_8063F308 & ~r6; + while (right--) { + lbl_8063F308 = (setOrClear == 1) ? lbl_8063F308 | r6 : lbl_8063F308 & ~r6; r6 >>= 1; } } +#ifdef NONMATCHING +// This function directly accesses the stack pointer and link register. +// Possibly handwritten assembly. +u32 func_801DB978(u8 p1) +{ + func_801DB81C(p1); + if (p1) + return 1; +} +#else +asm u32 func_801DB978(u8 p1) +{ + nofralloc + /* 801DB978 001D75D8 94 21 FF F0 */ stwu r1, -0x10(r1) + /* 801DB97C 001D75DC 7C 08 02 A6 */ mflr r0 + /* 801DB980 001D75E0 90 01 00 14 */ stw r0, 0x14(r1) + /* 801DB984 001D75E4 93 E1 00 0C */ stw r31, 0xc(r1) + /* 801DB988 001D75E8 7C 3F 0B 78 */ mr r31, r1 + /* 801DB98C 001D75EC 93 C1 00 08 */ stw r30, 8(r1) + /* 801DB990 001D75F0 7C 7E 1B 78 */ mr r30, r3 + /* 801DB994 001D75F4 7C 68 02 A6 */ mflr r3 + /* 801DB998 001D75F8 90 6D A0 40 */ stw r3, 0xA040(r13) + /* 801DB99C 001D75FC 7F C3 F3 78 */ mr r3, r30 + /* 801DB9A0 001D7600 4B FF FE 7D */ bl func_801DB81C + /* 801DB9A4 001D7604 2C 1E 00 00 */ cmpwi r30, 0 + /* 801DB9A8 001D7608 40 82 00 0C */ bne lbl_801DB9B4 + /* 801DB9AC 001D760C 38 60 00 01 */ li r3, 1 + /* 801DB9B0 001D7610 48 00 00 2C */ b lbl_801DB9DC + lbl_801DB9B4: + /* 801DB9B4 001D7614 80 6D A0 3C */ lwz r3, 0xA03C(r13) + /* 801DB9B8 001D7618 80 AD A0 38 */ lwz r5, 0xA038(r13) + /* 801DB9BC 001D761C 7C 63 2A 14 */ add r3, r3, r5 + /* 801DB9C0 001D7620 38 23 FF F8 */ addi r1, r3, -8 + /* 801DB9C4 001D7624 38 60 FF FF */ li r3, -1 + /* 801DB9C8 001D7628 90 61 00 00 */ stw r3, 0(r1) + /* 801DB9CC 001D762C 80 6D A0 40 */ lwz r3, 0xA040(r13) + /* 801DB9D0 001D7630 7C 68 03 A6 */ mtlr r3 + /* 801DB9D4 001D7634 4E 80 00 20 */ blr + /* 801DB9D8 001D7638 38 60 00 01 */ li r3, 1 + lbl_801DB9DC: + /* 801DB9DC 001D763C 7F EA FB 78 */ mr r10, r31 + /* 801DB9E0 001D7640 83 FF 00 0C */ lwz r31, 0xc(r31) + /* 801DB9E4 001D7644 83 CA 00 08 */ lwz r30, 8(r10) + /* 801DB9E8 001D7648 81 41 00 00 */ lwz r10, 0(r1) + /* 801DB9EC 001D764C 80 0A 00 04 */ lwz r0, 4(r10) + /* 801DB9F0 001D7650 7D 41 53 78 */ mr r1, r10 + /* 801DB9F4 001D7654 7C 08 03 A6 */ mtlr r0 + /* 801DB9F8 001D7658 4E 80 00 20 */ blr +} +#pragma peephole on +#endif - +void func_801DB9FC(void) +{ + if (lbl_8063F304 != 1) { + u32 i = 31, j = 0; + do + { + if (lbl_80491370[j].unk0 != 0xff && lbl_80491370[j].unk4) + lbl_80491370[j].unk4(0, lbl_8063F2FC + lbl_80491370[j].unk0 << 9, lbl_80491370[j].unk1); + j++; + } while (i-- != 0); + } + lbl_8063F304 = 1; +} } -- cgit v1.2.3 From 838e6b2d188d8dcd895b9ad006d26bc1f75a0e78 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 01:40:20 -0400 Subject: only an r30/r31 register swap remains in func_801DB9FC --- src/code_801DB81C.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index 3870e58..4cffb24 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -208,12 +208,13 @@ void func_801DB9FC(void) u32 i = 31, j = 0; do { - if (lbl_80491370[j].unk0 != 0xff && lbl_80491370[j].unk4) - lbl_80491370[j].unk4(0, lbl_8063F2FC + lbl_80491370[j].unk0 << 9, lbl_80491370[j].unk1); + u8 r0 = lbl_80491370[j].unk0; + if (r0 != 0xff && lbl_80491370[j].unk4) + lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << 9), lbl_80491370[j].unk1); j++; } while (i-- != 0); + lbl_8063F304 = 1; } - lbl_8063F304 = 1; } -- cgit v1.2.3 From 1a86589bfd0dfb1b0e7b4fdc6d9c9d05d57230be Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 18:03:41 -0400 Subject: Bring code_801DB81C closer to matching: only single instruction misordering left --- src/code_801DB81C.cpp | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index 4cffb24..f0fabab 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -201,11 +201,12 @@ asm u32 func_801DB978(u8 p1) } #pragma peephole on #endif - +/* void func_801DB9FC(void) { + u32 i, j; if (lbl_8063F304 != 1) { - u32 i = 31, j = 0; + i = 31, j = 0; do { u8 r0 = lbl_80491370[j].unk0; @@ -216,6 +217,36 @@ void func_801DB9FC(void) lbl_8063F304 = 1; } } +*/ +void func_801DB9FC(void) +{ + u32 i; + u32 j; + unsigned short new_var; + char new_var2; + u32 *new_var3; + new_var = 0xff; + if (lbl_8063F304 != 1) + { + new_var2 = 9; + i = 31, j = 0; + new_var3 = &i; + do + { + u8 r0 = lbl_80491370[j].unk0; + if (((u32)r0 != new_var) && lbl_80491370[j].unk4) + { + lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + } + + i = *new_var3; + j++; + } + while (((i--)) != 0); + do { lbl_8063F304 = 1; } while (0); + } + +} } -- cgit v1.2.3 From caaaee2fc3c4de6e88b1c0edc92819917b63e258 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 18:13:31 -0400 Subject: match code_801DB9FC --- src/code_801DB81C.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index f0fabab..efe7ade 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -221,32 +221,41 @@ void func_801DB9FC(void) void func_801DB9FC(void) { u32 i; - u32 j; + short j; unsigned short new_var; char new_var2; u32 *new_var3; + u32 new_var4; + u32 *new_var5; new_var = 0xff; if (lbl_8063F304 != 1) { new_var2 = 9; i = 31, j = 0; new_var3 = &i; + new_var5 = &new_var4; do { - u8 r0 = lbl_80491370[j].unk0; - if (((u32)r0 != new_var) && lbl_80491370[j].unk4) + unsigned char r0 = lbl_80491370[j].unk0; + new_var4 = *new_var3; + if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); } - i = *new_var3; + i = *new_var5; j++; } - while (((i--)) != 0); - do { lbl_8063F304 = 1; } while (0); + while ((i--) != 0); + do + { + lbl_8063F304 = 1; + } + while (0); } } + } -- cgit v1.2.3 From 64b05c65e12cb8b5e1d49b9f7bf07c2be482aa14 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 18:41:27 -0400 Subject: match func_801DBA8C --- src/code_801DB81C.cpp | 96 +++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index efe7ade..d7de4dd 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -24,7 +24,7 @@ extern u32 lbl_8063F300; extern u8 lbl_8063F304; extern u32 lbl_8063F308; - +unkStruct gUnk8063F2F0(1, 4, 0); //static @@ -32,8 +32,7 @@ void func_801DB81C(u8 p1); static void func_801DB92C(u8 p1, u8 p2, u32 p3); u32 func_801DB978(u8 p1); void func_801DB9FC(void); - - +void func_801DBA8C(void); #ifdef NONMATCHING // 1. wrong instruction order: loading lbl_80491370@ha before 0 @@ -57,7 +56,6 @@ void func_801DB81C(u8 p1) lbl_8063F304 = 0; } #else -#define _SDA_BASE_ 0x806452C0; asm void func_801DB81C(u8 p1) { nofralloc @@ -201,61 +199,63 @@ asm u32 func_801DB978(u8 p1) } #pragma peephole on #endif -/* + void func_801DB9FC(void) { - u32 i, j; + u32 i; + short j; + unsigned short new_var; + char new_var2; + u32 *new_var3; + u32 new_var4; + u32 *new_var5; + new_var = 0xff; if (lbl_8063F304 != 1) { + new_var2 = 9; i = 31, j = 0; - do - { - u8 r0 = lbl_80491370[j].unk0; - if (r0 != 0xff && lbl_80491370[j].unk4) - lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << 9), lbl_80491370[j].unk1); + new_var3 = &i; + new_var5 = &new_var4; + do { + unsigned char r0 = lbl_80491370[j].unk0; + new_var4 = *new_var3; + if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { + lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + } + + i = *new_var5; j++; - } while (i-- != 0); + } while ((i--) != 0); lbl_8063F304 = 1; } } -*/ -void func_801DB9FC(void) + +void func_801DBA8C(void) { - u32 i; - short j; - unsigned short new_var; - char new_var2; - u32 *new_var3; - u32 new_var4; - u32 *new_var5; - new_var = 0xff; - if (lbl_8063F304 != 1) - { - new_var2 = 9; - i = 31, j = 0; - new_var3 = &i; - new_var5 = &new_var4; - do - { - unsigned char r0 = lbl_80491370[j].unk0; - new_var4 = *new_var3; - if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) - { - lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); - } + u32 i; + short j; + unsigned short new_var; + char new_var2; + u32 *new_var3; + u32 new_var4; + u32 *new_var5; + new_var = 0xff; + if (lbl_8063F304 != 0) { + new_var2 = 9; + i = 31, j = 0; + new_var3 = &i; + new_var5 = &new_var4; + do { + unsigned char r0 = lbl_80491370[j].unk0; + new_var4 = *new_var3; + if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { + lbl_80491370[j].unk4(1, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + } - i = *new_var5; - j++; - } - while ((i--) != 0); - do - { - lbl_8063F304 = 1; + i = *new_var5; + j++; + } while ((i--) != 0); + lbl_8063F304 = 0; } - while (0); - } - } - - } -- cgit v1.2.3 From f249496438acf249d1c314285f7aa2a450ad6efc Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 22:01:08 -0400 Subject: match func_801DB81C --- src/code_801DB81C.cpp | 68 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index d7de4dd..d5b23ac 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -34,27 +34,52 @@ u32 func_801DB978(u8 p1); void func_801DB9FC(void); void func_801DBA8C(void); -#ifdef NONMATCHING +#define NONMATCHING2 +#ifdef NONMATCHING2 // 1. wrong instruction order: loading lbl_80491370@ha before 0 // 2. r30/r31 register swap //static void func_801DB81C(u8 p1) { - for (size_t i = 0; i < 31; i++) - lbl_80491370[i].unk0 = 0xff; - lbl_8063F308 = 0; - lbl_80491370[31].unk0 = 0xff; - LCEnable(); - lbl_8063F2FC = 0xE0000000; - lbl_8063F2F8 = p1 << 9; - if (p1) { - func_801DB92C(0, p1, 1); - lbl_80491370[0].unk0 = 0; - lbl_80491370[0].unk1 = p1; - } - lbl_8063F304 = 0; + size_t i; + int new_var; + size_t new_var2; + size_t *new_var3; + size_t *new_var4; + size_t *new_var5; + new_var = 0; + new_var5 = &i; + for (i = new_var; i < 32; i++) + { + lbl_8063F308 = new_var; + lbl_80491370[i].unk0 = 0xff; + } + + LCEnable(); + if (i) + { + } + + lbl_8063F2FC = 0xE0000000; + i = p1; + new_var = 9; + lbl_8063F2F8 = i << new_var; + if (i) + { + new_var3 = new_var5; + new_var4 = new_var3; + new_var3 = new_var4; + new_var4 = new_var3; + new_var2 = *new_var4; + func_801DB92C(0 & 0xFFu, new_var2, 1); + lbl_80491370[0].unk0 = 0; + lbl_80491370[0].unk1 = *new_var3; + } + + lbl_8063F304 = 0; } + #else asm void func_801DB81C(u8 p1) { @@ -132,17 +157,16 @@ asm void func_801DB81C(u8 p1) #pragma peephole on #endif -// set/clear a field of bits in lbl_8063F308 from -// left to right. -// setOrClear == 1 -// else clear the specfied range - -static void func_801DB92C(u8 left, u8 right, u32 setOrClear) +// set/clear a field of bits in lbl_8063F308 given the +// specified starting bit (0 MSB ... 31 LSB) and width. +// if setOrClear == 1, set the range, +// else clear the range +static void func_801DB92C(u8 start, u8 width, u32 setOrClear) { u32 r6 = 0x80000000; - while (left--) + while (start--) r6 >>= 1; - while (right--) { + while (width--) { lbl_8063F308 = (setOrClear == 1) ? lbl_8063F308 | r6 : lbl_8063F308 & ~r6; r6 >>= 1; } -- cgit v1.2.3 From 6238cac0dbbce8212685c0fde5677eac20eeb457 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Oct 2020 22:26:07 -0400 Subject: remove warnings by adding explicits casts --- src/code_801DB81C.cpp | 179 +++++++++++--------------------------------------- 1 file changed, 38 insertions(+), 141 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index d5b23ac..b8c1c26 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -26,162 +26,61 @@ extern u32 lbl_8063F308; unkStruct gUnk8063F2F0(1, 4, 0); - -//static -void func_801DB81C(u8 p1); -static void func_801DB92C(u8 p1, u8 p2, u32 p3); +static void func_801DB81C(u8 p1); +static void func_801DB92C(u8 start, u8 width, u32 setOrClear); u32 func_801DB978(u8 p1); void func_801DB9FC(void); void func_801DBA8C(void); -#define NONMATCHING2 -#ifdef NONMATCHING2 -// 1. wrong instruction order: loading lbl_80491370@ha before 0 -// 2. r30/r31 register swap -//static -void func_801DB81C(u8 p1) +static void func_801DB81C(u8 p1) { - size_t i; - int new_var; - size_t new_var2; - size_t *new_var3; - size_t *new_var4; - size_t *new_var5; - new_var = 0; - new_var5 = &i; - for (i = new_var; i < 32; i++) - { - lbl_8063F308 = new_var; - lbl_80491370[i].unk0 = 0xff; - } - - LCEnable(); - if (i) - { - } - - lbl_8063F2FC = 0xE0000000; - i = p1; - new_var = 9; - lbl_8063F2F8 = i << new_var; - if (i) - { - new_var3 = new_var5; - new_var4 = new_var3; - new_var3 = new_var4; - new_var4 = new_var3; - new_var2 = *new_var4; - func_801DB92C(0 & 0xFFu, new_var2, 1); - lbl_80491370[0].unk0 = 0; - lbl_80491370[0].unk1 = *new_var3; - } + size_t i; + size_t new_var; + size_t new_var2; + size_t *new_var3; + size_t *new_var4; + size_t *new_var5; + new_var = 0; + new_var5 = &i; + for (i = new_var; i < 32; i++) { + lbl_8063F308 = new_var; + lbl_80491370[i].unk0 = 0xff; + } - lbl_8063F304 = 0; -} + LCEnable(); + + lbl_8063F2FC = 0xE0000000; + i = p1; + new_var = 9; + lbl_8063F2F8 = i << new_var; + if (i) { + new_var3 = new_var5; + new_var4 = new_var3; + new_var3 = new_var4; + new_var4 = new_var3; + new_var2 = *new_var4; + func_801DB92C(0 & 0xFFu, (u8)new_var2, 1); + lbl_80491370[0].unk0 = 0; + lbl_80491370[0].unk1 = (u8)*new_var3; + } -#else -asm void func_801DB81C(u8 p1) -{ - nofralloc - /* 801DB81C 001D747C 94 21 FF E0 */ stwu r1, -0x20(r1) - /* 801DB820 001D7480 7C 08 02 A6 */ mflr r0 - /* 801DB824 001D7484 90 01 00 24 */ stw r0, 0x24(r1) - /* 801DB828 001D7488 38 00 00 FF */ li r0, 0xff - /* 801DB82C 001D748C 93 E1 00 1C */ stw r31, 0x1c(r1) - /* 801DB830 001D7490 3F E0 80 49 */ lis r31, lbl_80491370@ha - /* 801DB834 001D7494 93 C1 00 18 */ stw r30, 0x18(r1) - /* 801DB838 001D7498 3B C0 00 00 */ li r30, 0 - /* 801DB83C 001D749C 93 A1 00 14 */ stw r29, 0x14(r1) - /* 801DB840 001D74A0 3B BF 13 70 */ addi r29, r31, lbl_80491370@l - /* 801DB844 001D74A4 93 81 00 10 */ stw r28, 0x10(r1) - /* 801DB848 001D74A8 7C 7C 1B 78 */ mr r28, r3 - /* 801DB84C 001D74AC 98 1D 00 00 */ stb r0, 0(r29) - /* 801DB850 001D74B0 98 1D 00 08 */ stb r0, 8(r29) - /* 801DB854 001D74B4 98 1D 00 10 */ stb r0, 0x10(r29) - /* 801DB858 001D74B8 98 1D 00 18 */ stb r0, 0x18(r29) - /* 801DB85C 001D74BC 98 1D 00 20 */ stb r0, 0x20(r29) - /* 801DB860 001D74C0 98 1D 00 28 */ stb r0, 0x28(r29) - /* 801DB864 001D74C4 98 1D 00 30 */ stb r0, 0x30(r29) - /* 801DB868 001D74C8 98 1D 00 38 */ stb r0, 0x38(r29) - /* 801DB86C 001D74CC 98 1D 00 40 */ stb r0, 0x40(r29) - /* 801DB870 001D74D0 98 1D 00 48 */ stb r0, 0x48(r29) - /* 801DB874 001D74D4 98 1D 00 50 */ stb r0, 0x50(r29) - /* 801DB878 001D74D8 98 1D 00 58 */ stb r0, 0x58(r29) - /* 801DB87C 001D74DC 98 1D 00 60 */ stb r0, 0x60(r29) - /* 801DB880 001D74E0 98 1D 00 68 */ stb r0, 0x68(r29) - /* 801DB884 001D74E4 98 1D 00 70 */ stb r0, 0x70(r29) - /* 801DB888 001D74E8 98 1D 00 78 */ stb r0, 0x78(r29) - /* 801DB88C 001D74EC 98 1D 00 80 */ stb r0, 0x80(r29) - /* 801DB890 001D74F0 98 1D 00 88 */ stb r0, 0x88(r29) - /* 801DB894 001D74F4 98 1D 00 90 */ stb r0, 0x90(r29) - /* 801DB898 001D74F8 98 1D 00 98 */ stb r0, 0x98(r29) - /* 801DB89C 001D74FC 98 1D 00 A0 */ stb r0, 0xa0(r29) - /* 801DB8A0 001D7500 98 1D 00 A8 */ stb r0, 0xa8(r29) - /* 801DB8A4 001D7504 98 1D 00 B0 */ stb r0, 0xb0(r29) - /* 801DB8A8 001D7508 98 1D 00 B8 */ stb r0, 0xb8(r29) - /* 801DB8AC 001D750C 98 1D 00 C0 */ stb r0, 0xc0(r29) - /* 801DB8B0 001D7510 98 1D 00 C8 */ stb r0, 0xc8(r29) - /* 801DB8B4 001D7514 98 1D 00 D0 */ stb r0, 0xd0(r29) - /* 801DB8B8 001D7518 98 1D 00 D8 */ stb r0, 0xd8(r29) - /* 801DB8BC 001D751C 98 1D 00 E0 */ stb r0, 0xe0(r29) - /* 801DB8C0 001D7520 98 1D 00 E8 */ stb r0, 0xe8(r29) - /* 801DB8C4 001D7524 98 1D 00 F0 */ stb r0, 0xf0(r29) - /* 801DB8C8 001D7528 93 CD A0 48 */ stw r30, 0xA048(r13) - /* 801DB8CC 001D752C 98 1D 00 F8 */ stb r0, 0xf8(r29) - /* 801DB8D0 001D7530 48 08 EF 8D */ bl LCEnable - /* 801DB8D4 001D7534 57 80 4B EC */ rlwinm r0, r28, 9, 0xf, 0x16 - /* 801DB8D8 001D7538 3C 60 E0 00 */ lis r3, 0xe000 - /* 801DB8DC 001D753C 2C 1C 00 00 */ cmpwi r28, 0 - /* 801DB8E0 001D7540 90 6D A0 3C */ stw r3, 0xA03C(r13) - /* 801DB8E4 001D7544 90 0D A0 38 */ stw r0, 0xA038(r13) - /* 801DB8E8 001D7548 41 82 00 1C */ beq lbl_801DB904 - /* 801DB8EC 001D754C 7F 84 E3 78 */ mr r4, r28 - /* 801DB8F0 001D7550 38 60 00 00 */ li r3, 0 - /* 801DB8F4 001D7554 38 A0 00 01 */ li r5, 1 - /* 801DB8F8 001D7558 48 00 00 35 */ bl func_801DB92C - /* 801DB8FC 001D755C 9B DF 13 70 */ stb r30, 0x1370(r31) - /* 801DB900 001D7560 9B 9D 00 01 */ stb r28, 1(r29) - lbl_801DB904: - /* 801DB904 001D7564 38 00 00 00 */ li r0, 0 - /* 801DB908 001D7568 98 0D A0 44 */ stb r0, 0xA044(r13) - /* 801DB90C 001D756C 83 E1 00 1C */ lwz r31, 0x1c(r1) - /* 801DB910 001D7570 83 C1 00 18 */ lwz r30, 0x18(r1) - /* 801DB914 001D7574 83 A1 00 14 */ lwz r29, 0x14(r1) - /* 801DB918 001D7578 83 81 00 10 */ lwz r28, 0x10(r1) - /* 801DB91C 001D757C 80 01 00 24 */ lwz r0, 0x24(r1) - /* 801DB920 001D7580 7C 08 03 A6 */ mtlr r0 - /* 801DB924 001D7584 38 21 00 20 */ addi r1, r1, 0x20 - /* 801DB928 001D7588 4E 80 00 20 */ blr + lbl_8063F304 = 0; } -#pragma peephole on -#endif -// set/clear a field of bits in lbl_8063F308 given the -// specified starting bit (0 MSB ... 31 LSB) and width. -// if setOrClear == 1, set the range, -// else clear the range static void func_801DB92C(u8 start, u8 width, u32 setOrClear) { - u32 r6 = 0x80000000; + u32 bit = 0x80000000; while (start--) - r6 >>= 1; + bit >>= 1; while (width--) { - lbl_8063F308 = (setOrClear == 1) ? lbl_8063F308 | r6 : lbl_8063F308 & ~r6; - r6 >>= 1; + lbl_8063F308 = (setOrClear == 1) ? lbl_8063F308 | bit : lbl_8063F308 & ~bit; + bit >>= 1; } } -#ifdef NONMATCHING -// This function directly accesses the stack pointer and link register. -// Possibly handwritten assembly. -u32 func_801DB978(u8 p1) -{ - func_801DB81C(p1); - if (p1) - return 1; -} -#else +// Note: Handwritten asm is used here because this function directly accesses +// the link register and stack pointer as part of the function body asm u32 func_801DB978(u8 p1) { nofralloc @@ -221,8 +120,6 @@ asm u32 func_801DB978(u8 p1) /* 801DB9F4 001D7654 7C 08 03 A6 */ mtlr r0 /* 801DB9F8 001D7658 4E 80 00 20 */ blr } -#pragma peephole on -#endif void func_801DB9FC(void) { -- cgit v1.2.3 From d777bee871875f336299c8863e06918ffe0d0b8d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 22 Oct 2020 13:02:45 -0400 Subject: figured out how to reference global variables from inline asm functions using a special declaration syntax and #pragmas for mwcceppc 3.0 --- src/code_801DB81C.cpp | 52 +++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index b8c1c26..bbe99c7 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -1,37 +1,43 @@ #include "types.h" #include "unkStruct.h" #include "SDK/os.h" +#include "code_801DB81C.h" + +#pragma unsafe_global_reg_vars off +#pragma ignore_global_reg_vars on extern "C" { typedef void (*FuncPtr2)(u32, u32, u8); -// TODO: rename -struct unkClass3 +namespace { - u8 unk0; - u8 unk1; - FuncPtr2 unk4; -}; + struct unkClass3 + { + u8 unk0; + u8 unk1; + FuncPtr2 unk4; + }; + + unkStruct gUnk8063F2F0(1, 4, 0); + u32 gUnk8063F2F8; + u32 gUnk8063F2FC; +} -// TODO: define, rename, localize -extern unkClass3 lbl_80491370[32]; +u32 gUnk8063F300 asm("r14"); // TODO: how do you reference this from inline asm -extern u32 lbl_8063F2F8; -extern u32 lbl_8063F2FC; -extern u32 lbl_8063F300; extern u8 lbl_8063F304; extern u32 lbl_8063F308; -unkStruct gUnk8063F2F0(1, 4, 0); +// TODO: define, rename, localize +extern unkClass3 lbl_80491370[32]; + + + static void func_801DB81C(u8 p1); static void func_801DB92C(u8 start, u8 width, u32 setOrClear); -u32 func_801DB978(u8 p1); -void func_801DB9FC(void); -void func_801DBA8C(void); - static void func_801DB81C(u8 p1) { @@ -50,10 +56,10 @@ static void func_801DB81C(u8 p1) LCEnable(); - lbl_8063F2FC = 0xE0000000; + gUnk8063F2FC = 0xE0000000; i = p1; new_var = 9; - lbl_8063F2F8 = i << new_var; + gUnk8063F2F8 = i << new_var; if (i) { new_var3 = new_var5; new_var4 = new_var3; @@ -79,8 +85,6 @@ static void func_801DB92C(u8 start, u8 width, u32 setOrClear) } } -// Note: Handwritten asm is used here because this function directly accesses -// the link register and stack pointer as part of the function body asm u32 func_801DB978(u8 p1) { nofralloc @@ -92,7 +96,7 @@ asm u32 func_801DB978(u8 p1) /* 801DB98C 001D75EC 93 C1 00 08 */ stw r30, 8(r1) /* 801DB990 001D75F0 7C 7E 1B 78 */ mr r30, r3 /* 801DB994 001D75F4 7C 68 02 A6 */ mflr r3 - /* 801DB998 001D75F8 90 6D A0 40 */ stw r3, 0xA040(r13) + /* 801DB998 001D75F8 90 6D A0 40 */ stw r3, gUnk8063F300 /* 801DB99C 001D75FC 7F C3 F3 78 */ mr r3, r30 /* 801DB9A0 001D7600 4B FF FE 7D */ bl func_801DB81C /* 801DB9A4 001D7604 2C 1E 00 00 */ cmpwi r30, 0 @@ -106,7 +110,7 @@ asm u32 func_801DB978(u8 p1) /* 801DB9C0 001D7620 38 23 FF F8 */ addi r1, r3, -8 /* 801DB9C4 001D7624 38 60 FF FF */ li r3, -1 /* 801DB9C8 001D7628 90 61 00 00 */ stw r3, 0(r1) - /* 801DB9CC 001D762C 80 6D A0 40 */ lwz r3, 0xA040(r13) + /* 801DB9CC 001D762C 80 6D A0 40 */ lwz r3, gUnk8063F300 /* 801DB9D0 001D7630 7C 68 03 A6 */ mtlr r3 /* 801DB9D4 001D7634 4E 80 00 20 */ blr /* 801DB9D8 001D7638 38 60 00 01 */ li r3, 1 @@ -140,7 +144,7 @@ void func_801DB9FC(void) unsigned char r0 = lbl_80491370[j].unk0; new_var4 = *new_var3; if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { - lbl_80491370[j].unk4(0, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + lbl_80491370[j].unk4(0, gUnk8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); } i = *new_var5; @@ -169,7 +173,7 @@ void func_801DBA8C(void) unsigned char r0 = lbl_80491370[j].unk0; new_var4 = *new_var3; if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { - lbl_80491370[j].unk4(1, lbl_8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + lbl_80491370[j].unk4(1, gUnk8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); } i = *new_var5; -- cgit v1.2.3 From e59582e0613910f8a47b0d6458975a5205d16d4e Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 22 Oct 2020 14:47:56 -0400 Subject: decompile code_801DB81C, and revamp the source file layout template and type naming convention. Rename unkStruct to ctorStruct --- src/code_801DAA30.cpp | 7 ++--- src/code_801DAAE0.cpp | 25 +++++++++------- src/code_801DB040.cpp | 61 +++++++++++++++++++-------------------- src/code_801DB81C.cpp | 79 ++++++++++++++++++++++----------------------------- 4 files changed, 81 insertions(+), 91 deletions(-) (limited to 'src') diff --git a/src/code_801DAA30.cpp b/src/code_801DAA30.cpp index 17375d9..c8f0756 100644 --- a/src/code_801DAA30.cpp +++ b/src/code_801DAA30.cpp @@ -1,11 +1,8 @@ #include "types.h" -#include "unkStruct.h" +#include "ctorStruct.h" #include "code_801DAAE0.h" -namespace -{ - unkStruct gUnk8063F2C8(1, 4, 0); -} +static ctorStruct gUnk8063F2C8(1, 4, 0); void* operator new(size_t sz) { diff --git a/src/code_801DAAE0.cpp b/src/code_801DAAE0.cpp index 31b84e5..dd5e504 100644 --- a/src/code_801DAAE0.cpp +++ b/src/code_801DAAE0.cpp @@ -1,5 +1,5 @@ #include "types.h" -#include "unkStruct.h" +#include "ctorStruct.h" #include "Runtime/__mem.h" #include "SDK/mem.h" #include "code_801DAAE0.h" @@ -19,17 +19,22 @@ namespace u16 groupID; u32 unk8; }; - - const size_t ARR_SIZE = 16; - unkClass gUnk804912B0[ARR_SIZE]; - - unkStruct gUnk8063F2D0(1, 4, 0); - u8 gUnk8063F2D6; - u8 gUnk8063F2D7; - MEMHeapHandle gUnk8063F2D8; - u16 gUnk8063F2DC; } +static unkClass* func_801DAAE0(void); +static void* lbl_801DAC9C(MEMHeapHandle heap, u32 size, int fill); +static BOOL func_801DAD1C(MEMHeapHandle heap, void* memBlock, u32 size); +static u32 func_801DAD60(MEMHeapHandle heap); +static void lbl_801DAF1C(void* memBlock, MEMHeapHandle, u32 p3); + +static const size_t ARR_SIZE = 16; +static unkClass gUnk804912B0[ARR_SIZE]; +static ctorStruct gUnk8063F2D0(1, 4, 0); +static u8 gUnk8063F2D6; +static u8 gUnk8063F2D7; +static MEMHeapHandle gUnk8063F2D8; +static u16 gUnk8063F2DC; + extern "C" { static unkClass* func_801DAAE0(void) diff --git a/src/code_801DB040.cpp b/src/code_801DB040.cpp index cf295c2..088dc2a 100644 --- a/src/code_801DB040.cpp +++ b/src/code_801DB040.cpp @@ -1,31 +1,30 @@ #include "types.h" -#include "unkStruct.h" +#include "ctorStruct.h" #include "Runtime/__mem.h" #include "SDK/mem.h" #include "code_801DAAE0.h" #include "code_801DBB3C.h" #include "code_801DB040.h" -extern "C" { +static gUnkClass1* func_801DB040(u32 p1, u32 p2); -namespace -{ - unkStruct gUnk8063F2E0(1, 4, 0); - unkClass* gUnk8063F2E8; - unkClass2* gUnk8063F2EC; -} +static ctorStruct gUnk8063F2E0(1, 4, 0); +static gUnkClass1* gUnk8063F2E8; +static gUnkClass2* gUnk8063F2EC; + +extern "C" { -static unkClass* func_801DB040(u32 p1, u32 p2) +static gUnkClass1* func_801DB040(u32 p1, u32 p2) { - for (unkClass* r5 = gUnk8063F2E8; r5; r5 = r5->unk1C) + for (gUnkClass1* r5 = gUnk8063F2E8; r5; r5 = r5->unk1C) if (r5->unk10 == p1 && r5->unk14 == p2) return r5; return NULL; } -unkClass* func_801DB07C(unkClass* p1, BOOL p2) +gUnkClass1* func_801DB07C(gUnkClass1* p1, BOOL p2) { - unkClass* r31; + gUnkClass1* r31; if (p1->unk18 && p1->unk18(p1->unkC, p1->unk10, p1->unk14) == 0) return p1->unk1C; if (p1->unk0) { @@ -38,7 +37,7 @@ unkClass* func_801DB07C(unkClass* p1, BOOL p2) p1->unkC = NULL; r31 = p1->unk1C; if (p2) { - unkClass* r3 = p1->unk20; + gUnkClass1* r3 = p1->unk20; if (r3) r3->unk1C = r31; else @@ -57,11 +56,11 @@ void func_801DB15C(u32 p1) gUnk8063F2EC = func_801DBD74(p1, 36); } -static void* func_801DB184(MEMHeapHandle heap, u32 size, u32 p3, u32 p4, FuncPtr p5) +static void* func_801DB184(MEMHeapHandle heap, u32 size, u32 p3, u32 p4, gFuncPtr1 p5) { if (func_801DB040(p3, p4)) return NULL; - unkClass* r31 = func_801DBC58(gUnk8063F2EC); + gUnkClass1* r31 = func_801DBC58(gUnk8063F2EC); if (!r31) return NULL; if ((r31->unkC = func_801DAC94(heap, size)) == NULL) { @@ -85,11 +84,11 @@ static void* func_801DB184(MEMHeapHandle heap, u32 size, u32 p3, u32 p4, FuncPtr return r31->unkC; } -void* func_801DB270(MEMHeapHandle heap, u32 size, int align, u32 p4, u32 p5, FuncPtr p6) +void* func_801DB270(MEMHeapHandle heap, u32 size, int align, u32 p4, u32 p5, gFuncPtr1 p6) { if (func_801DB040(p4, p5)) return NULL; - unkClass* r31 = func_801DBC58(gUnk8063F2EC); + gUnkClass1* r31 = func_801DBC58(gUnk8063F2EC); if (!r31) return NULL; if ((r31->unkC = func_801DAD08(heap, size, align)) == NULL) { @@ -112,14 +111,14 @@ void* func_801DB270(MEMHeapHandle heap, u32 size, int align, u32 p4, u32 p5, Fun return r31->unkC; } -void* func_801DB360(u32 size, int align, u32 p3, u32 p4, FuncPtr p5) +void* func_801DB360(u32 size, int align, u32 p3, u32 p4, gFuncPtr1 p5) { return func_801DB270(func_801DAC0C(), size, align, p3, p4, p5); } -void func_801DB3BC(void* p1, u32 p2, u32 p3, FuncPtr p4) +void func_801DB3BC(void* p1, u32 p2, u32 p3, gFuncPtr1 p4) { - unkClass* r31 = func_801DB040(p2, p3); + gUnkClass1* r31 = func_801DB040(p2, p3); if (!p1) { if (r31) func_801DB07C(r31, TRUE); @@ -136,7 +135,7 @@ void func_801DB3BC(void* p1, u32 p2, u32 p3, FuncPtr p4) r31->unk18 = p4; } } else { - unkClass* r3 = func_801DBC58(gUnk8063F2EC); + gUnkClass1* r3 = func_801DBC58(gUnk8063F2EC); if (r3) { if (gUnk8063F2E8) gUnk8063F2E8->unk20 = r3; @@ -155,7 +154,7 @@ void func_801DB3BC(void* p1, u32 p2, u32 p3, FuncPtr p4) void* func_801DB4BC(u32 p1, u32 p2) { - unkClass* r3 = func_801DB040(p1, p2); + gUnkClass1* r3 = func_801DB040(p1, p2); if (!r3 || r3->unk1) return NULL; return r3->unkC; @@ -163,7 +162,7 @@ void* func_801DB4BC(u32 p1, u32 p2) u32 func_801DB4FC(u32 p1, u32 p2) { - unkClass* r3 = func_801DB040(p1, p2); + gUnkClass1* r3 = func_801DB040(p1, p2); if (!r3 || r3->unk1) return 0; return ++r3->unk4; @@ -171,7 +170,7 @@ u32 func_801DB4FC(u32 p1, u32 p2) u32 func_801DB548(u32 p1, u32 p2) { - unkClass* r31 = func_801DB040(p1, p2); + gUnkClass1* r31 = func_801DB040(p1, p2); if (!r31 || r31->unk1) return 0; if (r31->unk4 == 0) { @@ -185,7 +184,7 @@ u32 func_801DB548(u32 p1, u32 p2) u32 func_801DB5E4(u32 p1, u32 p2) { - unkClass* r3 = func_801DB040(p1, p2); + gUnkClass1* r3 = func_801DB040(p1, p2); if (!r3) return 0; if (!r3->unkC) @@ -197,21 +196,21 @@ u32 func_801DB5E4(u32 p1, u32 p2) void func_801DB644(u32 p1, u32 p2) { - unkClass* r3 = func_801DB040(p1, p2); + gUnkClass1* r3 = func_801DB040(p1, p2); if (r3) func_801DB07C(r3, TRUE); } void func_801DB674(u32 p1) { - unkClass* p = gUnk8063F2E8; + gUnkClass1* p = gUnk8063F2E8; while (p) p = (p->unk10 == p1) ? func_801DB07C(p, TRUE) : p->unk1C; } -BOOL func_801DB6D0(u32 p1, u32 p2, MEMHeapHandle heap, u32 p4, u32 p5, FuncPtr p6) +BOOL func_801DB6D0(u32 p1, u32 p2, MEMHeapHandle heap, u32 p4, u32 p5, gFuncPtr1 p6) { - unkClass* r31 = func_801DB040(p1, p2); + gUnkClass1* r31 = func_801DB040(p1, p2); if (!r31 || r31->unk1 || !r31->unkC || !r31->unk0) return FALSE; u32 blockSize = func_801DAEE0(r31->unkC); @@ -226,14 +225,14 @@ BOOL func_801DB6D0(u32 p1, u32 p2, MEMHeapHandle heap, u32 p4, u32 p5, FuncPtr p void func_801DB79C(u32 p1, u32 p2) { - unkClass* r3 = func_801DB040(p1, p2); + gUnkClass1* r3 = func_801DB040(p1, p2); if (r3) r3->unk1 = 1; } void func_801DB7CC(u32 p1, u32 p2) { - unkClass* r3 = func_801DB040(p1, p2); + gUnkClass1* r3 = func_801DB040(p1, p2); if (r3) r3->unk1 = 0; } diff --git a/src/code_801DB81C.cpp b/src/code_801DB81C.cpp index bbe99c7..678fafa 100644 --- a/src/code_801DB81C.cpp +++ b/src/code_801DB81C.cpp @@ -1,44 +1,33 @@ #include "types.h" -#include "unkStruct.h" +#include "ctorStruct.h" #include "SDK/os.h" #include "code_801DB81C.h" -#pragma unsafe_global_reg_vars off -#pragma ignore_global_reg_vars on - -extern "C" { - -typedef void (*FuncPtr2)(u32, u32, u8); - namespace { - struct unkClass3 + typedef void (*funcPtr)(u32, u32, u8); + + struct unkClass { u8 unk0; u8 unk1; - FuncPtr2 unk4; + funcPtr unk4; }; - - unkStruct gUnk8063F2F0(1, 4, 0); - u32 gUnk8063F2F8; - u32 gUnk8063F2FC; } -u32 gUnk8063F300 asm("r14"); // TODO: how do you reference this from inline asm - - -extern u8 lbl_8063F304; -extern u32 lbl_8063F308; - -// TODO: define, rename, localize -extern unkClass3 lbl_80491370[32]; - - - - static void func_801DB81C(u8 p1); static void func_801DB92C(u8 start, u8 width, u32 setOrClear); +static unkClass gUnk80491370[32]; +static ctorStruct gUnk8063F2F0(1, 4, 0); +static u32 gUnk8063F2F8; +static u32 gUnk8063F2FC; +static u32 gUnk8063F300; +static u8 gUnk8063F304; +static u32 gUnk8063F308; + +extern "C" { + static void func_801DB81C(u8 p1) { size_t i; @@ -50,8 +39,8 @@ static void func_801DB81C(u8 p1) new_var = 0; new_var5 = &i; for (i = new_var; i < 32; i++) { - lbl_8063F308 = new_var; - lbl_80491370[i].unk0 = 0xff; + gUnk8063F308 = new_var; + gUnk80491370[i].unk0 = 0xff; } LCEnable(); @@ -67,11 +56,11 @@ static void func_801DB81C(u8 p1) new_var4 = new_var3; new_var2 = *new_var4; func_801DB92C(0 & 0xFFu, (u8)new_var2, 1); - lbl_80491370[0].unk0 = 0; - lbl_80491370[0].unk1 = (u8)*new_var3; + gUnk80491370[0].unk0 = 0; + gUnk80491370[0].unk1 = (u8)*new_var3; } - lbl_8063F304 = 0; + gUnk8063F304 = 0; } static void func_801DB92C(u8 start, u8 width, u32 setOrClear) @@ -80,7 +69,7 @@ static void func_801DB92C(u8 start, u8 width, u32 setOrClear) while (start--) bit >>= 1; while (width--) { - lbl_8063F308 = (setOrClear == 1) ? lbl_8063F308 | bit : lbl_8063F308 & ~bit; + gUnk8063F308 = (setOrClear == 1) ? gUnk8063F308 | bit : gUnk8063F308 & ~bit; bit >>= 1; } } @@ -104,8 +93,8 @@ asm u32 func_801DB978(u8 p1) /* 801DB9AC 001D760C 38 60 00 01 */ li r3, 1 /* 801DB9B0 001D7610 48 00 00 2C */ b lbl_801DB9DC lbl_801DB9B4: - /* 801DB9B4 001D7614 80 6D A0 3C */ lwz r3, 0xA03C(r13) - /* 801DB9B8 001D7618 80 AD A0 38 */ lwz r5, 0xA038(r13) + /* 801DB9B4 001D7614 80 6D A0 3C */ lwz r3, gUnk8063F2FC + /* 801DB9B8 001D7618 80 AD A0 38 */ lwz r5, gUnk8063F2F8 /* 801DB9BC 001D761C 7C 63 2A 14 */ add r3, r3, r5 /* 801DB9C0 001D7620 38 23 FF F8 */ addi r1, r3, -8 /* 801DB9C4 001D7624 38 60 FF FF */ li r3, -1 @@ -135,22 +124,22 @@ void func_801DB9FC(void) u32 new_var4; u32 *new_var5; new_var = 0xff; - if (lbl_8063F304 != 1) { + if (gUnk8063F304 != 1) { new_var2 = 9; i = 31, j = 0; new_var3 = &i; new_var5 = &new_var4; do { - unsigned char r0 = lbl_80491370[j].unk0; + unsigned char r0 = gUnk80491370[j].unk0; new_var4 = *new_var3; - if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { - lbl_80491370[j].unk4(0, gUnk8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + if ((((u32) r0) != new_var) && gUnk80491370[j].unk4) { + gUnk80491370[j].unk4(0, gUnk8063F2FC + (r0 << new_var2), gUnk80491370[j].unk1); } i = *new_var5; j++; } while ((i--) != 0); - lbl_8063F304 = 1; + gUnk8063F304 = 1; } } @@ -164,23 +153,23 @@ void func_801DBA8C(void) u32 new_var4; u32 *new_var5; new_var = 0xff; - if (lbl_8063F304 != 0) { + if (gUnk8063F304 != 0) { new_var2 = 9; i = 31, j = 0; new_var3 = &i; new_var5 = &new_var4; do { - unsigned char r0 = lbl_80491370[j].unk0; + unsigned char r0 = gUnk80491370[j].unk0; new_var4 = *new_var3; - if ((((u32) r0) != new_var) && lbl_80491370[j].unk4) { - lbl_80491370[j].unk4(1, gUnk8063F2FC + (r0 << new_var2), lbl_80491370[j].unk1); + if ((((u32) r0) != new_var) && gUnk80491370[j].unk4) { + gUnk80491370[j].unk4(1, gUnk8063F2FC + (r0 << new_var2), gUnk80491370[j].unk1); } i = *new_var5; j++; } while ((i--) != 0); - lbl_8063F304 = 0; + gUnk8063F304 = 0; } } -} +} //extern "C" -- cgit v1.2.3