Shorten int Change

- Fix some overflows with instant death mode

CMakeLists.txt

@@ -91,7 +91,7 @@ option(DUSK_SELECTED_OPT "If on, selected parts of the project will be compiled
 option(DUSK_MOVIE_SUPPORT "If on, compile against libjpeg-turbo to enable THP file decoding" ON)
 option(DUSK_PACKAGE_INSTALL "Install Dusklight with a Linux-native file structure" OFF)
 option(DUSK_GFX_DEBUG_GROUPS "Report debug groups to the native graphics API" ${DUSK_GFX_DEBUG_GROUPS_DEFAULT})
-option(DUSK_ENABLE_CODE_MODS "Enable code mods" ON)
+option(DUSK_ENABLE_CODE_MODS "Enable code mods" OFF)
 
 set(DUSK_HAS_FUNCHOOK OFF)
 if (DUSK_ENABLE_CODE_MODS AND (NOT APPLE OR CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
@@ -384,31 +384,20 @@ if (CMAKE_CXX_LINK_GROUP_USING_RESCAN_SUPPORTED OR CMAKE_LINK_GROUP_USING_RESCAN
     set(JSYSTEM_LINK_LIBRARIES "$<LINK_GROUP:RESCAN,${JSYSTEM_LIBRARIES}>")
 endif ()
 
-set(_dusklight_all_files src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES})
-set(DUSK_INTERNAL_FILES ${_dusklight_all_files})
-list(FILTER DUSK_INTERNAL_FILES INCLUDE REGEX "^src/dusk/")
-set(GAME_FILES ${_dusklight_all_files})
-list(FILTER GAME_FILES EXCLUDE REGEX "^src/dusk/")
-
-add_library(dusk_internal OBJECT ${DUSK_INTERNAL_FILES})
-if (ENABLE_ASAN)
-    target_sources(dusk_internal PRIVATE src/dusk/asan_options.c)
-endif ()
-target_compile_definitions(dusk_internal PRIVATE ${GAME_COMPILE_DEFS})
-target_include_directories(dusk_internal PRIVATE ${miniz_SOURCE_DIR})
-target_link_libraries(dusk_internal PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LIBRARIES})
-target_precompile_headers(dusk_internal PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
-
+set(DUSK_FILES src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES} ${miniz_SOURCE_DIR}/miniz.c)
 if(ANDROID)
-    add_library(dusklight SHARED ${GAME_FILES} ${miniz_SOURCE_DIR}/miniz.c)
+    add_library(dusklight SHARED ${DUSK_FILES})
 else ()
-    add_executable(dusklight ${GAME_FILES} ${miniz_SOURCE_DIR}/miniz.c)
+    add_executable(dusklight ${DUSK_FILES})
 endif ()
 borealis_configure_android_application(dusklight)
+if (ENABLE_ASAN)
+    target_sources(dusklight PRIVATE src/dusk/asan_options.c)
+endif ()
 
 target_compile_definitions(dusklight PRIVATE ${GAME_COMPILE_DEFS})
 target_include_directories(dusklight PRIVATE ${miniz_SOURCE_DIR})
-target_link_libraries(dusklight PRIVATE dusk_internal aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
+target_link_libraries(dusklight PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
 target_precompile_headers(dusklight PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
 
 if (DUSK_ENABLE_CODE_MODS)
@@ -424,75 +413,76 @@ endif ()
 
 # Hook reliability: prevent auto-inlining, guarantee patchable function entries,
 # and disable identical-code folding for game functions.
-if (DUSK_ENABLE_CODE_MODS)
-    set(DUSK_GAME_ABI_INLINE_OPTIONS)
-    if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
-        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-            list(APPEND DUSK_GAME_ABI_INLINE_OPTIONS
-                    $<$<COMPILE_LANGUAGE:CXX>:-finline-hint-functions>)
-        elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            list(APPEND DUSK_GAME_ABI_INLINE_OPTIONS
-                    $<$<COMPILE_LANGUAGE:CXX>:-flive-patching=inline-clone>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-inline-functions>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-inline-small-functions>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-inline-functions-called-once>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-early-inlining>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-ipa-cp>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-ipa-cp-clone>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-ipa-sra>
-                    $<$<COMPILE_LANGUAGE:CXX>:-fno-partial-inlining>)
-        endif ()
+set(DUSK_GAME_ABI_INLINE_OPTIONS)
+if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        list(APPEND DUSK_GAME_ABI_INLINE_OPTIONS
+                $<$<COMPILE_LANGUAGE:CXX>:-finline-hint-functions>)
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        list(APPEND DUSK_GAME_ABI_INLINE_OPTIONS
+                $<$<COMPILE_LANGUAGE:CXX>:-flive-patching=inline-clone>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-inline-functions>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-inline-small-functions>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-inline-functions-called-once>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-early-inlining>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-ipa-cp>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-ipa-cp-clone>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-ipa-sra>
+                $<$<COMPILE_LANGUAGE:CXX>:-fno-partial-inlining>)
     endif ()
+endif ()
 
-    if (DUSK_GAME_ABI_INLINE_OPTIONS)
-        target_compile_options(dusklight PRIVATE ${DUSK_GAME_ABI_INLINE_OPTIONS})
+if (DUSK_GAME_ABI_INLINE_OPTIONS)
+    set(_game_abi_files ${GAME_BASE_FILES} ${GAME_DEBUG_FILES})
+    list(FILTER _game_abi_files EXCLUDE REGEX "^src/dusk/")
+    set_property(SOURCE ${_game_abi_files} APPEND PROPERTY
+            COMPILE_OPTIONS ${DUSK_GAME_ABI_INLINE_OPTIONS})
 
-        foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
-            target_compile_options(${jsystem_lib} PRIVATE ${DUSK_GAME_ABI_INLINE_OPTIONS})
-        endforeach()
-        foreach(_sdk_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
-                aurora_os aurora_pad aurora_si aurora_vi)
-            if (TARGET ${_sdk_lib})
-                get_target_property(_sdk_lib_imported ${_sdk_lib} IMPORTED)
-                if (NOT _sdk_lib_imported)
-                    target_compile_options(${_sdk_lib} PRIVATE ${DUSK_GAME_ABI_INLINE_OPTIONS})
-                endif ()
+    foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
+        target_compile_options(${jsystem_lib} PRIVATE ${DUSK_GAME_ABI_INLINE_OPTIONS})
+    endforeach()
+    foreach(_sdk_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
+            aurora_os aurora_pad aurora_si aurora_vi)
+        if (TARGET ${_sdk_lib})
+            get_target_property(_sdk_lib_imported ${_sdk_lib} IMPORTED)
+            if (NOT _sdk_lib_imported)
+                target_compile_options(${_sdk_lib} PRIVATE ${DUSK_GAME_ABI_INLINE_OPTIONS})
             endif ()
-        endforeach ()
-    endif ()
+        endif ()
+    endforeach ()
+endif ()
 
-    if (MSVC)
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-            set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:/hotpatch>)
-        endif ()
-        if (CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
-            target_link_options(dusklight PRIVATE /FUNCTIONPADMIN:16 /OPT:NOICF)
-        else ()
-            target_link_options(dusklight PRIVATE /FUNCTIONPADMIN /OPT:NOICF)
-        endif ()
-    elseif (CMAKE_CXX_COMPILER_ID MATCHES "^(AppleClang|Clang|GNU)$")
-        if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
-            set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=2,1>)
-        else ()
-            set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=10,4>)
-        endif ()
+if (MSVC)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:/hotpatch>)
     endif ()
+    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+        target_link_options(dusklight PRIVATE /FUNCTIONPADMIN:16 /OPT:NOICF)
+    else ()
+        target_link_options(dusklight PRIVATE /FUNCTIONPADMIN /OPT:NOICF)
+    endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "^(AppleClang|Clang|GNU)$")
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
+        set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=2,1>)
+    else ()
+        set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=10,4>)
+    endif ()
+endif ()
 
