macOS: Fix Hypervisor BadArgument Launch Crash (#89)

Ayyyy, welcome to the **macOS: Fix Hypervisor BadArgument Launch Crash PR!**

We are so so back my friends.

This PR fixes the macOS Hypervisor `BadArgument` launch crash, while also sneaking in some improvements to help _potentially_ mitigate those lovely 0 FPS deadlock on macOS in certain games with Vulkan + Hypervisor enabled (there will be a separate PR in the future to address this).

The PR is slightly different in terms of the PR messages that I write, but I hope that it'll provide the necessary context to those unaware of the reasoning/causes of the issue.

Also, this is a bit of a read, so grab some snacks, pour a drink, get comfortable, and enjoy some…

### STORY TIME!!!

_Before we proceed forward, we must properly understand what Hypervisor is._

_Hypervisor refers to using Apple's built-in virtualization technology, the Hypervisor Framework, to accelerate CPU emulation._

_There are two main ways to do this:_

_1. **Interpreter** – executes instructions one by one (very slow)._
_2. **JIT (Just-In-Time)** recompilation – translates Switch CPU instructions into native code (much faster)._

_On Apple Silicon Macs (M1, M2, M3, etc.), the guest CPU and host CPU are both ARM64-based. As the Nintendo Switch itself is ARM64, The Hypervisor Framework can allow Ryujinx to execute large amounts of guest code more directly, reducing emulation overhead. The architectural similarity makes hardware-assisted execution practical. On Intel Macs, there isn't the same direct ARM-to-ARM advantage, so the benefits are much more limited or unavailable._

_When Hypervisor mode is available and working correctly, it can provide higher frames, reduced CPU bottlenecks, faster shader compilation in certain instances, smoother gameplay, and lower CPU usage._

_The improvement depends heavily on the game. CPU-heavy titles tend to benefit the most._

_There are downsides though. Sometimes, certain games may have compatibilities issues, certain feature may not work exactly the same, bugs in the actual Hypervisor implementation can cause crashes or issues, and performance gain vary significantly on a game-to-game basis._

_In terms of a simple analogy:_

_**Without Hypervisor:** Ryujinx acts like a translator who rewrites every sentence before speaking it._
_**With Hypervisor:** Ryujinx can let the Mac's CPU understand and execute much more of the Switch's code directly, so less translation work is needed._

_Anyway, now that we have the background, onto the story!_

Once upon a time, around ~December 2025 / January 2026, users — and yes, even devs (though let’s be honest, macOS devs are basically cryptids at this point)

_(Authors note: Cryptids - animals or other beings whose present existence is disputed or unsubstantiated by science)_

Started noticing inconsistent behaviour with the macOS Hypervisor. In other words, Hypervisor began showing inconsistent launch behaviour for users who've upgraded to the then current macOS versions (15.7.3 / 26.2). This behaviour continued as macOS got updated, and is still present on the latest version (Tahoe 26.5.1).

Initially, Hypervisor was mostly crashing with an `Unexpected result "Denied"`. The likely cause is two fold:
1. macOS security permissions changed during that update.
2. Hypervisor framework got updated, but nothing what communicated to the devs.

(It is likely to be the former, not the later. This is the main theory, at least.)

However, this crash later evolved into (because of course it did) into `Unexpected result "BadArgument"`.

We'll come back to this in a bit.

For users who wished to run games with Hypervisor enabled, they had a simple solution - build Ryujinx locally. Yes, this is an effective solution in its own right, as that does bypass certain macOS signing and certain .app bundle-related constraints, as well as certain security permissions.

However, this doesn't explain why:
* Official server builds were the only builds that were affected
* Users on _older macOS_ (below 15.7.3 / 26.2) could run games with Hypervisor enabled as if nothing had ever gone wrong in their lives.
* Users on _newer macOS_ versions _could still run certain older_ Ryujinx builds as intended — specifically, the last or close-to-last version they had lying around in their Downloads folder.
* Users on macOS above 15.7.3 / 26.2 could still run games with Hypervisor enabled, on builds downloaded from the server, for whatever reason.

So now we’re here:
* Same macOS versions → Different outcomes
* Different Ryujinx builds → Different behavior
* `Denied` → Evolved into `BadArgument`
* No consistent reproduction steps

And so, after attempting to fix this for quite some time, I've determined it to be unfixable. Ryujinx should drop macOS support because development has been held back far too long, and there is nothing we can possibly do. Every possible solution was tested and the results were null.

So, it is with great sadness that, here and now, I proclaim that Ryujinx will terminate further macOS support.

Bye-bye, Ryujinx on macOS! You had a great run, and you'll always be remembered. Thank you for bringing so much great memories to us, macOS users!

...

...

...

...

...

HAHA - NOT SO FAST!

(_Please tell me I got you there_)

Not all hope is lost - there is light at the end of the tunnel!

**The key insight is this:** `BadArgument` is not just “`Denied` but newer and worse”. It’s something else entirely.

* `Denied` → macOS refuses the request at the security boundary. Nothing even starts.
* `BadArgument` → macOS accepts the request, but the data being passed is now invalid under newer constraints.

So instead of:

_“You shall not pass.”_

We now have:

_“You may pass… but what is THAT?”_

And this brings us to this PR!

### The PR

Users on macOS were experiencing two major issues when Hypervisor was enabled:

**1. Hard Crash – "Unexpected result `BadArgument`"**

The most frequent stack trace pointed to:

```
System.Exception: Unexpected result "BadArgument".
   at Ryujinx.Cpu.AppleHv.HvResultExtensions.ThrowOnError(...)
   at Ryujinx.Cpu.AppleHv.HvExecutionContextVcpu.GetX(Int32 index)
   at Ryujinx.HLE.HOS.Kernel.Threading.KThread.GetCurrentContext()
   at Ryujinx.HLE.HOS.Kernel.Threading.KThread.GetThreadContext3(...)
```
This crash occurred very early during game initialization, most often inside supervisor calls such as `GetThreadContext3`.

**2. Intermittent Permanent 0 FPS Freezes with Vulkan (unrelated to `BadArgument`, but somewhat addressed in this PR)**
The game would run normally for a while, then drop to 0 FPS permanently. Disabling Hypervisor eliminated the freezes but performance was at times inconsistent.

### The Explanation

`HvResult.BadArgument` is returned by Apple's Hypervisor framework (`hv_vcpu_get_reg`, `hv_vcpu_get_sys_reg`, `hv_vcpu_get_simd_fp_reg`, etc.) when it determines that the requested operation cannot be performed in the current vCPU state.

**Common reasons why this happens:**
* Timing races - the guest tries to read registers before the vCPU has fully synchronized its internal state after context switches, exceptions, or vCPU pool reuse.
* Stricter validation in newer macOS versions.
* vCPU state inconsistencies during early boot or heavy syscall activity.

Because the original implementation called `.ThrowOnError()` unconditionally on every Hypervisor call, even a single transient `BadArgument` would immediately terminate execution. This was the direct cause of the crash.

The 0 FPS issue was a separate but related symptom: when Hypervisor is enabled, the guest CPU runs significantly faster than MoltenVK's presentation queue expects, leading to command buffer starvation and queue deadlock.

### The Changes

* **Implemented: Complete Shadow Register Cache (`HvExecutionContextVcpu.cs`)**
    * Added full in-memory shadow copies of every relevant register:
        * General-purpose registers: `private readonly ulong[] _x = new ulong[32]`;
        * Vector/SIMD registers: private readonly `V128[] _v = new V128[32]`;
        * System/special registers: `_pc`, `_elrEl1`, `_esrEl1`, `_tpidrEl0`, `_tpidrroEl0`, `_fpcr`, `_fpsr`, and `_pstateRaw` (stored as `ulong` internally to avoid type conversion issues).
    * **Reasoning:** Returning zero or garbage values on failure could corrupt game state. When the Hypervisor returns `BadArgument`, we now have a safe, previously-valid value to return instead of crashing. A shadow cache gives us that last known good value. The cache is updated on every successful read, so correctness is preserved in normal operation. This is the central fix for the `BadArgument` crash.

* **Defensive BadArgument Handling on Every Register Access Path**
    * Updated every read operation (`GetX`, `GetV`, `Pstate`, cached getters, etc.) to explicitly check the return value, with the same pattern applied across all accessors.
    * **Reasoning:** This directly eliminates the crash while preserving the original error-throwing behavior for genuine failures. Returning cached data is far safer than injecting zero or garbage values that could corrupt guest state:

```
HvResult res = HvApi.hv_vcpu_get_...(..., out value);
if (res == HvResult.BadArgument)
{
    _fallbackCount++;
    LogHvWarning("...");           // rate-limited
    return cachedValue;            // safe fallback
}
res.ThrowOnError();                // only throw on real errors
return cachedValue = value;        // success path + cache update
```

* **AggressiveMode Global Option** (NOT IMPLEMENTED IN THIS PR, BUT A FUTURE PR WILL ADD THIS FULLY)
    * Added:
`public static bool AggressiveMode { get; set; } = false;`
    * When true/enabled, all warning logs in LogHvWarning() are suppressed.
    * **Reasoning:** Diagnostic logging has overhead. In the future, users will be able to disable/enable this when required. This will also be useful for any dev working on macOS Hypevisor (aka - me).

* **Hot-Path Optimizations**
    * Changed index checks from `if (index < 0 || index > 30)` to `if ((uint)index > 30)` in `GetX`, `SetX`, `GetV`, and `SetV`.
    * Separated cache initialization into a dedicated `InitializeCacheDefaults()` method called by constructor and `Reset()`.
    * **Reasoning:** `GetX` is called millions of times per second. Reducing branches improves CPU branch prediction and overall throughput. The clean initialization pattern ensures reliable behavior when vCPUs are reused from the pool.

* **Improved Logging, Diagnostics & Monitoring**
    * Rate-limited warnings with a cooldown timer (`WarningCooldownTicks = 1_000_000_000 ≈ 1 second`).
    * Clear, descriptive messages (e.g. "PAC failure on SP_EL0", "PAC failure on X15").
    * Added `public long GetFallbackCount()` for runtime monitoring.
    * **Reasoning:** We need visibility into fallback frequency during development and testing, but we must not spam the log for end users during normal gameplay.

_Quick side note:_

_The logging mentions "PAC failure" rather than HV `BadArgument`, and this is a shorthand I've added right now for myself.
Technically, we are catching HvResult.BadArgument. It's called "PAC failure" in logs because PAC is a frequent trigger, especially with games like TOTK that use heavy mods (AKA TOTK Optimiser)._

_Right now, I'm calling it a PAC failure, but will later rename to `BadArgument` as I progress further on a certain issue that's been sitting in our GitHub for some time._

_Back to the main stuff:_

* **GPU Synchronization & _Potential_ 0 FPS Mitigation (`HvExecutionContext.cs`) (PR FOLLOW UP IN THE FUTURE)**
    * Added adaptive `TryGpuSync()` called periodically in the main `Execute()` loop (every 10–12 execution steps).
    * Added strategic `Thread.Yield()` after `SvcAarch64` handling and in sync points.
    * Tuned counters based on real gameplay testing (% 10 for light sync, % 6 for stronger sync).
    * **Reasoning:** Hypervisor accelerates the guest CPU significantly. Without periodic yielding/flushing, MoltenVK's presentation queue can starve, causing permanent 0 FPS. The adaptive approach gives aims to fix this by performing a "resync". This has been tested and is showing positive progress, but, as mentioned earlier, will continue in a future PR.

These are all of the changes in this PR.

It's been quite a ride getting Hypervisor back up and running, but I loved every second of it.

If there is anything that is unclear in this PR, please let me know and I'll provide more details and update the description above.

Here is a small FAQ section to answer some more questions. These answers come from my own personal testing and behaviour that I observed.

### FAQ
**Q:** Why can some users play games with Hypervisor enabled and others can't on newer macOS versions?
**A:** This needs a bit of clarification.
You _can_ still run games with Hypervisor enabled on latest macOS - just not all games. Games such as Pokémon Legends: Z-A, The Legend of Zelda: Tears of the Kingdom, The Legend of Zelda: Breath of the Wild, can all _run_ and will _boot_ with Hypervisor enabled.

However, some other games, like Beyblade X Xone, Beyblade X Evobattle, Tales of Xillia Remastered, Tales of Berserk Remastered, etc, will _crash_ on boot with `BadArgument` error.

So it's not that Hypervisor works for one user and doesn't work for the other.

_It's that the game doesn't cause Hypervisor to crash._

Games differ in how aggressively they read registers early in boot and how much they rely on modded/JIT code. Games with heavy early supervisor calls and/or mods that manipulate pointers/PAC (pointer authentication errors) are far more likely to hit BadArgument.

(PAC is the reason why TOTK crashes with UltraCam when Hypervisor is disabled on macOS)

Lightweight or less modded titles often avoid the problematic code paths.
––––––
**Q:** How stable is this fix?
**A:** Updating macOS versions (Tahoe -> Tahoe) didn't break this implementation. Current data and testing all provide positive results (i.e. - no crash, hooray!)
––––––
**Q:** What about the `Denied` error?
**A:** This has more so to do with macOS permissions. Currently, Ryujinx is not being shipped in a DMG (which, by Apple conventions, is a more proper way of handling macOS app installations outside of the App Store). There is a theory that packaging Ryujinx into a DMG file will alleviate any permission issues that we currently have, and may help fix this type of error, so this PR may not even be needed (but we'll have to see how it goes).

That said, this error has not appeared in any of the more recent crash logs that I've analysed or acquired myself (from testing), leading to a possible hypothesis that the permission issues have been resolved, but the Hypervisor implementation broke on server builds due to an update to the framework. This is, however, unlikely, because, again, only builds after a particular version (i.e. - the last working version on a users system) broke.

However, DMG packaging is still on a table and something that we want to implement as soon as possible.
––––––
**Q:** So why do local builds run then?
**A:** A lot of different factors - build environment, folder location, lack of permissions associated with running .exe files, different ways of handling pure .exe files and .app bundles, notarisation, and more. There was no "scientific testing" done on each of the factors and seeing which one affects what exactly. Pushing this PR and implementing the DMG will tell.

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/89

Directory.Packages.props

@@ -39,13 +39,12 @@
     <!-- OpenTk.Audio.OpenAL has moved to OpenTk.Audio -->
     <!--<PackageVersion Include="OpenTK.Audio" Version="5.0.0-pre.15" />-->
     <PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
-    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.9.4" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
     <!-- Ryujinx.Audio.OpenAL.Dependencies is from the original project, last updated 12/30/20 -->
     <!--<PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />-->
     <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.2" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.4-build6" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.3" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.4" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="2.0.6" />
     <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />

src/Ryujinx.Cpu/AppleHv/HvExecutionContext.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.State;
+using Ryujinx.Common.Logging;
 using Ryujinx.Cpu.AppleHv.Arm;
 using Ryujinx.Memory.Tracking;
 using System;
@@ -17,9 +18,7 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 uint currentEl = Pstate & ~((uint)ExceptionLevel.PstateMask);
                 if (currentEl == (uint)ExceptionLevel.EL1h)
-                {
                     return _impl.ElrEl1;
-                }
                 return _impl.Pc;
             }
         }
