owen/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryubing/Ryujinx.git synced 2026-02-12 15:37:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

misc: Replace references to IntPtr/UIntPtr with nint/nuint + code cleanups.

Browse Source
This commit is contained in:
Evan Husted
2024-10-26 08:46:41 -05:00
parent a09d314817
commit dfb4854d19
172 changed files with 902 additions and 914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Ryujinx.Memory/MemoryManagerUnixHelper.cs
View File

@@ -44,7 +44,7 @@ namespace Ryujinx.Memory
O_SYNC = 256,
}
public const IntPtr MAP_FAILED = -1;
public const nint MAP_FAILED = -1;
private const int MAP_ANONYMOUS_LINUX_GENERIC = 0x20;
private const int MAP_NORESERVE_LINUX_GENERIC = 0x4000;
@@ -57,37 +57,37 @@ namespace Ryujinx.Memory
public const int MADV_REMOVE = 9;
[LibraryImport("libc", EntryPoint = "mmap", SetLastError = true)]
private static partial IntPtr Internal_mmap(IntPtr address, ulong length, MmapProts prot, int flags, int fd, long offset);
private static partial nint Internal_mmap(nint address, ulong length, MmapProts prot, int flags, int fd, long offset);
[LibraryImport("libc", SetLastError = true)]
public static partial int mprotect(IntPtr address, ulong length, MmapProts prot);
public static partial int mprotect(nint address, ulong length, MmapProts prot);
[LibraryImport("libc", SetLastError = true)]
public static partial int munmap(IntPtr address, ulong length);
public static partial int munmap(nint address, ulong length);
[LibraryImport("libc", SetLastError = true)]
public static partial IntPtr mremap(IntPtr old_address, ulong old_size, ulong new_size, int flags, IntPtr new_address);
public static partial nint mremap(nint old_address, ulong old_size, ulong new_size, int flags, nint new_address);
[LibraryImport("libc", SetLastError = true)]
public static partial int madvise(IntPtr address, ulong size, int advice);
public static partial int madvise(nint address, ulong size, int advice);
[LibraryImport("libc", SetLastError = true)]
public static partial int mkstemp(IntPtr template);
public static partial int mkstemp(nint template);
[LibraryImport("libc", SetLastError = true)]
public static partial int unlink(IntPtr pathname);
public static partial int unlink(nint pathname);
[LibraryImport("libc", SetLastError = true)]
public static partial int ftruncate(int fildes, IntPtr length);
public static partial int ftruncate(int fildes, nint length);
[LibraryImport("libc", SetLastError = true)]
public static partial int close(int fd);
[LibraryImport("libc", SetLastError = true)]
public static partial int shm_open(IntPtr name, int oflag, uint mode);
public static partial int shm_open(nint name, int oflag, uint mode);
[LibraryImport("libc", SetLastError = true)]
public static partial int shm_unlink(IntPtr name);
public static partial int shm_unlink(nint name);
private static int MmapFlagsToSystemFlags(MmapFlags flags)
{
@@ -164,7 +164,7 @@ namespace Ryujinx.Memory
return result;
}
public static IntPtr Mmap(IntPtr address, ulong length, MmapProts prot, MmapFlags flags, int fd, long offset)
public static nint Mmap(nint address, ulong length, MmapProts prot, MmapFlags flags, int fd, long offset)
{
return Internal_mmap(address, length, prot, MmapFlagsToSystemFlags(flags), fd, offset);
}