From 325ae300675b858f528bff23598958b8e9a3a494 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 27 Jul 2021 14:15:21 -0700 Subject: [PATCH] kern: fix spsr register in RestoreContext --- .../source/arch/arm64/svc/kern_svc_exception_asm.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_exception_asm.s b/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_exception_asm.s index b6caa3799..ef65fafb6 100644 --- a/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_exception_asm.s +++ b/libraries/libmesosphere/source/arch/arm64/svc/kern_svc_exception_asm.s @@ -92,7 +92,7 @@ _ZN3ams4kern3svc14RestoreContextEm: #if defined(MESOSPHERE_ENABLE_HARDWARE_SINGLE_STEP) /* Since we're returning from an exception, set SPSR.SS so that we advance an instruction if single-stepping. */ - orr x22, x22, #(1 << 21) + orr x10, x10, #(1 << 21) #endif msr sp_el0, x8