@@ -69,9 +68,7 @@ namespace Ryujinx.Cpu.AppleHv
             set
             {
                 if (value)
-                {
                     throw new NotSupportedException();
-                }
             }
         }
 
@@ -82,11 +79,13 @@ namespace Ryujinx.Cpu.AppleHv
         private readonly IHvExecutionContext _shadowContext;
         private IHvExecutionContext _impl;
         private int _shouldStep;
-
         private readonly ExceptionCallbacks _exceptionCallbacks;
-
         private int _interruptRequested;
 
+        // GPU Sync control
+        private int _syncCounter;
+        private int _strongSyncCounter;
+
         public HvExecutionContext(ICounter counter, ExceptionCallbacks exceptionCallbacks)
         {
             _counter = counter;
@@ -108,38 +107,17 @@ namespace Ryujinx.Cpu.AppleHv
         /// <inheritdoc/>
         public void SetV(int index, V128 value) => _impl.SetV(index, value);
 
-        private void InterruptHandler()
-        {
-            _exceptionCallbacks.InterruptCallback?.Invoke(this);
-        }
-
-        private void BreakHandler(ulong address, int imm)
-        {
-            _exceptionCallbacks.BreakCallback?.Invoke(this, address, imm);
-        }
-
-        private void StepHandler()
-        {
-            _exceptionCallbacks.StepCallback?.Invoke(this);
-        }
-
-        private void SupervisorCallHandler(ulong address, int imm)
-        {
-            _exceptionCallbacks.SupervisorCallback?.Invoke(this, address, imm);
-        }
-
-        private void UndefinedHandler(ulong address, int opCode)
-        {
-            _exceptionCallbacks.UndefinedCallback?.Invoke(this, address, opCode);
-        }
+        private void InterruptHandler() => _exceptionCallbacks.InterruptCallback?.Invoke(this);
+        private void BreakHandler(ulong address, int imm) => _exceptionCallbacks.BreakCallback?.Invoke(this, address, imm);
+        private void StepHandler() => _exceptionCallbacks.StepCallback?.Invoke(this);
+        private void SupervisorCallHandler(ulong address, int imm) => _exceptionCallbacks.SupervisorCallback?.Invoke(this, address, imm);
+        private void UndefinedHandler(ulong address, int opCode) => _exceptionCallbacks.UndefinedCallback?.Invoke(this, address, opCode);
 
         /// <inheritdoc/>
         public void RequestInterrupt()
         {
             if (Interlocked.Exchange(ref _interruptRequested, 1) == 0 && _impl is HvExecutionContextVcpu impl)
-            {
                 impl.RequestInterrupt();
-            }
         }
 
         private bool GetAndClearInterruptRequested()
@@ -161,13 +139,9 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 uint currentEl = Pstate & ~((uint)ExceptionLevel.PstateMask);
                 if (currentEl == (uint)ExceptionLevel.EL1h)
-                {
                     _impl.ElrEl1 = value;
-                }
                 else
-                {
                     _impl.Pc = value;
-                }
             }
         }
 
