mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address comments

Browse source
This commit is contained in:
Thog 2019-11-04 11:40:42 +01:00
commit c30fb8f27d
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro
while (retryCount++ < MaxMapRetries) while (retryCount++ < MaxMapRetries)
{ {
ResultCode result = MapCodeMemoryInProcess(process, out nroMappedAddress, info.NroAddress, info.NroSize); ResultCode result = MapCodeMemoryInProcess(process, info.NroAddress, info.NroSize, out nroMappedAddress);
if (result != ResultCode.Success) if (result != ResultCode.Success)
{ {
@ -257,7 +257,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro
return false; return false;
} }
private ResultCode MapCodeMemoryInProcess(KProcess process, out ulong targetAddress, ulong baseAddress, ulong size) private ResultCode MapCodeMemoryInProcess(KProcess process, ulong baseAddress, ulong size, out ulong targetAddress)
{ {
KMemoryManager memMgr = process.MemoryManager; KMemoryManager memMgr = process.MemoryManager;
@ -265,11 +265,13 @@ namespace Ryujinx.HLE.HOS.Services.Ro
int retryCount; int retryCount;
int addressSpacePageLimit = (int)((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((int)((memMgr.GetAddrSpaceSize() - size) >> 12)) << 12); targetAddress = memMgr.GetAddrSpaceBaseAddr() + (ulong)(_random.Next(addressSpacePageLimit) << 12);
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))
{ {
@ -559,6 +561,8 @@ namespace Ryujinx.HLE.HOS.Services.Ro
{ {
UnmapNroFromInfo(info); UnmapNroFromInfo(info);
} }
_nroInfos.Clear();
} }
} }
} }