-    if (DEFINED DUSK_PATCHABLE_ENTRY_FLAG)
-        target_compile_options(dusklight PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
-        foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
-            target_compile_options(${jsystem_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
-        endforeach()
-        foreach(_sdk_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
-                aurora_os aurora_pad aurora_si aurora_vi)
-            if (TARGET ${_sdk_lib})
-                get_target_property(_sdk_lib_imported ${_sdk_lib} IMPORTED)
-                if (NOT _sdk_lib_imported)
-                    target_compile_options(${_sdk_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
-                endif ()
+if (DEFINED DUSK_PATCHABLE_ENTRY_FLAG)
+    target_compile_options(dusklight PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
+    foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
+        target_compile_options(${jsystem_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
+    endforeach()
+    foreach(_sdk_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
+            aurora_os aurora_pad aurora_si aurora_vi)
+        if (TARGET ${_sdk_lib})
+            get_target_property(_sdk_lib_imported ${_sdk_lib} IMPORTED)
+            if (NOT _sdk_lib_imported)
+                target_compile_options(${_sdk_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
             endif ()
-        endforeach ()
-    endif ()
+        endif ()
+    endforeach ()
 endif ()
 
 if (WIN32)

CMakePresets.json

@@ -60,7 +60,11 @@
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
+        "DUSK_ENABLE_CODE_MODS": {
+          "type": "BOOL",
+          "value": true
+        }
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -147,6 +151,10 @@
         "CMAKE_C_COMPILER": "cl",
         "CMAKE_CXX_COMPILER": "cl",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
+        "DUSK_ENABLE_CODE_MODS": {
+          "type": "BOOL",
+          "value": true
+        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -246,7 +254,11 @@
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
+        "DUSK_ENABLE_CODE_MODS": {
+          "type": "BOOL",
+          "value": true
+        }
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -311,6 +323,10 @@
           "type": "BOOL",
           "value": false
         },
+        "DUSK_ENABLE_CODE_MODS": {
+          "type": "BOOL",
+          "value": true
+        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -356,6 +372,10 @@
           "type": "BOOL",
           "value": false
         },
+        "DUSK_ENABLE_CODE_MODS": {
+          "type": "BOOL",
+          "value": true
+        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -386,6 +406,10 @@
           "type": "BOOL",
           "value": false
         },
+        "DUSK_ENABLE_CODE_MODS": {
+          "type": "BOOL",
+          "value": true
+        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true

cmake/AndroidExports.cmake

@@ -39,6 +39,8 @@ function(setup_android_exports target)
             --format version-script
             --exclude cmake_pch
             --exclude miniz
+            --exclude asan_options
+            --exclude src/dusk
             # Resolved from the Java side; the SDL ones live in the statically-linked
             # SDL archive, outside the provenance scan.
             --extra-sym JNI_OnLoad

cmake/AppleExports.cmake

@@ -46,6 +46,8 @@ function(setup_apple_exports target)
             --out "${_exp}"
             --exclude cmake_pch
             --exclude miniz
+            --exclude asan_options
+            --exclude src/dusk
             ${_sdk_args}
             COMMENT "Generating dusklight exports"
             VERBATIM)

cmake/SymbolManifest.cmake

@@ -2,7 +2,7 @@ include_guard(GLOBAL)
 
 get_filename_component(_SYMBOL_MANIFEST_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 
-set(_SYMGEN_VERSION "1.3.4")
+set(_SYMGEN_VERSION "1.3.3")
 set(_SYMGEN_RELEASE_BASE_URL "https://github.com/encounter/symgen/releases/download/v${_SYMGEN_VERSION}")
 set(SYMGEN_PATH "" CACHE FILEPATH "Path to a symgen executable; empty downloads the pinned release")
 mark_as_advanced(SYMGEN_PATH)
@@ -15,32 +15,32 @@ function(symgen_host_asset out_name out_hash)
     if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
         if (_host_processor MATCHES "^(arm64|aarch64)$")
             set(_asset "symgen-macos-arm64")
-            set(_asset_hash "SHA256=983ef6278d30bee38f240f451ca736fd294da0e5705ee15029accac5c7a33829")
+            set(_asset_hash "SHA256=e8420df1160242c83bd0e5197efeeb25ceb9fecc69dbc82bdc4927476381e948")
         elseif (_host_processor MATCHES "^(x86_64|amd64)$")
             set(_asset "symgen-macos-x86_64")
-            set(_asset_hash "SHA256=b6ab1720a4f04fadcf291f42d133e2ee68ef2e9a75d143e51584929e808af8a2")
+            set(_asset_hash "SHA256=e51d13bbf0e982d1519f56850ff3c7b5910ca5a7095dd5a82cd8e59750e2d013")
         endif ()
     elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
         if (_host_processor MATCHES "^(aarch64|arm64)$")
             set(_asset "symgen-linux-aarch64")
-            set(_asset_hash "SHA256=ba84486ff1ceb753973e6213c9bc5f195b5ff6f220f5d3322fd861966cdc791c")
+            set(_asset_hash "SHA256=331190dd21ecee12a52e857b7f90a8b3e0a114608173813f7df74a31cf783f70")
         elseif (_host_processor MATCHES "^(x86_64|amd64)$")
             set(_asset "symgen-linux-x86_64")
-            set(_asset_hash "SHA256=8b81a00a2ef8f5dd4b59adba1badfaca57e472bf272516bc12c4625cefb37718")
+            set(_asset_hash "SHA256=d727e0ba43242f92a92865af1b69c47aa9d81a0242c4570ce53b90e1ecd15e84")
         elseif (_host_processor MATCHES "^(i[3-6]86|x86)$")
             set(_asset "symgen-linux-i686")
-            set(_asset_hash "SHA256=01aa85d84148a6806fdf69839dea7e962e6ac46956aed63b9ecb7d596f179f93")
+            set(_asset_hash "SHA256=0c9f94d36b7fa46d15a199c9d0f1a633b73eb7d9c02621a6a76a676b83a135c7")
         endif ()
     elseif (CMAKE_HOST_WIN32)
         if (_host_processor MATCHES "^(arm64|aarch64)$")
             set(_asset "symgen-windows-arm64.exe")
-            set(_asset_hash "SHA256=e116099f859177d7e29fc3444d67083596330e5c4fb3a0461b21402c89249d96")
+            set(_asset_hash "SHA256=c699192957e2086ed68912ed39fa77858e1ae894476ab8b557711804cf2aa7cb")
         elseif (_host_processor MATCHES "^(x86_64|amd64)$")
             set(_asset "symgen-windows-x86_64.exe")
-            set(_asset_hash "SHA256=57ef1c2f563e33fa4915c40194c4ced540f985c48d9cf081047c6bbcb585fa37")
+            set(_asset_hash "SHA256=6d56a45617c75065ab7a3192d09ca52ff735baf5637b0899f446138d46acc310")
         elseif (_host_processor MATCHES "^(i[3-6]86|x86)$")
             set(_asset "symgen-windows-x86.exe")
-            set(_asset_hash "SHA256=cc0ba337c798d3f63d8acbb2d16d531d0c2da878fbdd2b6307702334ec880528")
+            set(_asset_hash "SHA256=6cccc3a8d29e7525a4d1ade1dc4d89327b7c3002a604ab1c7decb43eea6fd4ab")
         endif ()
     endif ()
 

cmake/WindowsExports.cmake

@@ -62,6 +62,8 @@ function(setup_windows_exports target)
             --out "${_def}"
             --exclude cmake_pch
             --exclude miniz
+            --exclude asan_options
+            --exclude src/dusk
             --max-exports 58000
             ${_sdk_args}
             ${_forward_args}

include/global.h

@@ -83,15 +83,11 @@ extern void __dcbf(void*, int);
 extern void __dcbz(void*, int);
 extern void __sync();
 extern int __abs(int);
-#if defined(_MSVC_LANG) && !defined(__clang__)
-#define __memcpy memcpy
-#else
 #if defined(__has_builtin) && __has_builtin(__builtin_memcpy)
 #define __memcpy __builtin_memcpy
 #else
 #define __memcpy memcpy
 #endif
-#endif
 #ifdef __cplusplus
 }
 #endif

src/d/actor/d_a_alink_damage.inc

@@ -157,10 +157,11 @@ f32 daAlink_c::damageMagnification(BOOL i_checkZoraMag, int param_1) {
     }
 
     #if TARGET_PC
-    base_mag *= dusk::getSettings().game.damageMultiplier;
     if (dusk::getSettings().game.instantDeath) {
-        base_mag = 9999.0f;
+        return 9999.0f; // don't need to multiply this further, 9999 is plenty
     }
+
+    base_mag *= dusk::getSettings().game.damageMultiplier;
     #endif
 
     if (checkWolf() && !checkCargoCarry() && param_1 == 0) {

src/d/d_meter2.cpp

@@ -606,7 +606,8 @@ void dMeter2_c::moveLife() {
             life_count = (dComIfGs_getMaxLife() / 5) * 4;
         }
 
-        s16 new_life = dComIfGs_getLife() + dComIfGp_getItemLifeCount();
+        DUSK_IF_ELSE(int, s16) new_life = dComIfGs_getLife() + dComIfGp_getItemLifeCount(); // prevent an overflow with really large damage values
+
         if (new_life > life_count) {
             new_life = life_count;
         } else if (new_life < 0) {

src/dusk/logging.cpp

@@ -14,7 +14,6 @@ constexpr std::string_view kStubFragments[] = {
     "Unimplemented: BP register"sv,
     "Unhandled BP register"sv,
     "Unhandled XF register"sv,
-    "Unhandled XF memory write"sv,
     "but selective updates are not implemented"sv,
 };