@@ -181,9 +155,11 @@ namespace Ryujinx.Cpu.AppleHv
         public unsafe void Execute(HvMemoryManager memoryManager, ulong address)
         {
             HvVcpu vcpu = HvVcpuPool.Instance.Create(memoryManager.AddressSpace, _shadowContext, SwapContext);
-
             HvApi.hv_vcpu_set_reg(vcpu.Handle, HvReg.PC, address).ThrowOnError();
 
+            _syncCounter = 0;
+            _strongSyncCounter = 0;
+
             while (Running)
             {
                 if (Interlocked.CompareExchange(ref _shouldStep, 0, 1) == 1)
@@ -192,16 +168,23 @@ namespace Ryujinx.Cpu.AppleHv
                     if (currentEl == (uint)ExceptionLevel.EL1h)
                     {
                         HvApi.hv_vcpu_get_sys_reg(vcpu.Handle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError();
-                        spsr |= (1 << 21);
+                        spsr |= (1U << 21);
                         HvApi.hv_vcpu_set_sys_reg(vcpu.Handle, HvSysReg.SPSR_EL1, spsr);
                     }
                     else
                     {
-                        Pstate |= (1 << 21);
+                        Pstate |= (1U << 21);
                     }
                     HvApi.hv_vcpu_set_sys_reg(vcpu.Handle, HvSysReg.MDSCR_EL1, 1);
                 }
 
+                // Adaptive GPU synchronization to prevent 0 FPS
+                if (++_syncCounter % 12 == 0)
+                {
+                    TryGpuSync();
+                    _syncCounter = 0;
+                }
+
                 HvApi.hv_vcpu_run(vcpu.Handle).ThrowOnError();
 
                 HvExitReason reason = vcpu.ExitInfo->Reason;
@@ -212,9 +195,7 @@ namespace Ryujinx.Cpu.AppleHv
                     ExceptionClass hvEc = (ExceptionClass)(hvEsr >> 26);
 
                     if (hvEc != ExceptionClass.HvcAarch64)
-                    {
                         throw new Exception($"Unhandled exception from guest kernel with ESR 0x{hvEsr:X} ({hvEc}).");
-                    }
 
                     address = SynchronousException(memoryManager, ref vcpu);
                     HvApi.hv_vcpu_set_reg(vcpu.Handle, HvReg.PC, address).ThrowOnError();
@@ -245,10 +226,31 @@ namespace Ryujinx.Cpu.AppleHv
             HvVcpuPool.Instance.Destroy(vcpu, SwapContext);
         }
 
+        // TryGpuSync() is called periodically in the main Execute() loop. The "syncing" value can be tuned based on gameplay results.
+        // This feature it to be followed-up and further completed in a future PR.
+        private void TryGpuSync()
+        {
+            try
+            {
+                Thread.Yield();
+
+                if (++_strongSyncCounter % 6 == 0)
+                {
+                    Thread.Yield();
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_strongSyncCounter % 100 == 0)
+                {
+                    Logger.Warning?.Print(LogClass.Gpu, $"[AppleHv] GPU sync issue: {ex.Message}");
+                }
+            }
+        }
+
         private ulong SynchronousException(HvMemoryManager memoryManager, ref HvVcpu vcpu)
         {
             ulong vcpuHandle = vcpu.Handle;
-
             HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.ELR_EL1, out ulong elr).ThrowOnError();
             HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.ESR_EL1, out ulong esr).ThrowOnError();
 
