From 285e271f3e1b50117911ed1be22516af1cfbdc16 Mon Sep 17 00:00:00 2001 From: Arthur Date: Sun, 11 Oct 2026 02:38:47 +0800 Subject: [PATCH] Fix NativeAOT GC region range defaults (#385) Use the bare hex value accepted by older NativeAOT runtimes and CoreCLR. Cover the default and shared and per-game overrides. Co-authored-by: James Yeung <163084539+CiphemonJY@users.noreply.github.com> --- .../droiddeck/launcher/core/GameEnvironment.kt | 3 ++- .../launcher/core/GameEnvironmentTest.kt | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt index a03f31d945..ffc9f772b8 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironment.kt @@ -31,7 +31,8 @@ object GameEnvironment { "VKD3D_SHADER_MODEL" to "6_9", // .NET 7 and later reserve 256 GB of address space for the GC heap at startup, more than an // Android process has free, and the runtime fails to start. 32 GB is plenty for a game. - "DOTNET_GCRegionRange" to "0x800000000", + // Older NativeAOT runtimes require bare hex digits. CoreCLR accepts this form too. + "DOTNET_GCRegionRange" to "800000000", // .NET's W^X writes JIT code through a second mapping that FEX does not watch, so FEX keeps // running the stale translation and the game hangs at startup. "DOTNET_EnableWriteXorExecute" to "0", diff --git a/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt b/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt index aacfcfb20b..82d5f3f64d 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/GameEnvironmentTest.kt @@ -46,10 +46,26 @@ class GameEnvironmentTest { @Test fun dotnetRuntimeFitsAndroidAddressSpaceForEveryGame() { val values = GameEnvironment.effective(GameEnvironment.Config(), "PERFORMANCE", "43") - assertEquals("0x800000000", values["DOTNET_GCRegionRange"]) + assertEquals("800000000", values["DOTNET_GCRegionRange"]) assertEquals("0", values["DOTNET_EnableWriteXorExecute"]) } + @Test fun dotnetHeapRangeIsBareHexForNativeAot() { + for (preset in FexPreset.all) { + val values = GameEnvironment.effective(GameEnvironment.Config(), preset.id, "3478050") + assertEquals(32L * 1024 * 1024 * 1024, values.getValue("DOTNET_GCRegionRange")!!.toLong(16)) + } + } + + @Test fun dotnetHeapRangeRespectsSharedAndGameOverrides() { + val config = GameEnvironment.Config( + shared = mapOf("DOTNET_GCRegionRange" to "400000000"), + games = mapOf("3478050" to mapOf("DOTNET_GCRegionRange" to "800000000")), + ) + assertEquals("800000000", GameEnvironment.effective(config, "", "3478050")["DOTNET_GCRegionRange"]) + assertEquals("400000000", GameEnvironment.effective(config, "", "43")["DOTNET_GCRegionRange"]) + } + @Test fun multiSelectionPreservesCustomTokensAndRemovesToggledValues() { assertEquals("fps,custom_token,frametimes", GameEnvironmentOptions.toggle("fps,custom_token", "frametimes")) assertEquals("custom_token", GameEnvironmentOptions.toggle("fps,custom_token", "fps"))