Merge upstream Atmosphere master into boot-storage

Fix fpu registers not being restored when thread switched out during user exception handler (#2909 )
2026-11-09 20:13:15 +01:00 · 2026-11-07 21:32:25 +00:00
1 changed files with 4 additions and 4 deletions
@@ -90,10 +90,10 @@ _ZN3ams4kern10KScheduler12ScheduleImplEv:
    /* We have a 64-bit fpu. */

    /* If we're in a usermode exception, we need to save the caller-save fpu registers. */
-    tbz    w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_IN_USERMODE_EXCEPTION_HANDLER), 2f
+    tbnz   w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_IN_USERMODE_EXCEPTION_HANDLER), 2f

    /* If we're in an SVC (and not a usermode exception), we only need to save the callee-save fpu registers. */
-    tbz    w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_CALLING_SVC), 3f
+    tbnz   w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_CALLING_SVC), 3f

 2:  /* Save the 64-bit caller-save fpu registers. */
    ldr    x6, [x2, #(THREAD_STACK_PARAMETERS_CALLER_SAVE_FPU_REGISTERS)]
@@ -120,10 +120,10 @@ _ZN3ams4kern10KScheduler12ScheduleImplEv:
 4:  /* We have a 32-bit fpu. */

    /* If we're in a usermode exception, we need to save the caller-save fpu registers. */
-    tbz    w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_IN_USERMODE_EXCEPTION_HANDLER), 5f
+    tbnz   w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_IN_USERMODE_EXCEPTION_HANDLER), 5f

    /* If we're in an SVC (and not a usermode exception), we only need to save the callee-save fpu registers. */
-    tbz    w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_CALLING_SVC), 6f
+    tbnz   w4, #(THREAD_EXCEPTION_FLAG_BIT_INDEX_IS_CALLING_SVC), 6f

 5:  /* Save the 32-bit caller-save fpu registers. */
    ldr    x6, [x2, #(THREAD_STACK_PARAMETERS_CALLER_SAVE_FPU_REGISTERS)]
Author	SHA1	Message	Date
niklascfw	8adf9022af	Merge upstream Atmosphere master into boot-storage	2026-11-09 20:13:15 +01:00
saad-script	6bfe5b8b26	Fix fpu registers not being restored when thread switched out during user exception handler (#2909 )	2026-11-07 21:32:25 +00:00