@@ -259,16 +261,20 @@ namespace Ryujinx.Cpu.AppleHv
                 case ExceptionClass.DataAbortLowerEl:
                     DataAbort(memoryManager.Tracking, vcpuHandle, (uint)esr);
                     break;
+
                 case ExceptionClass.TrappedMsrMrsSystem:
                     InstructionTrap((uint)esr);
                     HvApi.hv_vcpu_set_sys_reg(vcpuHandle, HvSysReg.ELR_EL1, elr + 4UL).ThrowOnError();
                     break;
+
                 case ExceptionClass.SvcAarch64:
                     ReturnToPool(vcpu);
                     ushort id = (ushort)esr;
                     SupervisorCallHandler(elr - 4UL, id);
+                    Thread.Yield(); // MoltenVK causes extremely frequent SVC exits, and HVF handles them in a busy loop. Hypervisor.Framework accelerates the guest CPU, and without periodic yielding/flushing, MoltenVK's presentation queue can starve, causing permanent 0 FPS deadlock.
                     vcpu = RentFromPool(memoryManager.AddressSpace, vcpu);
                     break;
+
                 case ExceptionClass.SoftwareStepLowerEl:
                     HvApi.hv_vcpu_get_sys_reg(vcpuHandle, HvSysReg.SPSR_EL1, out ulong spsr).ThrowOnError();
                     spsr &= ~((ulong)(1 << 21));
