From e777e3f93b43af4afaa225f0ee3eb13b21b2c2ad Mon Sep 17 00:00:00 2001
From: LotP <rasmus.stilling.pedersen1@gmail.com>
Date: Mon, 15 Jun 2026 02:25:18 +0000
Subject: [PATCH] fix-tests (#140)

- downgrade unicorn to last working version
- update to new cp reg struct system
- remove nonexistent register (used to silently continue)
- fix partial unmap tests
    - InitializeSignalHandler() was moved out of the translator (almost 2.5 years ago), but the test code was never updated to manually call the function as it was changed to do in the real cpu context, so the tests just started failing.
    - by manually initializing the handler we no longer cause tests to fail.

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/140
---
 Directory.Packages.props                      |  2 +-
 src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs |  2 +-
 src/Ryujinx.Tests.Unicorn/UnicornAArch32.cs   | 51 +++++++++++++++++--
 src/Ryujinx.Tests/Memory/PartialUnmaps.cs     |  3 ++
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index a54b2b176..67ed98ed9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -63,6 +63,6 @@
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.15" />
-    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.3" />
+    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs b/src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs
index 299adfbbd..c271636c1 100644
--- a/src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs
+++ b/src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs
@@ -53,7 +53,7 @@ namespace Ryujinx.Cpu.Signal
         public SignalHandlerRangeArray Ranges;
     }
 
-    static class NativeSignalHandler
+    public static class NativeSignalHandler
     {
         private static readonly nint _handlerConfig;
         private static nint _signalHandlerPtr;
diff --git a/src/Ryujinx.Tests.Unicorn/UnicornAArch32.cs b/src/Ryujinx.Tests.Unicorn/UnicornAArch32.cs
index 41b40b177..0af90b184 100644
--- a/src/Ryujinx.Tests.Unicorn/UnicornAArch32.cs
+++ b/src/Ryujinx.Tests.Unicorn/UnicornAArch32.cs
@@ -1,10 +1,23 @@
 using System;
+using System.Runtime.InteropServices;
 using UnicornEngine.Const;
 
 namespace Ryujinx.Tests.Unicorn
 {
     public class UnicornAArch32 : IDisposable
     {
+        struct UcArmCpReg
+        {
+            public uint Cp;
+            public uint Is64;
+            public uint Sec;
+            public uint CRn;
+            public uint CRm;
+            public uint Opc1;
+            public uint Opc2;
+            public uint Val;
+        }
+        
         internal readonly UnicornEngine.Unicorn Uc;
         private bool _isDisposed;
 
@@ -38,7 +51,7 @@ namespace Ryujinx.Tests.Unicorn
 
         public int Fpscr
         {
-            get => (int)GetRegister(Arm.UC_ARM_REG_FPSCR) | ((int)GetRegister(Arm.UC_ARM_REG_FPSCR_NZCV));
+            get => (int)GetRegister(Arm.UC_ARM_REG_FPSCR);
             set => SetRegister(Arm.UC_ARM_REG_FPSCR, (uint)value);
         }
 
@@ -85,8 +98,22 @@ namespace Ryujinx.Tests.Unicorn
         public UnicornAArch32()
         {
             Uc = new UnicornEngine.Unicorn(Common.UC_ARCH_ARM, Common.UC_MODE_LITTLE_ENDIAN);
-
-            SetRegister(Arm.UC_ARM_REG_C1_C0_2, GetRegister(Arm.UC_ARM_REG_C1_C0_2) | 0xf00000);
+            
+            UcArmCpReg reg = new()
+            {
+                Cp = 15,
+                Is64 = 0,
+                Sec = 0,
+                CRn = 13,
+                Opc1 = 0,
+                CRm = 0,
+                Opc2 = 2
+            };
+            
+            GetRegister(Arm.UC_ARM_REG_CP_REG, ref reg);
+            reg.Val |= 0xf00000;
+            SetRegister(Arm.UC_ARM_REG_CP_REG, reg);
+            
             SetRegister(Arm.UC_ARM_REG_FPEXC, 0x40000000);
         }
 
@@ -204,6 +231,17 @@ namespace Ryujinx.Tests.Unicorn
             SetVector(Arm.UC_ARM_REG_D0 + index * 2, value);
         }
 
+        public void GetRegister<T>(int register, ref T obj) where T : unmanaged
+        {
+            Span<T> span = new(ref obj);
+            Span<byte> dataSpan = MemoryMarshal.Cast<T, byte>(span);
+            byte[] data = dataSpan.ToArray();
+            
+            Uc.RegRead(register, data);
+            
+            data.AsSpan().CopyTo(dataSpan);
+        }
+        
         public uint GetRegister(int register)
         {
             byte[] data = new byte[4];
@@ -213,6 +251,13 @@ namespace Ryujinx.Tests.Unicorn
             return BitConverter.ToUInt32(data, 0);
         }
 
+        public void SetRegister<T>(int register, T obj) where T : unmanaged
+        {
+            byte[] data = MemoryMarshal.Cast<T, byte>(new Span<T>(ref obj)).ToArray();
+
+            Uc.RegWrite(register, data);
+        }
+        
         public void SetRegister(int register, uint value)
         {
             byte[] data = BitConverter.GetBytes(value);
diff --git a/src/Ryujinx.Tests/Memory/PartialUnmaps.cs b/src/Ryujinx.Tests/Memory/PartialUnmaps.cs
index 313a85a41..c2eeded4d 100644
--- a/src/Ryujinx.Tests/Memory/PartialUnmaps.cs
+++ b/src/Ryujinx.Tests/Memory/PartialUnmaps.cs
@@ -7,6 +7,7 @@ using Ryujinx.Common.Memory;
 using Ryujinx.Common.Memory.PartialUnmaps;
 using Ryujinx.Cpu;
 using Ryujinx.Cpu.Jit;
+using Ryujinx.Cpu.Signal;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Tracking;
 using System;
@@ -60,6 +61,8 @@ namespace Ryujinx.Tests.Memory
                 new JitMemoryAllocator(),
                 new MockMemoryManager(),
                 AddressTable<ulong>.CreateForArm(true, MemoryManagerType.SoftwarePageTable));
+            
+            NativeSignalHandler.InitializeSignalHandler();
         }
 
         [Test]