From 7f805f59fded68249317d9d42c0e75a258c2e9f5 Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Thu, 4 Dec 2025 20:13:42 -0600 Subject: [PATCH] Fix heap size for kernel check and DRAM selections --- .../HOS/Kernel/Memory/KPageTableBase.cs | 18 +++++++++--------- .../HOS/Kernel/SupervisorCall/Syscall.cs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs b/src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs index 8566f75fc..e39ba09ae 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs @@ -202,9 +202,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory aliasRegion.Size = 0x180000000; heapRegion.Size = memConfig switch { MemoryConfiguration.MemoryConfiguration6GiB => 0x180000000u, - MemoryConfiguration.MemoryConfiguration8GiB - or MemoryConfiguration.MemoryConfiguration10GiB - or MemoryConfiguration.MemoryConfiguration12GiB => 0x200000000u, + MemoryConfiguration.MemoryConfiguration8GiB => 0x200000000u, + MemoryConfiguration.MemoryConfiguration10GiB => 0x280000000u, + MemoryConfiguration.MemoryConfiguration12GiB => 0x300000000u, _ => 0x100000000u }; stackRegion.Size = 0; @@ -239,9 +239,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory aliasRegion.Size = reservedAddressSpaceSize >= 0x1800000000 ? 0x1000000000 : 1UL << (addressSpaceWidth - 3); heapRegion.Size = memConfig switch { MemoryConfiguration.MemoryConfiguration6GiB => 0x180000000u, - MemoryConfiguration.MemoryConfiguration8GiB - or MemoryConfiguration.MemoryConfiguration10GiB - or MemoryConfiguration.MemoryConfiguration12GiB => 0x200000000u, + MemoryConfiguration.MemoryConfiguration8GiB => 0x200000000u, + MemoryConfiguration.MemoryConfiguration10GiB => 0x280000000u, + MemoryConfiguration.MemoryConfiguration12GiB => 0x300000000u, _ => 0x100000000u }; stackRegion.Size = 1UL << (addressSpaceWidth - 8); @@ -259,9 +259,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory aliasRegion.Size = 0x1000000000; heapRegion.Size = memConfig switch { MemoryConfiguration.MemoryConfiguration6GiB => 0x180000000u, - MemoryConfiguration.MemoryConfiguration8GiB - or MemoryConfiguration.MemoryConfiguration10GiB - or MemoryConfiguration.MemoryConfiguration12GiB => 0x200000000u, + MemoryConfiguration.MemoryConfiguration8GiB => 0x200000000u, + MemoryConfiguration.MemoryConfiguration10GiB => 0x280000000u, + MemoryConfiguration.MemoryConfiguration12GiB => 0x300000000u, _ => 0x100000000u }; stackRegion.Size = 0x80000000; diff --git a/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs b/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs index 52449a35e..987e8cadb 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs @@ -881,7 +881,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall [Svc(1)] public Result SetHeapSize([PointerSized] out ulong address, [PointerSized] ulong size) { - if ((size & 0xfffffffe001fffff) != 0) + if ((size & 0xfffffffc001fffff) != 0) { address = 0;