Merge branch 'main' of https://github.com/TakaRikka/dusk

CMakeLists.txt

@@ -113,8 +113,7 @@ target_include_directories(game_debug PUBLIC
         build/${DUSK_TP_VERSION}/include)
 target_link_libraries(game_debug PUBLIC aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd aurora::card freeverb)
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-add_library(game SHARED ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${SSYSTEM_FILES} ${JSYSTEM_FILES} ${REL_FILES} ${DUSK_FILES} ${DOLPHIN_FILES}
+add_library(game STATIC ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${SSYSTEM_FILES} ${JSYSTEM_FILES} ${REL_FILES} ${DUSK_FILES} ${DOLPHIN_FILES}
         src/dusk/imgui/ImGuiStubLog.cpp
         src/dusk/imgui/ImGuiAudio.cpp)
 
@@ -145,7 +144,7 @@ add_custom_command(TARGET dusk POST_BUILD
 )
 
 include(extern/aurora/cmake/AuroraCopyRuntimeDLLs.cmake)
-aurora_copy_runtime_dlls(dusk game)
+aurora_copy_runtime_dlls(dusk)
 
 if (DUSK_SELECTED_OPT)
     if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
@@ -156,4 +155,5 @@ if (DUSK_SELECTED_OPT)
 
     target_compile_options(xxhash PRIVATE ${_opt_flags})
     target_compile_options(aurora_gx PRIVATE ${_opt_flags})
+    target_compile_options(freeverb PRIVATE ${_opt_flags})
 endif ()

src/d/actor/d_a_obj_brg.cpp

@@ -590,8 +590,6 @@ static void cut_control2(obj_brg_class* i_this, br_s* i_part) {
 }
 
 static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2) {
-    STUB_RET();
-
     cXyz sp74 = {};
     cXyz sp80 = {};
     cXyz sp8C = {};

src/d/d_kankyo.cpp

@@ -9696,7 +9696,7 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
         f32 var_f31;
 
         #if AVOID_UB
-        var_f31 = 0;
+        var_f31 = 100000000.0f;
         #endif
 
         if (dKy_SunMoon_Light_Check() == TRUE && i <= 1) {

src/dusk/OSContext.cpp

@@ -35,16 +35,6 @@ void OSInitContext(OSContext* context, u32 pc, u32 newsp) {
     context->gpr[1] = newsp;
 }
 
-u32 OSSaveContext(OSContext* context) {
-    // On PC we don't save PowerPC registers.
-    // Return 0 = "context was just saved" (as opposed to 1 = "restored from save").
-    return 0;
-}
-
-void OSLoadContext(OSContext* context) {
-    // No-op on PC (no PowerPC register restore)
-}
-
 void OSDumpContext(OSContext* context) {
     if (!context) {
         OSReport("[PC] OSDumpContext: NULL context\n");
@@ -66,20 +56,15 @@ void OSSaveFPUContext(OSContext* fpucontext) {
 }
 
 u32 OSGetStackPointer(void) {
-    // Return approximate stack pointer
-    volatile u32 dummy;
-    return (u32)(uintptr_t)&dummy;
+    return 0;
 }
 
 u32 OSSwitchStack(u32 newsp) {
-    // Not meaningful on PC - return current sp
-    return OSGetStackPointer();
+    abort();
 }
 
 int OSSwitchFiber(u32 pc, u32 newsp) {
-    // Not meaningful on PC
-    OSReport("[PC] OSSwitchFiber: not supported on PC\n");
-    return 0;
+    abort();
 }
 
 void __OSContextInit(void) {

src/dusk/imgui/ImGuiHeapOverlay.cpp

@@ -241,7 +241,7 @@ namespace dusk {
                     }
 
                     char bufId[32];
-                    snprintf(bufId, sizeof(bufId), "%p", block);
+                    snprintf(bufId, sizeof(bufId), "%p", block.block);
                     ImGui::PushID(bufId);
                     ImGui::TableNextColumn();
                     ImGui::Text("%08X", (u32)((uintptr_t)block.block - (uintptr_t)expHeap->getStartAddr()));

src/dusk/imgui/ImGuiMenuEnhancements.cpp

@@ -124,6 +124,8 @@ namespace dusk {
 
                 ImGui::EndMenu();
             }
+
+            ImGui::EndMenu();
         }
     }
 }

src/dusk/stubs.cpp

@@ -1062,22 +1062,15 @@ extern "C" void KPADEnableDPD(s32) {
 void LCDisable(void) {
     STUB_LOG();
 }
-void LCQueueWait(__REGISTER u32 len) {
-    STUB_LOG();
-}
-u32 LCStoreData(void* destAddr, void* srcAddr, u32 nBytes) {
-    STUB_LOG();
-    return 0;
-}
 
 #pragma mark PPC Arch
 // MSR stuff?
 void PPCHalt() {
-    STUB_LOG();
+    abort();
 }
 
 extern "C" void PPCSync(void) {
-    STUB_LOG();
+    // Does nothing on PC
 }
 
 u32 PPCMfhid2() {