From b889dc5418ad7a072e6b2b47d7a866ba08c05a15 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 01:30:30 -0400 Subject: match func_801DBC58 --- src/code_801DBB3C.cpp | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) create mode 100644 src/code_801DBB3C.cpp (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp new file mode 100644 index 0000000..589d09a --- /dev/null +++ b/src/code_801DBB3C.cpp @@ -0,0 +1,184 @@ +#include "types.h" +#include "ctorStruct.h" +#include "Runtime/__mem.h" +#include "code_801DAAE0.h" +#include "code_801DB040.h" +#include "code_801DBB3C.h" + +namespace +{ + + // might be same as above + struct unkClass2 + { + unkClass2* unk0; + gUnkClass1* unk4; + u8 unk8[4]; + size_t unkC; + + + }; + + // gUnkClass2? + struct unkClass + { + u8 pad[0x8]; + u32 unk8; + u32 unkC; + void* unk10; + u32 unk14; + unkClass2* unk18; + }; + + + +} + + +extern "C" { + +//static +unkClass* func_801DBB3C(void) +{ + return 0; +} + +//static +void func_801DBB44(unkClass*) +{ + +} + +//static +#ifdef NONMATCHING +void func_801DBB48(unkClass *p1, u32 p2, u32 p3) +{ + //p2 = r30 + u32 r31 = (p3+7) & ~0x3; // element size + p1->unk8 = p2; // number of elements + p1->unkC = r31; + // void* func_801DAD98(u32 size); allocate and 0 fill + void* data = func_801DAD98((p2+1) * r31); //r3 + p1->unk10 = data; + p1->unk18 = data; + p1->unk14 = (u8*)data + p2 * r31; + if (p2) { + if (p2 > 8) { + u32 r4 = p2 - 8; + if (r4 > 0) { + for (size_t i = (r4+7)/8; i != 0; i--) { + // 8 stores per iteration + + ... + } + } + } + } +} +#else +asm void func_801DBB48(unkClass *p1, u32 p2, u32 p3) +{ + /* 801DBB48 001D77A8 94 21 FF E0 */ stwu r1, -0x20(r1) + /* 801DBB4C 001D77AC 7C 08 02 A6 */ mflr r0 + /* 801DBB50 001D77B0 38 A5 00 07 */ addi r5, r5, 7 + /* 801DBB54 001D77B4 90 01 00 24 */ stw r0, 0x24(r1) + /* 801DBB58 001D77B8 38 04 00 01 */ addi r0, r4, 1 + /* 801DBB5C 001D77BC 93 E1 00 1C */ stw r31, 0x1c(r1) + /* 801DBB60 001D77C0 54 BF 00 3A */ rlwinm r31, r5, 0, 0, 0x1d + /* 801DBB64 001D77C4 93 C1 00 18 */ stw r30, 0x18(r1) + /* 801DBB68 001D77C8 7C 9E 23 78 */ mr r30, r4 + /* 801DBB6C 001D77CC 93 A1 00 14 */ stw r29, 0x14(r1) + /* 801DBB70 001D77D0 7C 7D 1B 78 */ mr r29, r3 + /* 801DBB74 001D77D4 90 83 00 08 */ stw r4, 8(r3) + /* 801DBB78 001D77D8 93 E3 00 0C */ stw r31, 0xc(r3) + /* 801DBB7C 001D77DC 7C 60 F9 D6 */ mullw r3, r0, r31 + /* 801DBB80 001D77E0 4B FF F2 19 */ bl func_801DAD98 + /* 801DBB84 001D77E4 7C 1E F9 D6 */ mullw r0, r30, r31 + /* 801DBB88 001D77E8 2C 1E 00 00 */ cmpwi r30, 0 + /* 801DBB8C 001D77EC 90 7D 00 10 */ stw r3, 0x10(r29) + /* 801DBB90 001D77F0 39 00 00 00 */ li r8, 0 + /* 801DBB94 001D77F4 38 E0 00 00 */ li r7, 0 + /* 801DBB98 001D77F8 90 7D 00 18 */ stw r3, 0x18(r29) + /* 801DBB9C 001D77FC 7C 03 02 14 */ add r0, r3, r0 + /* 801DBBA0 001D7800 90 1D 00 14 */ stw r0, 0x14(r29) + /* 801DBBA4 001D7804 41 82 00 90 */ beq lbl_801DBC34 + /* 801DBBA8 001D7808 28 1E 00 08 */ cmplwi r30, 8 + /* 801DBBAC 001D780C 38 9E FF F8 */ addi r4, r30, -8 + /* 801DBBB0 001D7810 40 81 00 60 */ ble lbl_801DBC10 + /* 801DBBB4 001D7814 38 04 00 07 */ addi r0, r4, 7 + /* 801DBBB8 001D7818 54 00 E8 FE */ srwi r0, r0, 3 + /* 801DBBBC 001D781C 7C 09 03 A6 */ mtctr r0 + /* 801DBBC0 001D7820 28 04 00 00 */ cmplwi r4, 0 + /* 801DBBC4 001D7824 40 81 00 4C */ ble lbl_801DBC10 + lbl_801DBBC8: + /* 801DBBC8 001D7828 7C A3 FA 14 */ add r5, r3, r31 + /* 801DBBCC 001D782C 38 E7 00 08 */ addi r7, r7, 8 + /* 801DBBD0 001D7830 90 A3 00 00 */ stw r5, 0(r3) + /* 801DBBD4 001D7834 7C 85 FA 14 */ add r4, r5, r31 + /* 801DBBD8 001D7838 7C 64 FA 14 */ add r3, r4, r31 + /* 801DBBDC 001D783C 90 85 00 00 */ stw r4, 0(r5) + /* 801DBBE0 001D7840 7C C3 FA 14 */ add r6, r3, r31 + /* 801DBBE4 001D7844 7C A6 FA 14 */ add r5, r6, r31 + /* 801DBBE8 001D7848 90 64 00 00 */ stw r3, 0(r4) + /* 801DBBEC 001D784C 7C 85 FA 14 */ add r4, r5, r31 + /* 801DBBF0 001D7850 7D 04 FA 14 */ add r8, r4, r31 + /* 801DBBF4 001D7854 90 C3 00 00 */ stw r6, 0(r3) + /* 801DBBF8 001D7858 7C 68 FA 14 */ add r3, r8, r31 + /* 801DBBFC 001D785C 90 A6 00 00 */ stw r5, 0(r6) + /* 801DBC00 001D7860 7C 86 F9 2E */ stwx r4, r6, r31 + /* 801DBC04 001D7864 7D 05 F9 2E */ stwx r8, r5, r31 + /* 801DBC08 001D7868 7C 64 F9 2E */ stwx r3, r4, r31 + /* 801DBC0C 001D786C 42 00 FF BC */ bdnz lbl_801DBBC8 + lbl_801DBC10: + /* 801DBC10 001D7870 7C 07 F0 50 */ subf r0, r7, r30 + /* 801DBC14 001D7874 7C 09 03 A6 */ mtctr r0 + /* 801DBC18 001D7878 7C 07 F0 40 */ cmplw r7, r30 + /* 801DBC1C 001D787C 40 80 00 18 */ bge lbl_801DBC34 + lbl_801DBC20: + /* 801DBC20 001D7880 7C 03 FA 14 */ add r0, r3, r31 + /* 801DBC24 001D7884 7C 68 1B 78 */ mr r8, r3 + /* 801DBC28 001D7888 90 03 00 00 */ stw r0, 0(r3) + /* 801DBC2C 001D788C 7C 03 03 78 */ mr r3, r0 + /* 801DBC30 001D7890 42 00 FF F0 */ bdnz lbl_801DBC20 + lbl_801DBC34: + /* 801DBC34 001D7894 38 00 00 00 */ li r0, 0 + /* 801DBC38 001D7898 90 08 00 00 */ stw r0, 0(r8) + /* 801DBC3C 001D789C 83 E1 00 1C */ lwz r31, 0x1c(r1) + /* 801DBC40 001D78A0 83 C1 00 18 */ lwz r30, 0x18(r1) + /* 801DBC44 001D78A4 83 A1 00 14 */ lwz r29, 0x14(r1) + /* 801DBC48 001D78A8 80 01 00 24 */ lwz r0, 0x24(r1) + /* 801DBC4C 001D78AC 7C 08 03 A6 */ mtlr r0 + /* 801DBC50 001D78B0 38 21 00 20 */ addi r1, r1, 0x20 + /* 801DBC54 001D78B4 4E 80 00 20 */ blr +} +#pragma peephole on +#endif + +// allocate a linked list node from the free store +gUnkClass1* func_801DBC58(gUnkClass2* p1) +{ + gUnkClass3* r31 = p1->unk18; + unkClass* r30 = func_801DBB3C(); + func_801DBB44(0); + if (r31) { + p1->unk18 = r31->unk0; + goto bcac; + } + func_801DBB44(r30); + return NULL; +bcac: + func_801DBB44(r30); + memset(r31, 0, p1->unkC); + if (++p1->unk0 > p1->unk4) + p1->unk4 = p1->unk0; + return &r31->unk4; +} +/* +func_801DBD00 +{ + +} +*/ + + +} -- cgit v1.2.3 From cabc694f5a8b403648532bb8cf42cf88f1272e5f Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 01:31:58 -0400 Subject: match func_801DBC58 --- src/code_801DBB3C.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp index 589d09a..d821a9e 100644 --- a/src/code_801DBB3C.cpp +++ b/src/code_801DBB3C.cpp @@ -162,11 +162,11 @@ gUnkClass1* func_801DBC58(gUnkClass2* p1) func_801DBB44(0); if (r31) { p1->unk18 = r31->unk0; - goto bcac; + goto passCheck; } func_801DBB44(r30); return NULL; -bcac: +passCheck: func_801DBB44(r30); memset(r31, 0, p1->unkC); if (++p1->unk0 > p1->unk4) -- cgit v1.2.3 From 047d52bd174f2b8553b9f2958a98639d6dc3e4ec Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 01:52:33 -0400 Subject: match func_801DBD00 --- src/code_801DBB3C.cpp | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp index d821a9e..8400bc9 100644 --- a/src/code_801DBB3C.cpp +++ b/src/code_801DBB3C.cpp @@ -38,13 +38,13 @@ namespace extern "C" { //static -unkClass* func_801DBB3C(void) +u32 func_801DBB3C(void) { return 0; } //static -void func_801DBB44(unkClass*) +void func_801DBB44(u32) { } @@ -158,10 +158,10 @@ asm void func_801DBB48(unkClass *p1, u32 p2, u32 p3) gUnkClass1* func_801DBC58(gUnkClass2* p1) { gUnkClass3* r31 = p1->unk18; - unkClass* r30 = func_801DBB3C(); + u32 r30 = func_801DBB3C(); func_801DBB44(0); if (r31) { - p1->unk18 = r31->unk0; + p1->unk18 = r31->unk0; // point unk18 to possible next free block? goto passCheck; } func_801DBB44(r30); @@ -173,12 +173,22 @@ passCheck: p1->unk4 = p1->unk0; return &r31->unk4; } -/* -func_801DBD00 + +// return node p2 to free store p1 +void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2) { - + u32 r31; + if (p2) { + gUnkClass3* r30 = (gUnkClass3*)((u8*)p2 - 4); + r30->unk0 = p1->unk18; + p1->unk0--; + r31 = func_801DBB3C(); + func_801DBB44(0); + p1->unk18 = r30; + func_801DBB44(r31); + } } -*/ + } -- cgit v1.2.3 From 1a76bb3162479a8897272ca4928ef2e0be849e21 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 12:13:48 -0400 Subject: match func_801DBD74 --- src/code_801DBB3C.cpp | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp index 8400bc9..6ab2959 100644 --- a/src/code_801DBB3C.cpp +++ b/src/code_801DBB3C.cpp @@ -51,7 +51,7 @@ void func_801DBB44(u32) //static #ifdef NONMATCHING -void func_801DBB48(unkClass *p1, u32 p2, u32 p3) +void func_801DBB48(gUnkClass2* p1, u32 p2, u32 p3) { //p2 = r30 u32 r31 = (p3+7) & ~0x3; // element size @@ -69,14 +69,14 @@ void func_801DBB48(unkClass *p1, u32 p2, u32 p3) for (size_t i = (r4+7)/8; i != 0; i--) { // 8 stores per iteration - ... + } } } } } #else -asm void func_801DBB48(unkClass *p1, u32 p2, u32 p3) +asm void func_801DBB48(gUnkClass2* p1, u32 p2, u32 p3) { /* 801DBB48 001D77A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DBB4C 001D77AC 7C 08 02 A6 */ mflr r0 @@ -174,7 +174,8 @@ passCheck: return &r31->unk4; } -// return node p2 to free store p1 +// return node p2 to free store p1, making it the new head of the +// free node linked list void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2) { u32 r31; @@ -189,6 +190,22 @@ void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2) } } +// array +extern gUnkClass2 lbl_80491470[32]; + +// allocate the free store given number of elements and size of each? +gUnkClass2* func_801DBD74(u32 p1, u32 p2) +{ + size_t i; + for (i = 0; i < 32; i++) + if (lbl_80491470[i].unk8 == 0) + break; + gUnkClass2* r31 = &lbl_80491470[i]; + if (r31->unk8) + return NULL; + func_801DBB48(r31, p1, p2); + return r31; +} } -- cgit v1.2.3 From d93b0c1aac1148a9b609baec3914c2f33f546519 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 15:43:52 -0400 Subject: bring func_801DBB48 closer to matching --- src/code_801DBB3C.cpp | 91 ++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 56 deletions(-) (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp index 6ab2959..5d0c4a1 100644 --- a/src/code_801DBB3C.cpp +++ b/src/code_801DBB3C.cpp @@ -5,35 +5,9 @@ #include "code_801DB040.h" #include "code_801DBB3C.h" -namespace -{ - - // might be same as above - struct unkClass2 - { - unkClass2* unk0; - gUnkClass1* unk4; - u8 unk8[4]; - size_t unkC; - - - }; - - // gUnkClass2? - struct unkClass - { - u8 pad[0x8]; - u32 unk8; - u32 unkC; - void* unk10; - u32 unk14; - unkClass2* unk18; - }; - - - -} - +// array of free stores +static gUnkClass2 gUnk80491470[32]; +static ctorStruct gUnk8063F310(1, 4, 0); extern "C" { @@ -50,30 +24,38 @@ void func_801DBB44(u32) } //static +#define NONMATCHING #ifdef NONMATCHING -void func_801DBB48(gUnkClass2* p1, u32 p2, u32 p3) +void func_801DBB48(gUnkClass2* p1, size_t nodes, size_t size) { - //p2 = r30 - u32 r31 = (p3+7) & ~0x3; // element size - p1->unk8 = p2; // number of elements + size_t r31, r30; + gUnkClass2* r29; + // nodes in r30 + // element size + 4, rounded up (for gUnkClass3) + size += 7; + r31 = size & ~0x3; + r30 = nodes; + r29 = p1; + p1->unk8 = nodes; // number of elements p1->unkC = r31; // void* func_801DAD98(u32 size); allocate and 0 fill - void* data = func_801DAD98((p2+1) * r31); //r3 - p1->unk10 = data; - p1->unk18 = data; - p1->unk14 = (u8*)data + p2 * r31; - if (p2) { - if (p2 > 8) { - u32 r4 = p2 - 8; - if (r4 > 0) { - for (size_t i = (r4+7)/8; i != 0; i--) { - // 8 stores per iteration - - - } - } - } + // allocate memory blocks for free store. Extra node at the end + // represents stop? + u8* data = (u8*)func_801DAD98((nodes+1) * r31); //r3 + r29->unk10 = data; + r29->unk18 = (gUnkClass3*)data; + r29->unk14 = data + (r30 * r31); + gUnkClass3* r8 = NULL; + size_t i; + u8* curr = data; + u8* next = data + r31; + for (i = 0; i < r30; curr = next, next += r31, i++) { + // TODO: compiler is precomputing offsets into the array before the + // loop beings but I want it to compute all offsets within the loop + ((gUnkClass3*)curr)->unk0 = (gUnkClass3*)next; + r8 = (gUnkClass3*)curr; } + r8->unk0 = NULL; } #else asm void func_801DBB48(gUnkClass2* p1, u32 p2, u32 p3) @@ -190,20 +172,17 @@ void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2) } } -// array -extern gUnkClass2 lbl_80491470[32]; - // allocate the free store given number of elements and size of each? -gUnkClass2* func_801DBD74(u32 p1, u32 p2) -{ +gUnkClass2* func_801DBD74(u32 nodes, u32 size) +{ size_t i; for (i = 0; i < 32; i++) - if (lbl_80491470[i].unk8 == 0) + if (gUnk80491470[i].unk8 == 0) break; - gUnkClass2* r31 = &lbl_80491470[i]; + gUnkClass2* r31 = &gUnk80491470[i]; if (r31->unk8) return NULL; - func_801DBB48(r31, p1, p2); + func_801DBB48(r31, nodes, size); return r31; } -- cgit v1.2.3 From e3def2d7a360b72359c64924e11ebd67c94843c9 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 22:33:42 -0400 Subject: match func_801DBB48 --- src/code_801DBB3C.cpp | 147 ++++++++++++-------------------------------------- 1 file changed, 34 insertions(+), 113 deletions(-) (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp index 5d0c4a1..8e10633 100644 --- a/src/code_801DBB3C.cpp +++ b/src/code_801DBB3C.cpp @@ -8,9 +8,7 @@ // array of free stores static gUnkClass2 gUnk80491470[32]; static ctorStruct gUnk8063F310(1, 4, 0); - extern "C" { - //static u32 func_801DBB3C(void) { @@ -22,119 +20,43 @@ void func_801DBB44(u32) { } - //static -#define NONMATCHING -#ifdef NONMATCHING -void func_801DBB48(gUnkClass2* p1, size_t nodes, size_t size) +void func_801DBB48(gUnkClass2 *p1, size_t nodes, size_t size) { - size_t r31, r30; - gUnkClass2* r29; - // nodes in r30 - // element size + 4, rounded up (for gUnkClass3) - size += 7; - r31 = size & ~0x3; - r30 = nodes; - r29 = p1; - p1->unk8 = nodes; // number of elements - p1->unkC = r31; - // void* func_801DAD98(u32 size); allocate and 0 fill - // allocate memory blocks for free store. Extra node at the end - // represents stop? - u8* data = (u8*)func_801DAD98((nodes+1) * r31); //r3 - r29->unk10 = data; - r29->unk18 = (gUnkClass3*)data; - r29->unk14 = data + (r30 * r31); - gUnkClass3* r8 = NULL; - size_t i; - u8* curr = data; - u8* next = data + r31; - for (i = 0; i < r30; curr = next, next += r31, i++) { - // TODO: compiler is precomputing offsets into the array before the - // loop beings but I want it to compute all offsets within the loop - ((gUnkClass3*)curr)->unk0 = (gUnkClass3*)next; - r8 = (gUnkClass3*)curr; - } - r8->unk0 = NULL; -} -#else -asm void func_801DBB48(gUnkClass2* p1, u32 p2, u32 p3) -{ - /* 801DBB48 001D77A8 94 21 FF E0 */ stwu r1, -0x20(r1) - /* 801DBB4C 001D77AC 7C 08 02 A6 */ mflr r0 - /* 801DBB50 001D77B0 38 A5 00 07 */ addi r5, r5, 7 - /* 801DBB54 001D77B4 90 01 00 24 */ stw r0, 0x24(r1) - /* 801DBB58 001D77B8 38 04 00 01 */ addi r0, r4, 1 - /* 801DBB5C 001D77BC 93 E1 00 1C */ stw r31, 0x1c(r1) - /* 801DBB60 001D77C0 54 BF 00 3A */ rlwinm r31, r5, 0, 0, 0x1d - /* 801DBB64 001D77C4 93 C1 00 18 */ stw r30, 0x18(r1) - /* 801DBB68 001D77C8 7C 9E 23 78 */ mr r30, r4 - /* 801DBB6C 001D77CC 93 A1 00 14 */ stw r29, 0x14(r1) - /* 801DBB70 001D77D0 7C 7D 1B 78 */ mr r29, r3 - /* 801DBB74 001D77D4 90 83 00 08 */ stw r4, 8(r3) - /* 801DBB78 001D77D8 93 E3 00 0C */ stw r31, 0xc(r3) - /* 801DBB7C 001D77DC 7C 60 F9 D6 */ mullw r3, r0, r31 - /* 801DBB80 001D77E0 4B FF F2 19 */ bl func_801DAD98 - /* 801DBB84 001D77E4 7C 1E F9 D6 */ mullw r0, r30, r31 - /* 801DBB88 001D77E8 2C 1E 00 00 */ cmpwi r30, 0 - /* 801DBB8C 001D77EC 90 7D 00 10 */ stw r3, 0x10(r29) - /* 801DBB90 001D77F0 39 00 00 00 */ li r8, 0 - /* 801DBB94 001D77F4 38 E0 00 00 */ li r7, 0 - /* 801DBB98 001D77F8 90 7D 00 18 */ stw r3, 0x18(r29) - /* 801DBB9C 001D77FC 7C 03 02 14 */ add r0, r3, r0 - /* 801DBBA0 001D7800 90 1D 00 14 */ stw r0, 0x14(r29) - /* 801DBBA4 001D7804 41 82 00 90 */ beq lbl_801DBC34 - /* 801DBBA8 001D7808 28 1E 00 08 */ cmplwi r30, 8 - /* 801DBBAC 001D780C 38 9E FF F8 */ addi r4, r30, -8 - /* 801DBBB0 001D7810 40 81 00 60 */ ble lbl_801DBC10 - /* 801DBBB4 001D7814 38 04 00 07 */ addi r0, r4, 7 - /* 801DBBB8 001D7818 54 00 E8 FE */ srwi r0, r0, 3 - /* 801DBBBC 001D781C 7C 09 03 A6 */ mtctr r0 - /* 801DBBC0 001D7820 28 04 00 00 */ cmplwi r4, 0 - /* 801DBBC4 001D7824 40 81 00 4C */ ble lbl_801DBC10 - lbl_801DBBC8: - /* 801DBBC8 001D7828 7C A3 FA 14 */ add r5, r3, r31 - /* 801DBBCC 001D782C 38 E7 00 08 */ addi r7, r7, 8 - /* 801DBBD0 001D7830 90 A3 00 00 */ stw r5, 0(r3) - /* 801DBBD4 001D7834 7C 85 FA 14 */ add r4, r5, r31 - /* 801DBBD8 001D7838 7C 64 FA 14 */ add r3, r4, r31 - /* 801DBBDC 001D783C 90 85 00 00 */ stw r4, 0(r5) - /* 801DBBE0 001D7840 7C C3 FA 14 */ add r6, r3, r31 - /* 801DBBE4 001D7844 7C A6 FA 14 */ add r5, r6, r31 - /* 801DBBE8 001D7848 90 64 00 00 */ stw r3, 0(r4) - /* 801DBBEC 001D784C 7C 85 FA 14 */ add r4, r5, r31 - /* 801DBBF0 001D7850 7D 04 FA 14 */ add r8, r4, r31 - /* 801DBBF4 001D7854 90 C3 00 00 */ stw r6, 0(r3) - /* 801DBBF8 001D7858 7C 68 FA 14 */ add r3, r8, r31 - /* 801DBBFC 001D785C 90 A6 00 00 */ stw r5, 0(r6) - /* 801DBC00 001D7860 7C 86 F9 2E */ stwx r4, r6, r31 - /* 801DBC04 001D7864 7D 05 F9 2E */ stwx r8, r5, r31 - /* 801DBC08 001D7868 7C 64 F9 2E */ stwx r3, r4, r31 - /* 801DBC0C 001D786C 42 00 FF BC */ bdnz lbl_801DBBC8 - lbl_801DBC10: - /* 801DBC10 001D7870 7C 07 F0 50 */ subf r0, r7, r30 - /* 801DBC14 001D7874 7C 09 03 A6 */ mtctr r0 - /* 801DBC18 001D7878 7C 07 F0 40 */ cmplw r7, r30 - /* 801DBC1C 001D787C 40 80 00 18 */ bge lbl_801DBC34 - lbl_801DBC20: - /* 801DBC20 001D7880 7C 03 FA 14 */ add r0, r3, r31 - /* 801DBC24 001D7884 7C 68 1B 78 */ mr r8, r3 - /* 801DBC28 001D7888 90 03 00 00 */ stw r0, 0(r3) - /* 801DBC2C 001D788C 7C 03 03 78 */ mr r3, r0 - /* 801DBC30 001D7890 42 00 FF F0 */ bdnz lbl_801DBC20 - lbl_801DBC34: - /* 801DBC34 001D7894 38 00 00 00 */ li r0, 0 - /* 801DBC38 001D7898 90 08 00 00 */ stw r0, 0(r8) - /* 801DBC3C 001D789C 83 E1 00 1C */ lwz r31, 0x1c(r1) - /* 801DBC40 001D78A0 83 C1 00 18 */ lwz r30, 0x18(r1) - /* 801DBC44 001D78A4 83 A1 00 14 */ lwz r29, 0x14(r1) - /* 801DBC48 001D78A8 80 01 00 24 */ lwz r0, 0x24(r1) - /* 801DBC4C 001D78AC 7C 08 03 A6 */ mtlr r0 - /* 801DBC50 001D78B0 38 21 00 20 */ addi r1, r1, 0x20 - /* 801DBC54 001D78B4 4E 80 00 20 */ blr + size_t r31; + size_t r30; + gUnkClass2 *r29; + unsigned int new_var; + int new_var2; + u8 **new_var3; + size += 7; + r30 = size & (~0x3); + new_var = r30; + r31 = new_var; + r30 = nodes; + r29 = p1; + p1->unk8 = nodes; + new_var2 = nodes + 1; + p1->unkC = r31; + u8 *data = (u8 *) func_801DAD98(new_var2 * r31); + r29->unk10 = data; + r29->unk18 = (gUnkClass3 *) data; + r29->unk14 = data + (r30 * r31); + u8 *curr = data; + u8 *next; + size_t i; + new_var3 = &next; + gUnkClass3 *r8 = 0; + for (i = 0; i < r30; i++) + { + next = curr + r31; + r8 = (gUnkClass3 *) curr; + ((gUnkClass3 *) curr)->unk0 = (gUnkClass3 *) (*new_var3); + curr = *new_var3; + } + + r8->unk0 = 0; } -#pragma peephole on -#endif // allocate a linked list node from the free store gUnkClass1* func_801DBC58(gUnkClass2* p1) @@ -186,5 +108,4 @@ gUnkClass2* func_801DBD74(u32 nodes, u32 size) return r31; } - } -- cgit v1.2.3 From 813f6a67a079e00b4003952e612bd7177f707fc6 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 23 Oct 2020 23:22:36 -0400 Subject: cleanup --- src/code_801DBB3C.cpp | 73 ++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 45 deletions(-) (limited to 'src/code_801DBB3C.cpp') diff --git a/src/code_801DBB3C.cpp b/src/code_801DBB3C.cpp index 8e10633..5037b5a 100644 --- a/src/code_801DBB3C.cpp +++ b/src/code_801DBB3C.cpp @@ -5,67 +5,53 @@ #include "code_801DB040.h" #include "code_801DBB3C.h" -// array of free stores +static u32 func_801DBB3C(void); +static void func_801DBB44(u32); +static void func_801DBB48(gUnkClass2 *p1, size_t nodes, size_t size); + static gUnkClass2 gUnk80491470[32]; static ctorStruct gUnk8063F310(1, 4, 0); + extern "C" { -//static -u32 func_801DBB3C(void) + +static u32 func_801DBB3C(void) { return 0; } -//static -void func_801DBB44(u32) +static void func_801DBB44(u32) { } -//static -void func_801DBB48(gUnkClass2 *p1, size_t nodes, size_t size) +static void func_801DBB48(gUnkClass2 *p1, size_t nodes, size_t size) { - size_t r31; - size_t r30; - gUnkClass2 *r29; - unsigned int new_var; - int new_var2; - u8 **new_var3; - size += 7; - r30 = size & (~0x3); - new_var = r30; - r31 = new_var; - r30 = nodes; - r29 = p1; - p1->unk8 = nodes; - new_var2 = nodes + 1; - p1->unkC = r31; - u8 *data = (u8 *) func_801DAD98(new_var2 * r31); - r29->unk10 = data; - r29->unk18 = (gUnkClass3 *) data; - r29->unk14 = data + (r30 * r31); - u8 *curr = data; - u8 *next; - size_t i; - new_var3 = &next; - gUnkClass3 *r8 = 0; - for (i = 0; i < r30; i++) - { - next = curr + r31; - r8 = (gUnkClass3 *) curr; - ((gUnkClass3 *) curr)->unk0 = (gUnkClass3 *) (*new_var3); - curr = *new_var3; - } - - r8->unk0 = 0; + size_t blockSize = (size+7) & ~0x3; + p1->unk8 = nodes; + p1->unkC = blockSize; + u8* data = (u8*)func_801DAD98((nodes + 1) * blockSize); + p1->unk10 = data; + p1->unk18 = (gUnkClass3*)data; + p1->unk14 = data + (nodes * blockSize); + u8* next; + u8** pnext = &next; + size_t i; + gUnkClass3* r8 = NULL; + for (i = 0; i < nodes; i++) { + *pnext = data + blockSize; + r8 = (gUnkClass3*)data; + ((gUnkClass3*)data)->unk0 = (gUnkClass3*)(*pnext); + data = *pnext; + } + r8->unk0 = 0; } -// allocate a linked list node from the free store gUnkClass1* func_801DBC58(gUnkClass2* p1) { gUnkClass3* r31 = p1->unk18; u32 r30 = func_801DBB3C(); func_801DBB44(0); if (r31) { - p1->unk18 = r31->unk0; // point unk18 to possible next free block? + p1->unk18 = r31->unk0; goto passCheck; } func_801DBB44(r30); @@ -78,8 +64,6 @@ passCheck: return &r31->unk4; } -// return node p2 to free store p1, making it the new head of the -// free node linked list void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2) { u32 r31; @@ -94,7 +78,6 @@ void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2) } } -// allocate the free store given number of elements and size of each? gUnkClass2* func_801DBD74(u32 nodes, u32 size) { size_t i; -- cgit v1.2.3