emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix issues on ro implementation (#834)

Browse source 
* ro: Fixes some bugs

* Fix critical overflow in random computation
This commit is contained in:
Thog 2019-11-26 19:41:17 +01:00 committed by Ac_K
parent 3f3ae99a0f
commit 69329dc569
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
View file

@ -1,5 +1,6 @@
using ARMeilleure.Memory; using ARMeilleure.Memory;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Memory; using Ryujinx.HLE.HOS.Kernel.Memory;
using Ryujinx.HLE.HOS.Kernel.Process; using Ryujinx.HLE.HOS.Kernel.Process;
@ -265,13 +266,15 @@ namespace Ryujinx.HLE.HOS.Services.Ro
int retryCount; int retryCount;
int addressSpacePageLimit = (int)((memMgr.GetAddrSpaceSize() - size) >> 12); ulong addressSpacePageLimit = (memMgr.GetAddrSpaceSize() - size) >> 12;
for (retryCount = 0; retryCount < MaxMapRetries; retryCount++) for (retryCount = 0; retryCount < MaxMapRetries; retryCount++)
{ {
while (true) while (true)
{ {
targetAddress = memMgr.GetAddrSpaceBaseAddr() + (ulong)(_random.Next(addressSpacePageLimit) << 12); ulong randomOffset = (ulong)(uint)_random.Next(0, (int)addressSpacePageLimit) << 12;
targetAddress = memMgr.GetAddrSpaceBaseAddr() + randomOffset;
if (memMgr.InsideAddrSpace(targetAddress, size) && !memMgr.InsideHeapRegion(targetAddress, size) && !memMgr.InsideAliasRegion(targetAddress, size)) if (memMgr.InsideAddrSpace(targetAddress, size) && !memMgr.InsideHeapRegion(targetAddress, size) && !memMgr.InsideAliasRegion(targetAddress, size))
{ {
@ -449,6 +452,8 @@ namespace Ryujinx.HLE.HOS.Services.Ro
if (result == ResultCode.Success) if (result == ResultCode.Success)
{ {
info.NroMappedAddress = nroMappedAddress;
_nroInfos.Add(info); _nroInfos.Add(info);
} }
} }

2
Ryujinx.HLE/HOS/Services/Ro/ResultCode.cs
View file

@ -3,7 +3,7 @@
enum ResultCode enum ResultCode
{ {
ModuleId = 22, ModuleId = 22,
ErrorCodeShift = 22, ErrorCodeShift = 9,
Success = 0, Success = 0,