mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-30 09:16:00 +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>
41 lines
1.3 KiB
C#
41 lines
1.3 KiB
C#
using ARMeilleure.Signal;
|
|
using Ryujinx.Memory;
|
|
using Ryujinx.Memory.Tracking;
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.Cpu
|
|
{
|
|
class MemoryEhMeilleure : IDisposable
|
|
{
|
|
private delegate bool TrackingEventDelegate(ulong address, ulong size, bool write, bool precise = false);
|
|
|
|
private readonly MemoryBlock _addressSpace;
|
|
private readonly MemoryTracking _tracking;
|
|
private readonly TrackingEventDelegate _trackingEvent;
|
|
|
|
private readonly ulong _baseAddress;
|
|
|
|
public MemoryEhMeilleure(MemoryBlock addressSpace, MemoryTracking tracking)
|
|
{
|
|
_addressSpace = addressSpace;
|
|
_tracking = tracking;
|
|
|
|
_baseAddress = (ulong)_addressSpace.Pointer;
|
|
ulong endAddress = _baseAddress + addressSpace.Size;
|
|
|
|
_trackingEvent = new TrackingEventDelegate(tracking.VirtualMemoryEventEh);
|
|
bool added = NativeSignalHandler.AddTrackedRegion((nuint)_baseAddress, (nuint)endAddress, Marshal.GetFunctionPointerForDelegate(_trackingEvent));
|
|
|
|
if (!added)
|
|
{
|
|
throw new InvalidOperationException("Number of allowed tracked regions exceeded.");
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
NativeSignalHandler.RemoveTrackedRegion((nuint)_baseAddress);
|
|
}
|
|
}
|
|
}
|