mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-24 19:44:21 +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>
49 lines
1.4 KiB
C#
49 lines
1.4 KiB
C#
using System;
|
|
|
|
namespace Ryujinx.HLE.HOS.Kernel.Memory
|
|
{
|
|
class SharedMemoryStorage
|
|
{
|
|
private readonly KernelContext _context;
|
|
private readonly KPageList _pageList;
|
|
private readonly ulong _size;
|
|
|
|
public SharedMemoryStorage(KernelContext context, KPageList pageList)
|
|
{
|
|
_context = context;
|
|
_pageList = pageList;
|
|
_size = pageList.GetPagesCount() * KPageTableBase.PageSize;
|
|
|
|
foreach (KPageNode pageNode in pageList)
|
|
{
|
|
ulong address = pageNode.Address - DramMemoryMap.DramBase;
|
|
ulong size = pageNode.PagesCount * KPageTableBase.PageSize;
|
|
context.Memory.Commit(address, size);
|
|
}
|
|
}
|
|
|
|
public void ZeroFill()
|
|
{
|
|
for (ulong offset = 0; offset < _size; offset += sizeof(ulong))
|
|
{
|
|
GetRef<ulong>(offset) = 0;
|
|
}
|
|
}
|
|
|
|
public ref T GetRef<T>(ulong offset) where T : unmanaged
|
|
{
|
|
if (_pageList.Nodes.Count == 1)
|
|
{
|
|
ulong address = _pageList.Nodes.First.Value.Address - DramMemoryMap.DramBase;
|
|
return ref _context.Memory.GetRef<T>(address + offset);
|
|
}
|
|
|
|
throw new NotImplementedException("Non-contiguous shared memory is not yet supported.");
|
|
}
|
|
|
|
public KPageList GetPageList()
|
|
{
|
|
return _pageList;
|
|
}
|
|
}
|
|
}
|