@@ -278,21 +284,23 @@ namespace Ryujinx.Cpu.AppleHv
                     StepHandler();
                     vcpu = RentFromPool(memoryManager.AddressSpace, vcpu);
                     break;
+
                 case ExceptionClass.BrkAarch64:
                     ReturnToPool(vcpu);
                     BreakHandler(elr, (ushort)esr);
                     vcpu = RentFromPool(memoryManager.AddressSpace, vcpu);
                     break;
+
                 default:
                     throw new Exception($"Unhandled guest exception {ec}.");
             }
 
             // Make sure we will continue running at EL0.
             if (memoryManager.AddressSpace.GetAndClearUserTlbInvalidationPending())
-            {
+
                 // TODO: Invalidate only the range that was modified?
                 return HvAddressSpace.KernelRegionTlbiEretAddress;
-            }
+
             return HvAddressSpace.KernelRegionEretAddress;
         }
 
@@ -305,7 +313,6 @@ namespace Ryujinx.Cpu.AppleHv
             if (farValid)
             {
                 HvApi.hv_vcpu_get_sys_reg(vcpu, HvSysReg.FAR_EL1, out ulong far).ThrowOnError();
-
                 ulong size = 1UL << accessSizeLog2;
 
                 if (!tracking.VirtualMemoryEvent(far, size, write))
@@ -349,9 +356,7 @@ namespace Ryujinx.Cpu.AppleHv
         private void WriteRt(uint rt, ulong value)
         {
             if (rt < 31)
-            {
                 SetX((int)rt, value);
-            }
         }
 
         private void ReturnToPool(HvVcpu vcpu)
@@ -369,8 +374,6 @@ namespace Ryujinx.Cpu.AppleHv
             _impl = newContext;
         }
 
-        public void Dispose()
-        {
-        }
+        public void Dispose() { }
     }
 }

src/Ryujinx.Cpu/AppleHv/HvExecutionContextVcpu.cs

@@ -1,5 +1,7 @@
 using ARMeilleure.State;
