doldecomp · ribbanya · Sep 29, 2024 · Sep 29, 2024 · Sep 29, 2024 · Sep 29, 2024
diff --git a/.clang-format b/.clang-format
@@ -27,11 +27,11 @@ WhitespaceSensitiveMacros:
   - 'CHECK'
 IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^".*?__static\.h"$'
-    Priority: -2
-    SortPriority: 0
   - Regex: '^<platform\.h>$'
-    Priority: -1
+    Priority: -2
+    SortPriority: -7
+  - Regex: '^<placeholder\.h>$'
+    Priority: -2
     SortPriority: -6
   - Regex: '^"forward\.h"$'
     Priority: -1
@@ -45,6 +45,9 @@ IncludeCategories:
   - Regex: '^<(sysdolphin/)?baselib(/.*)?/forward\.h>$'
     Priority: -1
     SortPriority: -1
+  - Regex: '^".*\.static\.h"$'
+    Priority: 0
+    SortPriority: -1
   - Regex: '^<(.*/)?forward\.h>$'
     Priority: -1
     SortPriority: -3

diff --git a/configure.py b/configure.py
@@ -17,15 +17,8 @@
 from pathlib import Path
 from typing import Iterator, List, Optional
 
-from tools.project import (
-    Library,
-    Object,
-    ProgressCategory,
-    ProjectConfig,
-    calculate_progress,
-    generate_build,
-    is_windows,
-)
+from tools.project import (Library, Object, ProgressCategory, ProjectConfig,
+                           calculate_progress, generate_build, is_windows)
 
 # Game versions
 DEFAULT_VERSION = 0
@@ -253,6 +246,21 @@
     "-inline auto",
 ]
 
+# MetroTRK flags
+cflags_trk = [
+    *cflags_base,
+    "-use_lmw_stmw on",
+    "-str reuse,pool,readonly",
+    "-common off",
+    "-sdata 0",
+    "-sdata2 0",
+    "-fp hard",
+    "-enum int",
+    "-char unsigned",
+    "-inline deferred",
+    "-rostr",
+]
+
 includes_base = ["src"]
 
 system_includes_base = [
@@ -393,6 +401,16 @@ def RuntimeLib(lib_name: str, objects: Objects) -> Library:
     )
 
 
+def TRKLib(lib_name: str, objects: Objects) -> Library:
+    return Lib(
+        lib_name,
+        objects,
+        cflags=cflags_trk,
+        fix_epilogue=False,
+        category="runtime",
+    )
+
+
 Matching = True  # Object matches and should be linked
 NonMatching = False  # Object does not match and should not be linked
 Equivalent = (
@@ -1206,7 +1224,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> Library:
             Object(NonMatching, "MSL/math.c"),
         ],
     ),
