Merge c3668d02d4 into 4abd0fe720

.github/workflows/validate.yml

@@ -246,9 +246,11 @@ jobs:
           # remove LLVM from PATH so it doesn't overshadow the one provided by VS
           $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
 
-          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fexceptions -Xclang -fcxx-exceptions"
+          cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
           cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j $cpuCores
         env:
+          CXXFLAGS: --target=amd64-pc-windows-msvc -fdiagnostics-absolute-paths
+          CFLAGS: --target=amd64-pc-windows-msvc -fdiagnostics-absolute-paths
           SDL2_VERSION: ${{ inputs.SDL2_VERSION }}
       - name: Prepare Archive
         run: |

.gitignore

@@ -57,6 +57,7 @@ node_modules/
 
 # Recompiler Linux binary
 N64Recomp
+RSPRecomp
 .DS_Store
 
 # Controller mappings file

lib/N64ModernRuntime

@@ -1 +1 @@
-Subproject commit 0c1811ca6f8291c6608f1d6626a73e863902ece9
+Subproject commit ce68e96c171f7f036e29f539e22a604da04af824

src/main/main.cpp

@@ -341,6 +341,89 @@ std::vector<recomp::GameEntry> supported_games = {
     },
 };
 
+// TODO: move somewhere else
+namespace zelda64 {
+    std::string get_game_thread_name(const OSThread* t) {
+        std::string name = "[Game] ";
+
+        switch (t->id) {
+            case 0:
+                switch (t->priority) {
+                    case 150:
+                        name += "PIMGR";
+                        break;
+
+                    case 254:
+                        name += "VIMGR";
+                        break;
+
+                    default:
+                        name += std::to_string(t->id);
+                        break;
+                }
+                break;
+
+            case 1:
+                name += "IDLE";
+                break;
+
+            case 2:
+                switch (t->priority) {
+                    case 5:
+                        name += "SLOWLY";
+                        break;
+
+                    case 127:
+                        name += "FAULT";
+                        break;
+
+                    default:
+                        name += std::to_string(t->id);
+                        break;
+                }
+                break;
+
+            case 3:
+                name += "MAIN";
+                break;
+
+            case 4:
+                name += "GRAPH";
+                break;
+
+            case 5:
+                name += "SCHED";
+                break;
+
+            case 7:
+                name += "PADMGR";
+                break;
+
+            case 10:
+                name += "AUDIOMGR";
+                break;
+
+            case 13:
+                name += "FLASHROM";
+                break;
+
+            case 18:
+                name += "DMAMGR";
+                break;
+
+            case 19:
+                name += "IRQMGR";
+                break;
+
+            default:
+                name += std::to_string(t->id);
+                break;
+        }
+
+        return name;
+    }
+}
+
 
 int main(int argc, char** argv) {
 
@@ -425,7 +508,21 @@ int main(int argc, char** argv) {
         .message_box = recompui::message_box,
     };
 
-    recomp::start({}, rsp_callbacks, renderer_callbacks, audio_callbacks, input_callbacks, gfx_callbacks, thread_callbacks, error_handling_callbacks);
+    ultramodern::threads::callbacks_t threads_callbacks{
+        .get_game_thread_name = zelda64::get_game_thread_name,
+    };
+
+    recomp::start(
+        {},
+        rsp_callbacks,
+        renderer_callbacks,
+        audio_callbacks,
+        input_callbacks,
+        gfx_callbacks,
+        thread_callbacks,
+        error_handling_callbacks,
+        threads_callbacks
+    );
 
     NFD_Quit();