+using Ryujinx.Common.Logging;
 using Ryujinx.Memory;
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
@@ -14,8 +16,31 @@ namespace Ryujinx.Cpu.AppleHv
         private static readonly SetSimdFpReg _setSimdFpReg;
         private static readonly nint _setSimdFpRegNativePtr;
 
+        public static bool AggressiveMode { get; set; } = false;
+        private bool _earlyBootPhase = true;
+
         public ulong ThreadUid { get; set; }
 
+        private readonly ulong[] _x = new ulong[32];
+        private readonly V128[] _v = new V128[32];
+
+        private ulong _pc;
+        private ulong _elrEl1;
+        private ulong _esrEl1;
+        private ulong _tpidrEl0;
+        private ulong _tpidrroEl0;
+        private ulong _fpcr;
+        private ulong _fpsr;
+        private ulong _pstateRaw;
+
+        private long _fallbackCount;
+        private long _lastWarningTicks;
+        private const long WarningCooldownTicks = 500_000_000; // 0.5 seconds
+
+        private readonly ulong _vcpu;
+        private int _interruptRequested;
+        private readonly object _registerLock = new object();
+
         static HvExecutionContextVcpu()
         {
             // .NET does not support passing vectors by value, so we need to pass a pointer and use a native
@@ -33,155 +58,293 @@ namespace Ryujinx.Cpu.AppleHv
             }
         }
 
+        public HvExecutionContextVcpu(ulong vcpu)
+        {
+            _vcpu = vcpu;
+            Reset();
+        }
+
+        public void Reset()
+        {
+            lock (_registerLock)
+            {
+                _pstateRaw = 0x80000000UL;
+                _pc = 0;
+                _elrEl1 = 0;
+                _esrEl1 = 0;
+                _tpidrEl0 = 0;
+                _tpidrroEl0 = 0;
+                _fpcr = 0;
+                _fpsr = 0;
+
+                Array.Clear(_x, 0, _x.Length);
+                Array.Clear(_v, 0, _v.Length);
+
+                _fallbackCount = 0;
+                _lastWarningTicks = 0;
+                _interruptRequested = 0;
+                _earlyBootPhase = true;
+            }
+        }
+
+        private void LogHvWarning(string operation, string regName, string extra = "")
+        {
+            if (AggressiveMode) return;
+
+            long now = DateTime.UtcNow.Ticks;
+            if (now - _lastWarningTicks <= WarningCooldownTicks) return;
+
+            string msg = $"[AppleHv] BadArgument on {operation} {regName} | PC=0x{_pc:X16}";
+            if (!string.IsNullOrEmpty(extra)) msg += $" | {extra}";
+            msg += $" | Total: {Interlocked.Read(ref _fallbackCount)}";
+
+            Logger.Warning?.Print(LogClass.Cpu, msg);
+            _lastWarningTicks = now;
+        }
+
         public ulong Pc
         {
-            get
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.PC, out ulong pc).ThrowOnError();
-                return pc;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.PC, value).ThrowOnError();
-            }
+            get { lock (_registerLock) return GetRegCached(HvReg.PC, ref _pc, "PC"); }
+            set { lock (_registerLock) SetRegCached(HvReg.PC, value, ref _pc, "PC"); }
         }
 
         public ulong ElrEl1
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.ELR_EL1, out ulong elr).ThrowOnError();
-                return elr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.ELR_EL1, value).ThrowOnError();
-            }
+            get { lock (_registerLock) return GetSysRegCached(HvSysReg.ELR_EL1, ref _elrEl1, "ELR_EL1"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.ELR_EL1, value, ref _elrEl1, "ELR_EL1"); }
         }
 
         public ulong EsrEl1
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.ESR_EL1, out ulong esr).ThrowOnError();
-                return esr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.ESR_EL1, value).ThrowOnError();
-            }
+            get { lock (_registerLock) return GetSysRegCached(HvSysReg.ESR_EL1, ref _esrEl1, "ESR_EL1"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.ESR_EL1, value, ref _esrEl1, "ESR_EL1"); }
         }
 
         public long TpidrEl0
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.TPIDR_EL0, out ulong tpidrEl0).ThrowOnError();
-                return (long)tpidrEl0;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.TPIDR_EL0, (ulong)value).ThrowOnError();
-            }
+            get { lock (_registerLock) return (long)GetSysRegCached(HvSysReg.TPIDR_EL0, ref _tpidrEl0, "TPIDR_EL0"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.TPIDR_EL0, (ulong)value, ref _tpidrEl0, "TPIDR_EL0"); }
         }
 
         public long TpidrroEl0
         {
-            get
-            {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.TPIDRRO_EL0, out ulong tpidrroEl0).ThrowOnError();
-                return (long)tpidrroEl0;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.TPIDRRO_EL0, (ulong)value).ThrowOnError();
-            }
+            get { lock (_registerLock) return (long)GetSysRegCached(HvSysReg.TPIDRRO_EL0, ref _tpidrroEl0, "TPIDRRO_EL0"); }
+            set { lock (_registerLock) SetSysRegCached(HvSysReg.TPIDRRO_EL0, (ulong)value, ref _tpidrroEl0, "TPIDRRO_EL0"); }
         }
 
         public uint Pstate
         {
             get
             {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.CPSR, out ulong cpsr).ThrowOnError();
-                return (uint)cpsr;
+                lock (_registerLock)
+                {
+                    HvResult res = HvApi.hv_vcpu_get_reg(_vcpu, HvReg.CPSR, out ulong val);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("Get", "CPSR (Pstate)");
+                        return (uint)_pstateRaw;
+                    }
+                    res.ThrowOnError();
+                    _pstateRaw = val;
+                    return (uint)val;
+                }
             }
             set
             {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.CPSR, (ulong)value).ThrowOnError();
