guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

add android bionic nce support

Browse Source
This commit is contained in:
Emmanuel Hansen 2023-07-04 09:20:14 +00:00
parent 44551a0409
commit 9c510fec3e
4 changed files with 120 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ryujinx.Cpu/Nce/NceThreadPal.cs
View File

@ -11,7 +11,7 @@ namespace Ryujinx.Cpu.Nce
public static IntPtr GetCurrentThreadHandle() public static IntPtr GetCurrentThreadHandle()
{ {
if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || OperatingSystem.IsAndroid()) if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS() || Ryujinx.Common.SystemInfo.SystemInfo.IsBionic)
{ {
return NceThreadPalUnix.GetCurrentThreadHandle(); return NceThreadPalUnix.GetCurrentThreadHandle();
} }
@ -23,14 +23,14 @@ namespace Ryujinx.Cpu.Nce
public static void SuspendThread(IntPtr handle) public static void SuspendThread(IntPtr handle)
{ {
if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS()) if (Ryujinx.Common.SystemInfo.SystemInfo.IsBionic)
{
NceThreadPalUnix.SuspendThread(handle);
}
else if (OperatingSystem.IsAndroid())
{ {
NceThreadPalAndroid.SuspendThread(handle); NceThreadPalAndroid.SuspendThread(handle);
} }
else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
{
NceThreadPalUnix.SuspendThread(handle);
}
else else
{ {
throw new PlatformNotSupportedException(); throw new PlatformNotSupportedException();

87
src/Ryujinx.Cpu/Signal/AndroidSignalHandlerRegistration.cs Normal file
View File

@ -0,0 +1,87 @@
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Cpu.Signal
{
static class AndroidSignalHandlerRegistration
{
[StructLayout(LayoutKind.Sequential, Pack = 8)]
public unsafe struct SigSet
{
fixed long sa_mask[16];
}
[StructLayout(LayoutKind.Sequential, Pack = 8)]
public struct SigAction
{
public int sa_flags;
public IntPtr sa_handler;
public SigSet sa_mask;
public IntPtr sa_restorer;
}
private const int SIGSEGV = 11;
private const int SA_SIGINFO = 0x00000004;
[DllImport("libc", SetLastError = true)]
private static extern int sigaction(int signum, ref SigAction sigAction, out SigAction oldAction);
[DllImport("libc", SetLastError = true)]
private static extern int sigaction(int signum, IntPtr sigAction, out SigAction oldAction);
[DllImport("libc", SetLastError = true)]
private static extern int sigemptyset(ref SigSet set);
public static SigAction GetSegfaultExceptionHandler()
{
int result = sigaction(SIGSEGV, IntPtr.Zero, out SigAction old);
if (result != 0)
{
throw new InvalidOperationException($"Could not get SIGSEGV sigaction. Error: {result}");
}
return old;
}
public static SigAction RegisterExceptionHandler(IntPtr action, int userSignal = -1)
{
SigAction sig = new SigAction
{
sa_handler = action,
sa_flags = SA_SIGINFO
};
sigemptyset(ref sig.sa_mask);
int result = sigaction(SIGSEGV, ref sig, out SigAction old);
if (result != 0)
{
throw new InvalidOperationException($"Could not register SIGSEGV sigaction. Error: {result}");
}
if (userSignal != -1)
{
result = sigaction(userSignal, ref sig, out SigAction oldu);
if (oldu.sa_handler != IntPtr.Zero)
{
throw new InvalidOperationException($"SIG{userSignal} is already in use.");
}
if (result != 0)
{
throw new InvalidOperationException($"Could not register SIG{userSignal} sigaction. Error: {result}");
}
}
return old;
}
public static bool RestoreExceptionHandler(SigAction oldAction)
{
return sigaction(SIGSEGV, ref oldAction, out SigAction _) == 0;
}
}
}

20
src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs
View File

@ -100,13 +100,25 @@ namespace Ryujinx.Cpu.Signal
if (customSignalHandlerFactory != null) if (customSignalHandlerFactory != null)
{ {
_signalHandlerPtr = customSignalHandlerFactory(UnixSignalHandlerRegistration.GetSegfaultExceptionHandler().sa_handler, _signalHandlerPtr); _signalHandlerPtr = customSignalHandlerFactory(Ryujinx.Common.SystemInfo.SystemInfo.IsAndroid() ?
AndroidSignalHandlerRegistration.GetSegfaultExceptionHandler().sa_handler :
UnixSignalHandlerRegistration.GetSegfaultExceptionHandler().sa_handler, _signalHandlerPtr);
} }
var old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr, userSignal); if (Ryujinx.Common.SystemInfo.SystemInfo.IsAndroid())
{
var old = AndroidSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr, userSignal);
config.UnixOldSigaction = (nuint)(ulong)old.sa_handler; config.UnixOldSigaction = (nuint)(ulong)old.sa_handler;
config.UnixOldSigaction3Arg = old.sa_flags & 4; config.UnixOldSigaction3Arg = old.sa_flags & 4;
}
else
{
var old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr, userSignal);
config.UnixOldSigaction = (nuint)(ulong)old.sa_handler;
config.UnixOldSigaction3Arg = old.sa_flags & 4;
}
} }
else else
{ {

22
src/Ryujinx.Cpu/Signal/UnixSignalHandlerRegistration.cs
View File

@ -148,20 +148,20 @@ namespace Ryujinx.Cpu.Signal
throw new InvalidOperationException($"Could not register SIGBUS sigaction. Error: {result}"); throw new InvalidOperationException($"Could not register SIGBUS sigaction. Error: {result}");
} }
} }
}
if (userSignal != -1) if (userSignal != -1)
{
result = sigaction(userSignal, ref sig, out SigAction oldu);
if (oldu.sa_handler != IntPtr.Zero)
{ {
throw new InvalidOperationException($"SIG{userSignal} is already in use."); result = sigaction(userSignal, ref sig, out SigAction oldu);
}
if (result != 0) if (oldu.sa_handler != IntPtr.Zero)
{ {
throw new InvalidOperationException($"Could not register SIG{userSignal} sigaction. Error: {result}"); throw new InvalidOperationException($"SIG{userSignal} is already in use.");
}
if (result != 0)
{
throw new InvalidOperationException($"Could not register SIG{userSignal} sigaction. Error: {result}");
}
} }
} }