From 74248bd35a3578300e7f9ba61b24fe9008877898 Mon Sep 17 00:00:00 2001
From: CamilleLaVey <camillelavey99@gmail.com>
Date: Tue, 10 Mar 2026 03:20:05 -0400
Subject: [PATCH] Removing remanents of NCE changes to previous state

---
 src/core/arm/nce/interpreter_visitor.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/arm/nce/interpreter_visitor.cpp b/src/core/arm/nce/interpreter_visitor.cpp
index b5f89510ca..be6fee8613 100644
--- a/src/core/arm/nce/interpreter_visitor.cpp
+++ b/src/core/arm/nce/interpreter_visitor.cpp
@@ -765,8 +765,8 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, m
                                                  fpsimd_context* fpsimd_context) {
     std::span<u64, 31> regs(reinterpret_cast<u64*>(context->regs), 31);
     std::span<u128, 32> vregs(reinterpret_cast<u128*>(fpsimd_context->vregs), 32);
-    u64 sp = context->sp;
-    const u64 pc = context->pc;
+    u64& sp = *reinterpret_cast<u64*>(&context->sp);
+    const u64& pc = *reinterpret_cast<u64*>(&context->pc);
 
     InterpreterVisitor visitor(memory, regs, vregs, sp, pc);
     u32 instruction = memory.Read32(pc);
@@ -774,7 +774,6 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, m
 
     auto decoder = Dynarmic::A64::Decode<VisitorBase>(instruction);
     was_executed = decoder.get().call(visitor, instruction);
-    context->sp = sp;
     return was_executed ? std::optional<u64>(pc + 4) : std::nullopt;
 }