* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
170 lines
4.8 KiB
C#
170 lines
4.8 KiB
C#
using Ryujinx.Common;
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
using Ryujinx.HLE.HOS.Kernel.Process;
|
|
using Ryujinx.Horizon.Common;
|
|
using System;
|
|
using System.Diagnostics;
|
|
|
|
namespace Ryujinx.HLE.HOS.Kernel.Memory
|
|
{
|
|
class KCodeMemory : KAutoObject
|
|
{
|
|
public KProcess Owner { get; private set; }
|
|
private readonly KPageList _pageList;
|
|
private readonly object _lock;
|
|
private ulong _address;
|
|
private bool _isOwnerMapped;
|
|
private bool _isMapped;
|
|
|
|
public KCodeMemory(KernelContext context) : base(context)
|
|
{
|
|
_pageList = new KPageList();
|
|
_lock = new object();
|
|
}
|
|
|
|
public Result Initialize(ulong address, ulong size)
|
|
{
|
|
Owner = KernelStatic.GetCurrentProcess();
|
|
|
|
Result result = Owner.MemoryManager.BorrowCodeMemory(_pageList, address, size);
|
|
|
|
if (result != Result.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
Owner.CpuMemory.Fill(address, size, 0xff);
|
|
Owner.IncrementReferenceCount();
|
|
|
|
_address = address;
|
|
_isMapped = false;
|
|
_isOwnerMapped = false;
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
public Result Map(ulong address, ulong size, KMemoryPermission perm)
|
|
{
|
|
if (_pageList.GetPagesCount() != BitUtils.DivRoundUp<ulong>(size, (ulong)KPageTableBase.PageSize))
|
|
{
|
|
return KernelResult.InvalidSize;
|
|
}
|
|
|
|
lock (_lock)
|
|
{
|
|
if (_isMapped)
|
|
{
|
|
return KernelResult.InvalidState;
|
|
}
|
|
|
|
KProcess process = KernelStatic.GetCurrentProcess();
|
|
|
|
Result result = process.MemoryManager.MapPages(address, _pageList, MemoryState.CodeWritable, KMemoryPermission.ReadAndWrite);
|
|
|
|
if (result != Result.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
_isMapped = true;
|
|
}
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
public Result MapToOwner(ulong address, ulong size, KMemoryPermission permission)
|
|
{
|
|
if (_pageList.GetPagesCount() != BitUtils.DivRoundUp<ulong>(size, (ulong)KPageTableBase.PageSize))
|
|
{
|
|
return KernelResult.InvalidSize;
|
|
}
|
|
|
|
lock (_lock)
|
|
{
|
|
if (_isOwnerMapped)
|
|
{
|
|
return KernelResult.InvalidState;
|
|
}
|
|
|
|
Debug.Assert(permission == KMemoryPermission.Read || permission == KMemoryPermission.ReadAndExecute);
|
|
|
|
Result result = Owner.MemoryManager.MapPages(address, _pageList, MemoryState.CodeReadOnly, permission);
|
|
|
|
if (result != Result.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
_isOwnerMapped = true;
|
|
}
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
public Result Unmap(ulong address, ulong size)
|
|
{
|
|
if (_pageList.GetPagesCount() != BitUtils.DivRoundUp<ulong>(size, (ulong)KPageTableBase.PageSize))
|
|
{
|
|
return KernelResult.InvalidSize;
|
|
}
|
|
|
|
lock (_lock)
|
|
{
|
|
KProcess process = KernelStatic.GetCurrentProcess();
|
|
|
|
Result result = process.MemoryManager.UnmapPages(address, _pageList, MemoryState.CodeWritable);
|
|
|
|
if (result != Result.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
Debug.Assert(_isMapped);
|
|
|
|
_isMapped = false;
|
|
}
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
public Result UnmapFromOwner(ulong address, ulong size)
|
|
{
|
|
if (_pageList.GetPagesCount() != BitUtils.DivRoundUp<ulong>(size, KPageTableBase.PageSize))
|
|
{
|
|
return KernelResult.InvalidSize;
|
|
}
|
|
|
|
lock (_lock)
|
|
{
|
|
Result result = Owner.MemoryManager.UnmapPages(address, _pageList, MemoryState.CodeReadOnly);
|
|
|
|
if (result != Result.Success)
|
|
{
|
|
return result;
|
|
}
|
|
|
|
Debug.Assert(_isOwnerMapped);
|
|
|
|
_isOwnerMapped = false;
|
|
}
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
protected override void Destroy()
|
|
{
|
|
if (!_isMapped && !_isOwnerMapped)
|
|
{
|
|
ulong size = _pageList.GetPagesCount() * KPageTableBase.PageSize;
|
|
|
|
if (Owner.MemoryManager.UnborrowCodeMemory(_address, size, _pageList) != Result.Success)
|
|
{
|
|
throw new InvalidOperationException("Unexpected failure restoring transfer memory attributes.");
|
|
}
|
|
}
|
|
|
|
Owner.DecrementReferenceCount();
|
|
}
|
|
}
|
|
}
|