From 5ba0f4b6ea4e02ba406018a74a9fff4b7a0dd9ad Mon Sep 17 00:00:00 2001
From: Max <mparisi@stevens.edu>
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/code_801DB81C.cpp')

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