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

Fix kernel memory allocator block coalescing (#1155)

Browse source 
* Fix kernel memory allocator block coalescing

* Fix and move clear bit logic to a separate method
This commit is contained in:
gdkchan 2020-04-25 10:25:22 -03:00 committed by GitHub
parent 74f8a9bd79
commit bcc5b0d21e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
Ryujinx.HLE/HOS/Kernel/Memory/KMemoryRegionBlock.cs
View file

@ -12,20 +12,68 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
public int Order; public int Order;
public int NextOrder; public int NextOrder;
public bool TryCoalesce(int index, int size) public bool TryCoalesce(int index, int count)
{ {
long mask = ((1L << size) - 1) << (index & 63); long mask = ((1L << count) - 1) << (index & 63);
index /= 64; index /= 64;
if ((mask & ~Masks[MaxLevel - 1][index]) != 0) if (count >= 64)
{
int remaining = count;
int tempIdx = index;
do
{
if (Masks[MaxLevel - 1][tempIdx++] != -1L)
{ {
return false; return false;
} }
Masks[MaxLevel - 1][index] &= ~mask; remaining -= 64;
}
while (remaining != 0);
for (int level = MaxLevel - 2; level >= 0; level--, index /= 64) remaining = count;
tempIdx = index;
do
{
Masks[MaxLevel - 1][tempIdx] = 0;
ClearMaskBit(MaxLevel - 2, tempIdx++);
remaining -= 64;
}
while (remaining != 0);
}
else
{
long value = Masks[MaxLevel - 1][index];
if ((mask & ~value) != 0)
{
return false;
}
value &= ~mask;
Masks[MaxLevel - 1][index] = value;
if (value == 0)
{
ClearMaskBit(MaxLevel - 2, index);
}
}
FreeCount -= (ulong)count;
return true;
}
public void ClearMaskBit(int startLevel, int index)
{
for (int level = startLevel; level >= 0; level--, index /= 64)
{ {
Masks[level][index / 64] &= ~(1L << (index & 63)); Masks[level][index / 64] &= ~(1L << (index & 63));
@ -34,10 +82,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
break; break;
} }
} }
FreeCount -= (ulong)size;
return true;
} }
} }
} }