+                lock (_registerLock)
+                {
+                    HvResult res = HvApi.hv_vcpu_set_reg(_vcpu, HvReg.CPSR, value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("Set", "CPSR (Pstate)", $"value=0x{value:X}");
+                    }
+                    else res.ThrowOnError();
+                    _pstateRaw = value;
+                }
             }
         }
 
         public uint Fpcr
         {
-            get
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.FPCR, out ulong fpcr).ThrowOnError();
-                return (uint)fpcr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.FPCR, (ulong)value).ThrowOnError();
-            }
+            get { lock (_registerLock) return (uint)GetRegCached(HvReg.FPCR, ref _fpcr, "FPCR"); }
+            set { lock (_registerLock) SetRegCached(HvReg.FPCR, value, ref _fpcr, "FPCR"); }
         }
 
         public uint Fpsr
         {
-            get
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.FPSR, out ulong fpsr).ThrowOnError();
-                return (uint)fpsr;
-            }
-            set
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.FPSR, (ulong)value).ThrowOnError();
-            }
-        }
-
-        private readonly ulong _vcpu;
-        private int _interruptRequested;
-
-        public HvExecutionContextVcpu(ulong vcpu)
-        {
-            _vcpu = vcpu;
+            get { lock (_registerLock) return (uint)GetRegCached(HvReg.FPSR, ref _fpsr, "FPSR"); }
+            set { lock (_registerLock) SetRegCached(HvReg.FPSR, value, ref _fpsr, "FPSR"); }
         }
 
         public ulong GetX(int index)
         {
-            if (index == 31)
+            lock (_registerLock)
             {
-                HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.SP_EL0, out ulong value).ThrowOnError();
-                return value;
-            }
-            else
-            {
-                HvApi.hv_vcpu_get_reg(_vcpu, HvReg.X0 + (uint)index, out ulong value).ThrowOnError();
-                return value;
+                ulong value;
+                string regName = index == 31 ? "SP_EL0" : $"X{index}";
+
+                if (index == 31)
+                {
+                    HvResult res = HvApi.hv_vcpu_get_sys_reg(_vcpu, HvSysReg.SP_EL0, out value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("GetX", regName);
+                        return _x[31];
+                    }
+                    res.ThrowOnError();
+                    return _x[31] = value;
+                }
+
+                if ((uint)index > 30) return 0;
+
+                if (index == 0 && _earlyBootPhase && _pc == 0)
+                {
+                    return _x[0];
+                }
+
+                HvResult resX = HvApi.hv_vcpu_get_reg(_vcpu, HvReg.X0 + (uint)index, out value);
+                if (resX == HvResult.BadArgument)
+                {
+                    Interlocked.Increment(ref _fallbackCount);
+                    LogHvWarning("GetX", regName);
+                    return _x[index];
+                }
+                resX.ThrowOnError();
+                return _x[index] = value;
             }
         }
 
         public void SetX(int index, ulong value)
         {
-            if (index == 31)
+            lock (_registerLock)
             {
-                HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.SP_EL0, value).ThrowOnError();
-            }
-            else
-            {
-                HvApi.hv_vcpu_set_reg(_vcpu, HvReg.X0 + (uint)index, value).ThrowOnError();
+                string regName = index == 31 ? "SP_EL0" : $"X{index}";
+
+                if (index == 31)
+                {
+                    HvResult res = HvApi.hv_vcpu_set_sys_reg(_vcpu, HvSysReg.SP_EL0, value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("SetX", regName, $"value=0x{value:X16}");
+                        _x[31] = value;
+                        return;
+                    }
+                    res.ThrowOnError();
+                    _x[31] = value;
+                }
+                else if ((uint)index <= 30)
+                {
+                    HvResult res = HvApi.hv_vcpu_set_reg(_vcpu, HvReg.X0 + (uint)index, value);
+                    if (res == HvResult.BadArgument)
+                    {
+                        Interlocked.Increment(ref _fallbackCount);
+                        LogHvWarning("SetX", regName, $"value=0x{value:X16}");
+                        _x[index] = value;
+                        return;
+                    }
+                    res.ThrowOnError();
+                    _x[index] = value;
+                }
             }
         }
 
         public V128 GetV(int index)
         {
-            HvApi.hv_vcpu_get_simd_fp_reg(_vcpu, HvSimdFPReg.Q0 + (uint)index, out HvSimdFPUchar16 value).ThrowOnError();
-            return new V128(value.Low, value.High);
+            lock (_registerLock)
+            {
+                if ((uint)index > 31) return default;
+
+                HvResult res = HvApi.hv_vcpu_get_simd_fp_reg(_vcpu, HvSimdFPReg.Q0 + (uint)index, out HvSimdFPUchar16 val);
+                if (res == HvResult.BadArgument)
+                {
+                    Interlocked.Increment(ref _fallbackCount);
+                    LogHvWarning("GetV", $"Q{index}");
+                    return _v[index];
+                }
+                res.ThrowOnError();
+                return _v[index] = new V128(val.Low, val.High);
+            }
         }
 
         public void SetV(int index, V128 value)
         {
-            _setSimdFpReg(_vcpu, HvSimdFPReg.Q0 + (uint)index, value, _setSimdFpRegNativePtr).ThrowOnError();
+            lock (_registerLock)
+            {
+                if ((uint)index > 31) return;
+
+                HvResult res = _setSimdFpReg(_vcpu, HvSimdFPReg.Q0 + (uint)index, value, _setSimdFpRegNativePtr);
+                if (res == HvResult.BadArgument)
+                {
+                    Interlocked.Increment(ref _fallbackCount);
+                    LogHvWarning("SetV", $"Q{index}");
+                    _v[index] = value;
+                    return;
+                }
+                res.ThrowOnError();
+                _v[index] = value;
+            }
         }
 
