marcel/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-08-08 11:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to memory management

Browse Source
This commit is contained in:
gdkchan
2018-02-09 21:13:18 -03:00
parent ccc9ce1908
commit 7f4a190665
6 changed files with 51 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ryujinx/Gpu/NsGpuMemoryMgr.cs
View File

@@ -1,5 +1,3 @@
using System.Runtime.CompilerServices;
namespace Ryujinx.Gpu
{
class NsGpuMemoryMgr
@@ -16,7 +14,7 @@ namespace Ryujinx.Gpu
private const int PTLvl0Mask = PTLvl0Size - 1;
private const int PTLvl1Mask = PTLvl1Size - 1;
private const int PageMask = PageSize - 1;
private const int PageMask = PageSize - 1;
private const int PTLvl0Bit = PTPageBits + PTLvl0Bits;
private const int PTLvl1Bit = PTPageBits;
@@ -107,6 +105,11 @@ namespace Ryujinx.Gpu
long Position = 0;
long FreeSize = 0;
if (Align < 1)
{
Align = 1;
}
Align = (Align + PageMask) & ~PageMask;
while (Position + FreeSize < AddrSize)
@@ -149,7 +152,6 @@ namespace Ryujinx.Gpu
return BasePos + (Position & PageMask);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private bool HasPTAddr(long Position)
{
if (Position >> PTLvl0Bits + PTLvl1Bits + PTPageBits != 0)
@@ -168,7 +170,6 @@ namespace Ryujinx.Gpu
return PageTable[L0][L1] != PteUnmapped;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private long GetPTAddr(long Position)
{
long L0 = (Position >> PTLvl0Bit) & PTLvl0Mask;
@@ -182,7 +183,6 @@ namespace Ryujinx.Gpu
return PageTable[L0][L1];
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void SetPTAddr(long Position, long TgtAddr)
{
long L0 = (Position >> PTLvl0Bit) & PTLvl0Mask;