Fix heap size for kernel check and DRAM selections

This commit is contained in:
KeatonTheBot 2025-12-04 20:13:42 -06:00
parent ab571e81b3
commit 7f805f59fd
2 changed files with 10 additions and 10 deletions

View file

@ -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;

View file

@ -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;