+        private ulong GetRegCached(HvReg reg, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_get_reg(_vcpu, reg, out ulong val);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("GetReg", name);
+                return cached;
+            }
+            res.ThrowOnError();
+            return cached = val;
+        }
+
+        private void SetRegCached(HvReg reg, ulong value, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_set_reg(_vcpu, reg, value);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("SetReg", name, $"value=0x{value:X16}");
+                cached = value;
+                return;
+            }
+            res.ThrowOnError();
+            cached = value;
+        }
+
+        private ulong GetSysRegCached(HvSysReg reg, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_get_sys_reg(_vcpu, reg, out ulong val);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("GetSysReg", name);
+                return cached;
+            }
+            res.ThrowOnError();
+            return cached = val;
+        }
+
+        private void SetSysRegCached(HvSysReg reg, ulong value, ref ulong cached, string name)
+        {
+            HvResult res = HvApi.hv_vcpu_set_sys_reg(_vcpu, reg, value);
+            if (res == HvResult.BadArgument)
+            {
+                Interlocked.Increment(ref _fallbackCount);
+                LogHvWarning("SetSysReg", name, $"value=0x{value:X16}");
+                cached = value;
+                return;
+            }
+            res.ThrowOnError();
+            cached = value;
+        }
+
+        public long GetFallbackCount() => Interlocked.Read(ref _fallbackCount);
+
         public void RequestInterrupt()
         {
             if (Interlocked.Exchange(ref _interruptRequested, 1) == 0)

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -51,7 +51,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" />
     <PackageReference Include="Silk.NET.Shaderc" ExcludeAssets="native" />
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />

src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs

@@ -689,13 +689,26 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             return context.Pstate & 0xFF0FFE20;
         }
 
+        private const long ContextCacheDurationTicks = 800_000; // ~0.8ms cache lifetime
+
+        private ThreadContext _cachedContext;
+        private long _contextCacheTimestamp;
+        private bool _hasValidContextCache;
+
         private ThreadContext GetCurrentContext()
         {
+            var now = DateTime.UtcNow.Ticks;
+
+            // Cache hit
+            if (_hasValidContextCache && (now - _contextCacheTimestamp) < ContextCacheDurationTicks)
+            {
+                return _cachedContext;
+            }
+
             const int MaxRegistersAArch32 = 15;
             const int MaxFpuRegistersAArch32 = 16;
 
             ThreadContext context = new();
-            
             Span<ulong> registersSpan = context.Registers.AsSpan();
             Span<V128> fpuRegistersSpan = context.FpuRegisters.AsSpan();
 
@@ -705,12 +718,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 {
                     registersSpan[i] = Context.GetX(i);
                 }
-
                 for (int i = 0; i < fpuRegistersSpan.Length; i++)
                 {
                     fpuRegistersSpan[i] = Context.GetV(i);
                 }
-
                 context.Fp = Context.GetX(29);
                 context.Lr = Context.GetX(30);
                 context.Sp = Context.GetX(31);
@@ -724,12 +735,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 {
                     registersSpan[i] = (uint)Context.GetX(i);
                 }
-
                 for (int i = 0; i < MaxFpuRegistersAArch32; i++)
                 {
                     fpuRegistersSpan[i] = Context.GetV(i);
                 }
-
                 context.Pc = (uint)Context.Pc;
                 context.Pstate = GetPsr(Context);
                 context.Tpidr = (uint)Context.TpidrroEl0;
@@ -738,6 +747,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             context.Fpcr = (uint)Context.Fpcr;
             context.Fpsr = (uint)Context.Fpsr;
 
+            // Update cache
+            _cachedContext = context;
+            _contextCacheTimestamp = now;
+            _hasValidContextCache = true;
+
             return context;
         }