wraper for functions that break ABI (#230)

Author: mateusfavarin

include/ctr/test.h

@@ -8,6 +8,7 @@
 #include <ctr/rng.h>
 #include <ctr/coll.h>
 
+void TEST_WRAPPER();
 void LoadTestPatches();
 u32 PatchFunction_Beg(u32* index);
 void PatchFunction_End(u32 index);

rewrite/scripts/codeflow/output.txt

@@ -106,27 +106,27 @@ main()
               ND_COLL_FIXED_TRIANGL_GetNormVec()
               ND_COLL_FIXED_TRIANGL_GetNormVec()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
+              ND_COLL_BarycentricTest()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
-                ND_COLL_FIXED_TRIANGL_Barycentrics()
+              ND_COLL_BarycentricTest()
+                ND_COLL_ProjectPointToEdge()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
-                ND_COLL_FIXED_TRIANGL_Barycentrics()
+              ND_COLL_BarycentricTest()
+                ND_COLL_ProjectPointToEdge()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
-                ND_COLL_FIXED_TRIANGL_Barycentrics()
+              ND_COLL_BarycentricTest()
+                ND_COLL_ProjectPointToEdge()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
+              ND_COLL_BarycentricTest()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
-                ND_COLL_FIXED_TRIANGL_Barycentrics()
+              ND_COLL_BarycentricTest()
+                ND_COLL_ProjectPointToEdge()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
-                ND_COLL_FIXED_TRIANGL_Barycentrics()
+              ND_COLL_BarycentricTest()
+                ND_COLL_ProjectPointToEdge()
             ND_COLL_MOVED_TRIANGL_TestPoint()
-              FUN_8001f928()
-                ND_COLL_FIXED_TRIANGL_Barycentrics()
+              ND_COLL_BarycentricTest()
+                ND_COLL_ProjectPointToEdge()
           ND_COLL_MOVED_QUADBLK_TestTriangles()
           ND_COLL_FIXED_BSPLEAF_TestInstance()
       FUN_80020334()

rewrite/src/exe/coll.c

@@ -36,6 +36,12 @@ void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const
     out->y = coords.y;
     out->z = coords.z;
     TEST_COLL_ProjectPointToEdge(v1, v2, point, out);
+#ifdef TEST_COLL_IMPL
+    __asm__ volatile("move $a0, %0" : : "r"((u32)out));
+    __asm__ volatile("move $a1, %0" : : "r"((u32)v1));
+    __asm__ volatile("move $a2, %0" : : "r"((u32)v2));
+    __asm__ volatile("move $a3, %0" : : "r"((u32)point));
+#endif
 }
 
 /* Address: 0x8001f928 */

rewrite/src/tests/test.c

@@ -50,6 +50,9 @@ void LoadTestPatches()
 
 u32 PatchFunction_Beg(u32* address)
 {
+    u32 addr = (u32)address;
+    __asm__ volatile("move $k1, %0" : : "r"(addr));
+
     u32 index = 0;
     const u32 funcCount = ARR_LEN(s_functions);
     for (u32 i = 0; i < funcCount; i++)

rewrite/src/tests/test_coll.c

@@ -6,17 +6,20 @@ void TEST_COLL_ProjectPointToEdge(const SVec3* v1, const SVec3* v2, const SVec3*
 {
     const u32 index = PatchFunction_Beg((u32*)(&ND_COLL_ProjectPointToEdge));
     SVec3 expected;
-    ND_COLL_ProjectPointToEdge(&expected, v1, v2, point);
+    typedef void (*Func)(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
+    Func func = (Func) TEST_WRAPPER;
+    func(&expected, v1, v2, point);
     PrintSVectorDiff("COLL_ProjectPointToEdge", &expected, ret);
     PatchFunction_End(index);
 }
 
-s32 WRAPPER_ND_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
 
 void TEST_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3, const SVec3* pos, s32 ret)
 {
     const u32 index = PatchFunction_Beg((u32*)(&ND_COLL_BarycentricTest));
-    const s32 expected = WRAPPER_ND_COLL_BarycentricTest(t, v1, v2, v3);
+    typedef s32 (*Func)(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
+    Func func = (Func) TEST_WRAPPER;
+    const s32 expected = func(t, v1, v2, v3);
     PrintSVectorDiff("COLL_BarycentricTest", &t->pos, pos);
     if (expected != ret) { ND_printf("[COLL_BarycentricTest] Test Failed:\nExpected: %d\nResult: %d\n", expected, ret); }
     PatchFunction_End(index);

rewrite/src/tests/test_wrappers.s

@@ -1,7 +1,8 @@
 .set noreorder
+.set noat
 .align 2
 .macro SAVE_CONTEXT
-    addiu  $sp, $sp, -44
+    addiu  $sp, $sp, -48
     sw     $s0, 0($sp)
     sw     $s1, 4($sp)
     sw     $s2, 8($sp)
@@ -12,11 +13,13 @@
     sw     $s7, 28($sp)
     sw     $fp, 32($sp)
     sw     $gp, 36($sp)
-    sw     $ra, 40($sp)
+    sw     $at, 40($sp)
+    sw     $ra, 44($sp)
 .endm
 
 .macro RESTORE_CONTEXT
-    lw     $ra, 40($sp)
+    lw     $ra, 44($sp)
+    lw     $at, 40($sp)
     lw     $gp, 36($sp)
     lw     $fp, 32($sp)
     lw     $s7, 28($sp)
@@ -27,14 +30,14 @@
     lw     $s2, 8($sp)
     lw     $s1, 4($sp)
     lw     $s0, 0($sp)
-    addiu  $sp, $sp, 44
+    addiu  $sp, $sp, 48
 .endm
 
-.global WRAPPER_ND_COLL_BarycentricTest
-.type WRAPPER_ND_COLL_BarycentricTest, @function
-WRAPPER_ND_COLL_BarycentricTest:
+.global TEST_WRAPPER
+.type TEST_WRAPPER, @function
+TEST_WRAPPER:
     SAVE_CONTEXT
-    jal    ND_COLL_BarycentricTest
+    jalr   $k1
     nop
     RESTORE_CONTEXT
     jr     $ra