From cee712105850ac3385cd0091a923438167433f9f Mon Sep 17 00:00:00 2001 From: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Date: Sat, 8 Apr 2023 01:22:00 +0200 Subject: Move solution and projects to src --- Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs | 229 ---------------------------- 1 file changed, 229 deletions(-) delete mode 100644 Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs (limited to 'Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs') diff --git a/Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs b/Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs deleted file mode 100644 index 28e9f90a..00000000 --- a/Ryujinx.HLE/HOS/Kernel/Memory/KPageTable.cs +++ /dev/null @@ -1,229 +0,0 @@ -using Ryujinx.Horizon.Common; -using Ryujinx.Memory; -using Ryujinx.Memory.Range; -using System; -using System.Collections.Generic; -using System.Diagnostics; - -namespace Ryujinx.HLE.HOS.Kernel.Memory -{ - class KPageTable : KPageTableBase - { - private readonly IVirtualMemoryManager _cpuMemory; - - protected override bool Supports4KBPages => _cpuMemory.Supports4KBPages; - - public KPageTable(KernelContext context, IVirtualMemoryManager cpuMemory) : base(context) - { - _cpuMemory = cpuMemory; - } - - /// - protected override IEnumerable GetHostRegions(ulong va, ulong size) - { - return _cpuMemory.GetHostRegions(va, size); - } - - /// - protected override void GetPhysicalRegions(ulong va, ulong size, KPageList pageList) - { - var ranges = _cpuMemory.GetPhysicalRegions(va, size); - foreach (var range in ranges) - { - pageList.AddRange(range.Address + DramMemoryMap.DramBase, range.Size / PageSize); - } - } - - /// - protected override ReadOnlySpan GetSpan(ulong va, int size) - { - return _cpuMemory.GetSpan(va, size); - } - - /// - protected override Result MapMemory(ulong src, ulong dst, ulong pagesCount, KMemoryPermission oldSrcPermission, KMemoryPermission newDstPermission) - { - KPageList pageList = new KPageList(); - GetPhysicalRegions(src, pagesCount * PageSize, pageList); - - Result result = Reprotect(src, pagesCount, KMemoryPermission.None); - - if (result != Result.Success) - { - return result; - } - - result = MapPages(dst, pageList, newDstPermission, MemoryMapFlags.Private, false, 0); - - if (result != Result.Success) - { - Result reprotectResult = Reprotect(src, pagesCount, oldSrcPermission); - Debug.Assert(reprotectResult == Result.Success); - } - - return result; - } - - /// - protected override Result UnmapMemory(ulong dst, ulong src, ulong pagesCount, KMemoryPermission oldDstPermission, KMemoryPermission newSrcPermission) - { - ulong size = pagesCount * PageSize; - - KPageList srcPageList = new KPageList(); - KPageList dstPageList = new KPageList(); - - GetPhysicalRegions(src, size, srcPageList); - GetPhysicalRegions(dst, size, dstPageList); - - if (!dstPageList.IsEqual(srcPageList)) - { - return KernelResult.InvalidMemRange; - } - - Result result = Unmap(dst, pagesCount); - - if (result != Result.Success) - { - return result; - } - - result = Reprotect(src, pagesCount, newSrcPermission); - - if (result != Result.Success) - { - Result mapResult = MapPages(dst, dstPageList, oldDstPermission, MemoryMapFlags.Private, false, 0); - Debug.Assert(mapResult == Result.Success); - } - - return result; - } - - /// - protected override Result MapPages( - ulong dstVa, - ulong pagesCount, - ulong srcPa, - KMemoryPermission permission, - MemoryMapFlags flags, - bool shouldFillPages, - byte fillValue) - { - ulong size = pagesCount * PageSize; - - Context.CommitMemory(srcPa - DramMemoryMap.DramBase, size); - - _cpuMemory.Map(dstVa, srcPa - DramMemoryMap.DramBase, size, flags); - - if (DramMemoryMap.IsHeapPhysicalAddress(srcPa)) - { - Context.MemoryManager.IncrementPagesReferenceCount(srcPa, pagesCount); - } - - if (shouldFillPages) - { - _cpuMemory.Fill(dstVa, size, fillValue); - } - - return Result.Success; - } - - /// - protected override Result MapPages( - ulong address, - KPageList pageList, - KMemoryPermission permission, - MemoryMapFlags flags, - bool shouldFillPages, - byte fillValue) - { - using var scopedPageList = new KScopedPageList(Context.MemoryManager, pageList); - - ulong currentVa = address; - - foreach (var pageNode in pageList) - { - ulong addr = pageNode.Address - DramMemoryMap.DramBase; - ulong size = pageNode.PagesCount * PageSize; - - Context.CommitMemory(addr, size); - - _cpuMemory.Map(currentVa, addr, size, flags); - - if (shouldFillPages) - { - _cpuMemory.Fill(currentVa, size, fillValue); - } - - currentVa += size; - } - - scopedPageList.SignalSuccess(); - - return Result.Success; - } - - /// - protected override Result MapForeign(IEnumerable regions, ulong va, ulong size) - { - ulong offset = 0; - - foreach (var region in regions) - { - _cpuMemory.MapForeign(va + offset, region.Address, region.Size); - - offset += region.Size; - } - - return Result.Success; - } - - /// - protected override Result Unmap(ulong address, ulong pagesCount) - { - KPageList pagesToClose = new KPageList(); - - var regions = _cpuMemory.GetPhysicalRegions(address, pagesCount * PageSize); - - foreach (var region in regions) - { - ulong pa = region.Address + DramMemoryMap.DramBase; - if (DramMemoryMap.IsHeapPhysicalAddress(pa)) - { - pagesToClose.AddRange(pa, region.Size / PageSize); - } - } - - _cpuMemory.Unmap(address, pagesCount * PageSize); - - pagesToClose.DecrementPagesReferenceCount(Context.MemoryManager); - - return Result.Success; - } - - /// - protected override Result Reprotect(ulong address, ulong pagesCount, KMemoryPermission permission) - { - // TODO. - return Result.Success; - } - - /// - protected override Result ReprotectWithAttributes(ulong address, ulong pagesCount, KMemoryPermission permission) - { - // TODO. - return Result.Success; - } - - /// - protected override void SignalMemoryTracking(ulong va, ulong size, bool write) - { - _cpuMemory.SignalMemoryTracking(va, size, write); - } - - /// - protected override void Write(ulong va, ReadOnlySpan data) - { - _cpuMemory.Write(va, data); - } - } -} \ No newline at end of file -- cgit v1.2.3