diff options
| author | Mary <me@thog.eu> | 2021-12-08 22:24:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 18:24:26 -0300 |
| commit | 00c69f2098bf78cecefd897599c95f68450d88a1 (patch) | |
| tree | 7a8672d0e9edd0924e1d8b72a2996a36443c01f1 /Ryujinx.Memory/MemoryManagementUnix.cs | |
| parent | bc4e70b6fafc333c91caf5a94e49ece339dccd80 (diff) | |
Remove usage of Mono.Posix.NETStandard accross all projects (#2906)
* Remove usage of Mono.Posix.NETStandard in Ryujinx project
* Remove usage of Mono.Posix.NETStandard in ARMeilleure project
* Remove usage of Mono.Posix.NETStandard in Ryujinx.Memory project
* Address gdkchan's comments
Diffstat (limited to 'Ryujinx.Memory/MemoryManagementUnix.cs')
| -rw-r--r-- | Ryujinx.Memory/MemoryManagementUnix.cs | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/Ryujinx.Memory/MemoryManagementUnix.cs b/Ryujinx.Memory/MemoryManagementUnix.cs index edfc98dd..9e3ec48a 100644 --- a/Ryujinx.Memory/MemoryManagementUnix.cs +++ b/Ryujinx.Memory/MemoryManagementUnix.cs @@ -1,10 +1,11 @@ -using Mono.Unix.Native; -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Runtime.Versioning; +using static Ryujinx.Memory.MemoryManagerUnixHelper; + namespace Ryujinx.Memory { [SupportedOSPlatform("linux")] @@ -18,15 +19,6 @@ namespace Ryujinx.Memory public IntPtr SourcePointer; } - [DllImport("libc", SetLastError = true)] - public static extern IntPtr mremap(IntPtr old_address, ulong old_size, ulong new_size, MremapFlags flags, IntPtr new_address); - - [DllImport("libc", SetLastError = true)] - public static extern int madvise(IntPtr address, ulong size, int advice); - - private const int MADV_DONTNEED = 4; - private const int MADV_REMOVE = 9; - private static readonly List<UnixSharedMemory> _sharedMemory = new List<UnixSharedMemory>(); private static readonly ConcurrentDictionary<IntPtr, ulong> _sharedMemorySource = new ConcurrentDictionary<IntPtr, ulong>(); private static readonly ConcurrentDictionary<IntPtr, ulong> _allocations = new ConcurrentDictionary<IntPtr, ulong>(); @@ -47,7 +39,7 @@ namespace Ryujinx.Memory if (shared) { - flags |= MmapFlags.MAP_SHARED | (MmapFlags)0x80000; + flags |= MmapFlags.MAP_SHARED | MmapFlags.MAP_UNLOCKED; } else { @@ -59,7 +51,7 @@ namespace Ryujinx.Memory flags |= MmapFlags.MAP_NORESERVE; } - IntPtr ptr = Syscall.mmap(IntPtr.Zero, size, prot, flags, -1, 0); + IntPtr ptr = mmap(IntPtr.Zero, size, prot, flags, -1, 0); if (ptr == new IntPtr(-1L)) { @@ -77,7 +69,7 @@ namespace Ryujinx.Memory public static bool Commit(IntPtr address, ulong size) { - bool success = Syscall.mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) == 0; + bool success = mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) == 0; if (success) { @@ -87,7 +79,7 @@ namespace Ryujinx.Memory { ulong sharedAddress = ((ulong)address - (ulong)shared.SourcePointer) + (ulong)shared.Pointer; - if (Syscall.mprotect((IntPtr)sharedAddress, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) != 0) + if (mprotect((IntPtr)sharedAddress, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) != 0) { return false; } @@ -108,16 +100,16 @@ namespace Ryujinx.Memory } // Must be writable for madvise to work properly. - Syscall.mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE); + mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE); madvise(address, size, isShared ? MADV_REMOVE : MADV_DONTNEED); - return Syscall.mprotect(address, size, MmapProts.PROT_NONE) == 0; + return mprotect(address, size, MmapProts.PROT_NONE) == 0; } public static bool Reprotect(IntPtr address, ulong size, MemoryPermission permission) { - return Syscall.mprotect(address, size, GetProtection(permission)) == 0; + return mprotect(address, size, GetProtection(permission)) == 0; } private static MmapProts GetProtection(MemoryPermission permission) @@ -138,7 +130,7 @@ namespace Ryujinx.Memory { if (_allocations.TryRemove(address, out ulong size)) { - return Syscall.munmap(address, size) == 0; + return munmap(address, size) == 0; } return false; @@ -146,14 +138,14 @@ namespace Ryujinx.Memory public static IntPtr Remap(IntPtr target, IntPtr source, ulong size) { - int flags = (int)MremapFlags.MREMAP_MAYMOVE; + int flags = 1; if (target != IntPtr.Zero) { flags |= 2; } - IntPtr result = mremap(source, 0, size, (MremapFlags)(flags), target); + IntPtr result = mremap(source, 0, size, flags, target); if (result == IntPtr.Zero) { |