mirror of
https://git.ryujinx.app/projects/Kenji-NX.git
synced 2026-10-10 14:59:03 +02:00
misc: Use nint/nuint instead of IntPtr/UIntPtr
This commit is contained in:
@@ -15,7 +15,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
public int IsActive;
|
||||
public nuint RangeAddress;
|
||||
public nuint RangeEndAddress;
|
||||
public IntPtr ActionPointer;
|
||||
public nint ActionPointer;
|
||||
}
|
||||
|
||||
[InlineArray(NativeSignalHandlerGenerator.MaxTrackedRanges)]
|
||||
@@ -55,8 +55,8 @@ namespace Ryujinx.Cpu.Signal
|
||||
|
||||
static class NativeSignalHandler
|
||||
{
|
||||
private static readonly IntPtr _handlerConfig;
|
||||
private static IntPtr _signalHandlerPtr;
|
||||
private static readonly nint _handlerConfig;
|
||||
private static nint _signalHandlerPtr;
|
||||
|
||||
private static MemoryBlock _codeBlock;
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
config = new SignalHandlerConfig();
|
||||
}
|
||||
|
||||
public static void InitializeSignalHandler(Func<IntPtr, IntPtr, IntPtr> customSignalHandlerFactory = null)
|
||||
public static void InitializeSignalHandler(Func<nint, nint, nint> customSignalHandlerFactory = null)
|
||||
{
|
||||
if (_initialized)
|
||||
{
|
||||
@@ -118,7 +118,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
|
||||
if (customSignalHandlerFactory != null)
|
||||
{
|
||||
_signalHandlerPtr = customSignalHandlerFactory(IntPtr.Zero, _signalHandlerPtr);
|
||||
_signalHandlerPtr = customSignalHandlerFactory(nint.Zero, _signalHandlerPtr);
|
||||
}
|
||||
|
||||
WindowsSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);
|
||||
@@ -143,7 +143,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
UnixSignalHandlerRegistration.RegisterExceptionHandler(sigNum, action);
|
||||
}
|
||||
|
||||
private static IntPtr MapCode(ReadOnlySpan<byte> code)
|
||||
private static nint MapCode(ReadOnlySpan<byte> code)
|
||||
{
|
||||
Debug.Assert(_codeBlock == null);
|
||||
|
||||
@@ -161,7 +161,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
return ref Unsafe.AsRef<SignalHandlerConfig>((void*)_handlerConfig);
|
||||
}
|
||||
|
||||
public static bool AddTrackedRegion(nuint address, nuint endAddress, IntPtr action)
|
||||
public static bool AddTrackedRegion(nuint address, nuint endAddress, nint action)
|
||||
{
|
||||
Span<SignalHandlerRange> ranges = GetConfigRef().Ranges;
|
||||
|
||||
|
||||
@@ -18,10 +18,10 @@ namespace Ryujinx.Cpu.Signal
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||
public struct SigAction
|
||||
{
|
||||
public IntPtr sa_handler;
|
||||
public nint sa_handler;
|
||||
public SigSet sa_mask;
|
||||
public int sa_flags;
|
||||
public IntPtr sa_restorer;
|
||||
public nint sa_restorer;
|
||||
}
|
||||
|
||||
[SupportedOSPlatform("android"), StructLayout(LayoutKind.Sequential, Pack = 8)]
|
||||
@@ -55,7 +55,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
private static partial int sigaction(int signum, ref SigActionBionic sigAction, out SigActionBionic oldAction);
|
||||
|
||||
[LibraryImport("libc", SetLastError = true)]
|
||||
private static partial int sigaction(int signum, IntPtr sigAction, out SigAction oldAction);
|
||||
private static partial int sigaction(int signum, nint sigAction, out SigAction oldAction);
|
||||
|
||||
[SupportedOSPlatform("android"), LibraryImport("libc", SetLastError = true)]
|
||||
private static partial int sigaction(int signum, IntPtr sigAction, out SigActionBionic oldAction);
|
||||
@@ -73,7 +73,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
|
||||
if (PlatformInfo.IsBionic)
|
||||
{
|
||||
result = sigaction(SIGSEGV, IntPtr.Zero, out SigActionBionic tmp);
|
||||
result = sigaction(SIGSEGV, nint.Zero, out SigActionBionic tmp);
|
||||
|
||||
old = new SigAction
|
||||
{
|
||||
@@ -85,7 +85,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
}
|
||||
else
|
||||
{
|
||||
result = sigaction(SIGSEGV, IntPtr.Zero, out old);
|
||||
result = sigaction(SIGSEGV, nint.Zero, out old);
|
||||
}
|
||||
|
||||
if (result != 0)
|
||||
@@ -96,7 +96,7 @@ namespace Ryujinx.Cpu.Signal
|
||||
return old;
|
||||
}
|
||||
|
||||
public static SigAction RegisterExceptionHandler(IntPtr action)
|
||||
public static SigAction RegisterExceptionHandler(nint action)
|
||||
{
|
||||
int result;
|
||||
SigAction old;
|
||||
|
||||
@@ -6,17 +6,17 @@ namespace Ryujinx.Cpu.Signal
|
||||
static partial class WindowsSignalHandlerRegistration
|
||||
{
|
||||
[LibraryImport("kernel32.dll")]
|
||||
private static partial IntPtr AddVectoredExceptionHandler(uint first, IntPtr handler);
|
||||
private static partial nint AddVectoredExceptionHandler(uint first, nint handler);
|
||||
|
||||
[LibraryImport("kernel32.dll")]
|
||||
private static partial ulong RemoveVectoredExceptionHandler(IntPtr handle);
|
||||
private static partial ulong RemoveVectoredExceptionHandler(nint handle);
|
||||
|
||||
public static IntPtr RegisterExceptionHandler(IntPtr action)
|
||||
public static nint RegisterExceptionHandler(nint action)
|
||||
{
|
||||
return AddVectoredExceptionHandler(1, action);
|
||||
}
|
||||
|
||||
public static bool RemoveExceptionHandler(IntPtr handle)
|
||||
public static bool RemoveExceptionHandler(nint handle)
|
||||
{
|
||||
return RemoveVectoredExceptionHandler(handle) != 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user