mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-15 07:26:39 +00:00
95017b8c66
* Back to the origins: Make memory manager take guest PA rather than host address once again * Direct mapping with alias support on Windows * Fixes and remove more of the emulated shared memory * Linux support * Make shared and transfer memory not depend on SharedMemoryStorage * More efficient view mapping on Windows (no more restricted to 4KB pages at a time) * Handle potential access violations caused by partial unmap * Implement host mapping using shared memory on Linux * Add new GetPhysicalAddressChecked method, used to ensure the virtual address is mapped before address translation Also align GetRef behaviour with software memory manager * We don't need a mirrorable memory block for software memory manager mode * Disable memory aliasing tests while we don't have shared memory support on Mac * Shared memory & SIGBUS handler for macOS * Fix typo + nits + re-enable memory tests * Set MAP_JIT_DARWIN on x86 Mac too * Add back the address space mirror * Only set MAP_JIT_DARWIN if we are mapping as executable * Disable aliasing tests again (still fails on Mac) * Fix UnmapView4KB (by not casting size to int) * Use ref counting on memory blocks to delay closing the shared memory handle until all blocks using it are disposed * Address PR feedback * Make RO hold a reference to the guest process memory manager to avoid early disposal Co-authored-by: nastys <nastys@users.noreply.github.com>
63 lines
No EOL
2 KiB
C#
63 lines
No EOL
2 KiB
C#
using Ryujinx.Common;
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
using Ryujinx.HLE.HOS.Kernel.Process;
|
|
|
|
namespace Ryujinx.HLE.HOS.Kernel.Memory
|
|
{
|
|
class KSharedMemory : KAutoObject
|
|
{
|
|
private readonly KPageList _pageList;
|
|
|
|
private readonly ulong _ownerPid;
|
|
|
|
private readonly KMemoryPermission _ownerPermission;
|
|
private readonly KMemoryPermission _userPermission;
|
|
|
|
public KSharedMemory(
|
|
KernelContext context,
|
|
SharedMemoryStorage storage,
|
|
ulong ownerPid,
|
|
KMemoryPermission ownerPermission,
|
|
KMemoryPermission userPermission) : base(context)
|
|
{
|
|
_pageList = storage.GetPageList();
|
|
_ownerPid = ownerPid;
|
|
_ownerPermission = ownerPermission;
|
|
_userPermission = userPermission;
|
|
}
|
|
|
|
public KernelResult MapIntoProcess(
|
|
KPageTableBase memoryManager,
|
|
ulong address,
|
|
ulong size,
|
|
KProcess process,
|
|
KMemoryPermission permission)
|
|
{
|
|
if (_pageList.GetPagesCount() != BitUtils.DivRoundUp(size, KPageTableBase.PageSize))
|
|
{
|
|
return KernelResult.InvalidSize;
|
|
}
|
|
|
|
KMemoryPermission expectedPermission = process.Pid == _ownerPid
|
|
? _ownerPermission
|
|
: _userPermission;
|
|
|
|
if (permission != expectedPermission)
|
|
{
|
|
return KernelResult.InvalidPermission;
|
|
}
|
|
|
|
return memoryManager.MapPages(address, _pageList, MemoryState.SharedMemory, permission);
|
|
}
|
|
|
|
public KernelResult UnmapFromProcess(KPageTableBase memoryManager, ulong address, ulong size, KProcess process)
|
|
{
|
|
if (_pageList.GetPagesCount() != BitUtils.DivRoundUp(size, KPageTableBase.PageSize))
|
|
{
|
|
return KernelResult.InvalidSize;
|
|
}
|
|
|
|
return memoryManager.UnmapPages(address, _pageList, MemoryState.SharedMemory);
|
|
}
|
|
}
|
|
} |