Unlink non-matching files in configure.py (doldecomp#1099)

BR- · Jan 24, 2024 · fb559cd · fb559cd
1 parent f971dee
commit fb559cd
Show file tree

Hide file tree

Showing 9 changed files with 229 additions and 227 deletions.
diff --git a/compile_flags.txt b/compile_flags.txt
@@ -3,6 +3,7 @@
 -fno-short-enums
 -std=c99
 -nostdinc
+-DBUGFIX
 -Isrc/melee
 -Isrc/melee/ft/chara
 -isystemsrc

diff --git a/config/GALE01/splits.txt b/config/GALE01/splits.txt
@@ -1,16 +1,16 @@
 Sections:
-	.init       type:code align:8
-	extab       type:rodata align:8
-	extabindex  type:rodata align:8
-	.text       type:code align:8
-	.ctors      type:rodata align:8
-	.dtors      type:rodata align:8
-	.rodata     type:rodata align:8
-	.data       type:data align:8
-	.bss        type:bss align:8
-	.sdata      type:data align:8
-	.sbss       type:bss align:8
-	.sdata2     type:rodata align:8
+	.init       type:code align:32
+	extab       type:rodata align:32
+	extabindex  type:rodata align:32
+	.text       type:code align:32
+	.ctors      type:rodata align:32
+	.dtors      type:rodata align:32
+	.rodata     type:rodata align:32
+	.data       type:data align:32
+	.bss        type:bss align:32
+	.sdata      type:data align:32
+	.sbss       type:bss align:32
+	.sdata2     type:rodata align:32
 
 melee/lb/lbcommand.c:
 	.text       start:0x80005940 end:0x80005BB0

diff --git a/configure.py b/configure.py
diff --git a/src/dolphin/os/OSAlloc.c b/src/dolphin/os/OSAlloc.c
@@ -262,7 +262,7 @@ size_t OSCheckHeap(OSHeapHandle heap)
     return totalFree;
 }
 
-#ifdef MUST_MATCH
+#if defined(MUST_MATCH) || !defined(BUGFIX)
 #pragma push
 #pragma force_active on
 static char _unused_str0[] = "\nOSDumpHeap(%d):\n";

diff --git a/src/melee/lb/lb_00B0.c b/src/melee/lb/lb_00B0.c
@@ -1041,7 +1041,7 @@ HSD_LObj* lb_8000CDC0(HSD_LObj* cur)
         }
         cur = lobj_next(cur);
     }
-#ifndef MUST_MATCH
+#ifdef BUGFIX
     return NULL;
 #endif
 }

diff --git a/src/sysdolphin/baselib/cobj.c b/src/sysdolphin/baselib/cobj.c
@@ -1147,7 +1147,7 @@ float HSD_CObjGetEyeDistance(HSD_CObj* cobj)
     return PSVECMag(&look_vector);
 }
 
-#ifdef MUST_MATCH
+#if defined(MUST_MATCH) || !defined(BUGFIX)
 #pragma push
 #pragma force_active on
 static float unused1[] = {

diff --git a/src/sysdolphin/baselib/debug.h b/src/sysdolphin/baselib/debug.h
@@ -17,7 +17,7 @@ ATTRIBUTE_NORETURN void HSD_Panic(char*, u32, char*);
 
 /// @todo Take @c file as another arg, ignore it if @c !MUST_MATCH.
 /// @todo Add another variant that takes a string for @c cond.
-#ifdef MUST_MATCH
+#if defined(MUST_MATCH) || !defined(BUGFIX)
 #define HSD_ASSERT(line, cond)                                                \
     ((cond) ? ((void) 0) : __assert(__FILE__, line, #cond))
 #else

diff --git a/src/sysdolphin/baselib/mobj.c b/src/sysdolphin/baselib/mobj.c
@@ -376,7 +376,7 @@ void HSD_MObjCompileTev(HSD_MObj* mobj)
     }
 }
 
-#ifdef MUST_MATCH
+#if defined(MUST_MATCH) || !defined(BUGFIX)
 #pragma push
 #pragma force_active on
 static char unused1[] = "hsdIsDescendantOf(info, &hsdMObj)";
@@ -521,7 +521,7 @@ void HSD_MObjAddShadowTexture(HSD_TObj* tobj)
     tobj_shadows = tobj;
 }
 
-#ifdef MUST_MATCH
+#if defined(MUST_MATCH) || !defined(BUGFIX)
 #pragma push
 #pragma force_active on
 static char unused2[] = "mobj->rendermode&RENDER_SPECULAR";

diff --git a/src/sysdolphin/baselib/tev.c b/src/sysdolphin/baselib/tev.c
@@ -29,9 +29,9 @@ static struct {
 
 void HSD_RenderInitAllocData(void)
 {
-    HSD_ObjAllocInit(&render_alloc_data, 0x1C, 4);
-    HSD_ObjAllocInit(&tevreg_alloc_data, 0x14, 4);
-    HSD_ObjAllocInit(&chan_alloc_data, 0x30, 4);
+    HSD_ObjAllocInit(&render_alloc_data, 28, 4);
+    HSD_ObjAllocInit(&tevreg_alloc_data, 20, 4);
+    HSD_ObjAllocInit(&chan_alloc_data, 48, 4);
 }
 
 HSD_ObjAllocData* HSD_RenderGetAllocData(void)
@@ -49,7 +49,7 @@ HSD_ObjAllocData* HSD_ChanGetAllocData(void)
     return &chan_alloc_data;
 }
 
-#ifdef MWERKS_GEKKO
+#if defined(MUST_MATCH) && !defined(WIP)
 
 #pragma push
 asm void HSD_SetupChannel(HSD_Chan* ch)
@@ -413,7 +413,7 @@ int HSD_Channel2Num(int chan)
     case 0xFF:
         return 0;
     default:
-        __assert(__FILE__, 0x290, "0");
+        HSD_ASSERT(656, 0);
         return 0;
     }
 }
@@ -454,7 +454,7 @@ int HSD_Index2TevStage(int idx)
     case 15:
         return 15;
     default:
-        __assert(__FILE__, 0x2C5, "0");
+        HSD_ASSERT(709, 0);
         return 15;
     }
 }
@@ -499,7 +499,7 @@ int HSD_TevStage2Index(int stage)
     case 15:
         return 15;
     default:
-        __assert(__FILE__, 0x2FA, "0");
+        HSD_ASSERT(762, 0);
         return 0;
     }
 }
@@ -543,7 +543,7 @@ int HSD_TevStage2Num(int stage)
     case 15:
         return 16;
     default:
-        __assert(__FILE__, 0x319, "0");
+        HSD_ASSERT(793, 0);
         return 0;
     }
 }
@@ -599,7 +599,7 @@ int HSD_TexCoordID2Num(int id)
     case 0xFF:
         return 0;
     default:
-        __assert(__FILE__, 0x3F2, "0");
+        HSD_ASSERT(1010, 0);
         return 0;
     }
 }