Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[nce] handles duplicate NCE interrupts (#4530)

xbzk5239cbe2a78d
diff --git a/src/core/arm/nce/arm_nce.cpp b/src/core/arm/nce/arm_nce.cpp
index 63d5638fce..438dd4d981 100644
--- a/src/core/arm/nce/arm_nce.cpp
+++ b/src/core/arm/nce/arm_nce.cpp
@@ -369,8 +369,8 @@ void ArmNce::SetContext(const Kernel::Svc::ThreadContext& ctx) {
}
void ArmNce::SignalInterrupt(Kernel::KThread* thread) {
- // Add break loop condition.
- m_guest_ctx.esr_el1.fetch_or(static_cast<u64>(HaltReason::BreakLoop));
+ constexpr u64 break_loop = static_cast<u64>(HaltReason::BreakLoop);
+ if ((m_guest_ctx.esr_el1.fetch_or(break_loop) & break_loop) != 0) return;
auto* params = &thread->GetNativeExecutionParameters();
LockThreadParameters(params);