-    RuntimeLib(
+    TRKLib(
         "MetroTRK (Metrowerks Target Resident Kernel)",
         [
             Object(NonMatching, "MetroTRK/mainloop.c"),

diff --git a/src/MSL/buffer_io.c b/src/MSL/buffer_io.c
@@ -7,7 +7,7 @@ s32 __flush_buffer(BufferIoUnkStruct* arg0, s32* arg1)
     temp_r0 = arg0->x20 - arg0->x18;
     if (temp_r0 != 0) {
         arg0->x24 = temp_r0;
-        if (arg0->x05.bits.b4) {
+        if (arg0->x05.b4) {
             arg0 != 0;
         }
 

diff --git a/src/MSL/buffer_io.h b/src/MSL/buffer_io.h
@@ -13,7 +13,7 @@ typedef struct _BufferIoUnkFlagStruct {
         u8 b5 : 1;
         u8 b6 : 1;
         u8 b7 : 1;
-    } bits;
+    };
 } BufferIoUnkFlagStruct;
 
 typedef struct _BufferIoUnkStruct {

diff --git a/src/MSL/printf.h b/src/MSL/printf.h
@@ -2,6 +2,7 @@
 #define GALE01_323CF0
 
 #include <placeholder.h>
+
 #include <stdarg.h>
 
 /* 323CF0 */ UNK_RET __stdio_atexit(UNK_PARAMS);

diff --git a/src/MetroTRK/dispatch.c b/src/MetroTRK/dispatch.c
@@ -1 +1,11 @@
+#include "dispatch.h"
 
+#include <MetroTRK/nubinit.h>
+
+enum_t TRKInitializeDispatcher(void)
+{
+    MTRK_NubInit_804A4B40 = 32;
+    return 0;
+}
+
+/// #TRKDispatchMessage
diff --git a/src/MetroTRK/dispatch.h b/src/MetroTRK/dispatch.h
@@ -1 +1,9 @@
+#ifndef GALE01_3276A8
+#define GALE01_3276A8
 
+#include <placeholder.h>
+
+/* 3276A8 */ enum_t TRKInitializeDispatcher(void);
+/* 3276BC */ UNK_RET TRKDispatchMessage(UNK_PARAMS);
+
+#endif
diff --git a/src/MetroTRK/nubinit.c b/src/MetroTRK/nubinit.c
@@ -1 +1,11 @@
+#include "nubinit.h"
 
+/* 4A4B40 */ size_t MTRK_NubInit_804A4B40;
+
+/// #TRKInitializeNub
+
+/// #TRKTerminateNub
+
+/// #TRKNubWelcome
+
+/// #TRKInitializeEndian
diff --git a/src/MetroTRK/nubinit.h b/src/MetroTRK/nubinit.h
@@ -1 +1,12 @@
+#ifndef GALE01_326AD8
+#define GALE01_326AD8
 
+#include <placeholder.h>
+
+/* 326AD8 */ UNK_RET TRKInitializeNub(UNK_PARAMS);
+/* 326BAC */ UNK_RET TRKTerminateNub(UNK_PARAMS);
+/* 326BD0 */ UNK_RET TRKNubWelcome(UNK_PARAMS);
+/* 326BF8 */ UNK_RET TRKInitializeEndian(UNK_PARAMS);
+/* 4A4B40 */ extern size_t MTRK_NubInit_804A4B40;
+
+#endif
diff --git a/src/MetroTRK/targimpl.c b/src/MetroTRK/targimpl.c
@@ -1,7 +1,7 @@
-#include "targimpl.h"
-
 #include <placeholder.h>
 
+#include "targimpl.h"
+
 int __TRK_get_MSR(void)
 {
 #ifdef MWERKS_GEKKO

diff --git a/src/Runtime/Gecko_setjmp.c b/src/Runtime/Gecko_setjmp.c
@@ -1,7 +1,7 @@
 #include <platform.h>
+#include <placeholder.h>
 
 #include <Gecko_setjmp.h>
-#include <placeholder.h>
 
 #ifdef MWERKS_GEKKO
 asm int __setjmp(register __jmp_buf* env)

diff --git a/src/Runtime/__init_cpp_exceptions.c b/src/Runtime/__init_cpp_exceptions.c
@@ -1,8 +1,8 @@
 #include <platform.h>
+#include <placeholder.h>
 
 #include <__init_cpp_exceptions.h>
 #include <Gecko_ExceptionPPC.h>
-#include <placeholder.h>
 
 static int fragmentID = -2;
 

diff --git a/src/Runtime/__va_arg.c b/src/Runtime/__va_arg.c
@@ -1,4 +1,5 @@
 #include <placeholder.h>
+
 #include <stdarg.h>
 
 #ifdef __MWERKS__

diff --git a/src/common_structs.h b/src/common_structs.h
@@ -4,6 +4,7 @@
 #define _common_structs_h_
 
 #include <platform.h>
+
 #include <dolphin/gx/forward.h>
 
 #include <dolphin/gx/types.h>
@@ -62,7 +63,7 @@ typedef u32 HSD_Pad;
 #define MPCOLL_FLAGS_B24 (1 << 24)
 #define MPCOLL_FLAGS_B25 (1 << 25)
 
-typedef union _UnkFlagStruct {
+typedef union UnkFlagStruct {
     u8 u8;
     struct {
         u8 b0 : 1;
@@ -73,7 +74,7 @@ typedef union _UnkFlagStruct {
         u8 b5 : 1;
         u8 b6 : 1;
         u8 b7 : 1;
-    } bits;
+    };
 } UnkFlagStruct;
 
 typedef struct ColorOverlay {

diff --git a/src/dolphin/ai/ai.c b/src/dolphin/ai/ai.c
@@ -1,4 +1,5 @@
 #include <placeholder.h>
+
 #include <dolphin/ai/ai.h>
 #include <dolphin/dsp/dsp.h>
 #include <dolphin/os/OSContext.h>

diff --git a/src/dolphin/ax/AXSPB.h b/src/dolphin/ax/AXSPB.h
@@ -2,6 +2,7 @@
 #define GALE01_359D8C
 
 #include <placeholder.h>
+
 #include <dolphin/ax.h>
 
 /* 359D8C */ AXSPB* __AXGetStudio(void);

diff --git a/src/dolphin/ax/AXVPB.h b/src/dolphin/ax/AXVPB.h
@@ -2,8 +2,8 @@
 #define GALE01_35A250
 
 #include <platform.h>
-
 #include <placeholder.h>
+
 #include <dolphin/ax.h>
 
 /* 35A250 */ u32 __AXGetNumVoices(void);

diff --git a/src/dolphin/base/PPCArch.c b/src/dolphin/base/PPCArch.c
@@ -1,4 +1,5 @@
 #include <placeholder.h>
+
 #include <dolphin/base/PPCArch.h>
 
 #ifdef MWERKS_GEKKO

diff --git a/src/dolphin/card.h b/src/dolphin/card.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/dsp/dsp.h>

diff --git a/src/dolphin/card/CARDBios.h b/src/dolphin/card/CARDBios.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDBIOS_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDBlock.h b/src/dolphin/card/CARDBlock.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDBLOCK_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDCheck.h b/src/dolphin/card/CARDCheck.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDCHECK_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDCreate.h b/src/dolphin/card/CARDCreate.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDCREATE_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 s32 CARDCreateAsync(s32 chan, const char* fileName, u32 size,

diff --git a/src/dolphin/card/CARDDelete.h b/src/dolphin/card/CARDDelete.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDDELETE_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 s32 CARDFastDeleteAsync(s32 chan, s32 fileNo, CARDCallback callback);

diff --git a/src/dolphin/card/CARDDir.h b/src/dolphin/card/CARDDir.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDDIR_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDFormat.h b/src/dolphin/card/CARDFormat.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDFORMAT_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 void FormatCallback(s32 chan, s32 result);

diff --git a/src/dolphin/card/CARDMount.h b/src/dolphin/card/CARDMount.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDMOUNT_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/os.h>

diff --git a/src/dolphin/card/CARDOpen.h b/src/dolphin/card/CARDOpen.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDOPEN_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDRdwr.h b/src/dolphin/card/CARDRdwr.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDRDWR_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDRead.h b/src/dolphin/card/CARDRead.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDREAD_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 #include <dolphin/card.h>

diff --git a/src/dolphin/card/CARDRename.h b/src/dolphin/card/CARDRename.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDRENAME_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 s32 CARDRenameAsync(s32 chan, const char* old, const char* new,

diff --git a/src/dolphin/card/CARDStat.h b/src/dolphin/card/CARDStat.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDSTAT_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 s32 CARDGetStatus(s32 chan, s32 fileNo, CARDStat* stat);

diff --git a/src/dolphin/card/CARDWrite.h b/src/dolphin/card/CARDWrite.h
@@ -2,6 +2,7 @@
 #define DOLPHIN_CARD_CARDWRITE_H
 
 #include <platform.h>
+
 #include <dolphin/card/forward.h>
 
 s32 CARDWriteAsync(CARDFileInfo* fileInfo, const void* buf, u32 length,

diff --git a/src/dolphin/db/db.c b/src/dolphin/db/db.c
@@ -1,4 +1,5 @@
 #include <placeholder.h>
+
 #include <dolphin/base/PPCArch.h>
 #include <dolphin/db/db.h>
 #include <dolphin/os.h>

diff --git a/src/dolphin/dvd/dvd.h b/src/dolphin/dvd/dvd.h
@@ -2,6 +2,7 @@
 #define __DOLPHIN_DVD_H_
 
 #include <platform.h>
+
 #include <dolphin/dvd/forward.h>
 
 #include <dolphin/os/OSThread.h>

diff --git a/src/dolphin/dvd/dvdfs.c b/src/dolphin/dvd/dvdfs.c
@@ -1,4 +1,5 @@
 #include <platform.h>
+
 #include <dolphin/dvd/forward.h>
 
 #include <dolphin/dvd/dvd.h>