crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-06-28 06:46:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

initial commit

Browse source
This commit is contained in:
LotP1 2025-06-01 07:30:35 +02:00
parent d688fed7d2
commit be8f4897a2
10 changed files with 935 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/Ryujinx.Memory/Tracking/MemoryTracking.cs
View file

@ -1,5 +1,6 @@
using Ryujinx.Common.Pools;
using Ryujinx.Memory.Range;
using System;
using System.Collections.Generic;
namespace Ryujinx.Memory.Tracking
@ -76,17 +77,15 @@ namespace Ryujinx.Memory.Tracking
lock (TrackingLock)
{
ref VirtualRegion[] overlaps = ref ThreadStaticArray<VirtualRegion>.Get();
for (int type = 0; type < 2; type++)
{
NonOverlappingRangeList<VirtualRegion> regions = type == 0 ? _virtualRegions : _guestVirtualRegions;
int count = regions.FindOverlapsNonOverlapping(va, size, ref overlaps);
for (int i = 0; i < count; i++)
regions.Lock.EnterReadLock();
regions.FindOverlapsNonOverlappingAsSpan(va, size, out ReadOnlySpan<RangeItem<VirtualRegion>> overlaps);
for (int i = 0; i < overlaps.Length; i++)
{
VirtualRegion region = overlaps[i];
VirtualRegion region = overlaps[i].Value;
// If the region has been fully remapped, signal that it has been mapped again.
bool remapped = _memoryManager.IsRangeMapped(region.Address, region.Size);
@ -97,6 +96,7 @@ namespace Ryujinx.Memory.Tracking
region.UpdateProtection();
}
regions.Lock.ExitReadLock();
}
}
}
@ -114,20 +114,19 @@ namespace Ryujinx.Memory.Tracking
lock (TrackingLock)
{
ref VirtualRegion[] overlaps = ref ThreadStaticArray<VirtualRegion>.Get();
for (int type = 0; type < 2; type++)
{
NonOverlappingRangeList<VirtualRegion> regions = type == 0 ? _virtualRegions : _guestVirtualRegions;
regions.Lock.EnterReadLock();
regions.FindOverlapsNonOverlappingAsSpan(va, size, out ReadOnlySpan<RangeItem<VirtualRegion>> overlaps);
int count = regions.FindOverlapsNonOverlapping(va, size, ref overlaps);
for (int i = 0; i < count; i++)
for (int i = 0; i < overlaps.Length; i++)
{
VirtualRegion region = overlaps[i];
VirtualRegion region = overlaps[i].Value;
region.SignalMappingChanged(false);
}
regions.Lock.ExitReadLock();
}
}
}
@ -165,10 +164,11 @@ namespace Ryujinx.Memory.Tracking
/// <returns>A list of virtual regions within the given range</returns>
internal List<VirtualRegion> GetVirtualRegionsForHandle(ulong va, ulong size, bool guest)
{
List<VirtualRegion> result = [];
NonOverlappingRangeList<VirtualRegion> regions = guest ? _guestVirtualRegions : _virtualRegions;
regions.GetOrAddRegions(result, va, size, (va, size) => new VirtualRegion(this, va, size, guest));
regions.Lock.EnterUpgradeableReadLock();
regions.GetOrAddRegions(out List<VirtualRegion> result, va, size, (va, size) => new VirtualRegion(this, va, size, guest));
regions.Lock.ExitUpgradeableReadLock();
return result;
}
@ -296,25 +296,25 @@ namespace Ryujinx.Memory.Tracking
lock (TrackingLock)
{
ref VirtualRegion[] overlaps = ref ThreadStaticArray<VirtualRegion>.Get();
NonOverlappingRangeList<VirtualRegion> regions = guest ? _guestVirtualRegions : _virtualRegions;
ref RangeItem<VirtualRegion>[] overlaps = ref ThreadStaticArray<RangeItem<VirtualRegion>>.Get();
regions.Lock.EnterReadLock();
OverlapResult result = regions.FindOverlapsNonOverlapping(address, size, ref overlaps);
regions.Lock.ExitReadLock();
int count = regions.FindOverlapsNonOverlapping(address, size, ref overlaps);
if (count == 0 && !precise)
if (overlaps.Length == 0 && !precise)
{
if (_memoryManager.IsRangeMapped(address, size))
{
// TODO: There is currently the possibility that a page can be protected after its virtual region is removed.
// This code handles that case when it happens, but it would be better to find out how this happens.
_memoryManager.TrackingReprotect(address & ~(ulong)(_pageSize - 1), (ulong)_pageSize, MemoryPermission.ReadAndWrite, guest);
return true; // This memory _should_ be mapped, so we need to try again.
}
else
{
shouldThrow = true;
}
shouldThrow = true;
}
else
{
@ -324,9 +324,9 @@ namespace Ryujinx.Memory.Tracking
size += (ulong)_pageSize;
}
for (int i = 0; i < count; i++)
for (int i = 0; i < result.Count; i++)
{
VirtualRegion region = overlaps[i];
VirtualRegion region = overlaps[i].Value;
if (precise)
{