From f664b8428010d986cd6d5f380a17fcd2865fcdc2 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Tue, 5 Aug 2025 18:53:26 -0500 Subject: [PATCH] cpukit/aarch64: Use correct exception targets The sp0 IRQ and lel32 SError exception targets were left in a bad state following the exception rework to avoid use of mutable code pages. The lel32 SError exception is entirely unused by RTEMS. This points the two erroneous exception vectors at the correct targets. --- cpukit/score/cpu/aarch64/aarch64-exception-default.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpukit/score/cpu/aarch64/aarch64-exception-default.S b/cpukit/score/cpu/aarch64/aarch64-exception-default.S index 778b68d3a6..d6d0bdee8d 100644 --- a/cpukit/score/cpu/aarch64/aarch64-exception-default.S +++ b/cpukit/score/cpu/aarch64/aarch64-exception-default.S @@ -143,7 +143,7 @@ curr_el_sp0_sync_get_pc: /* The current PC is now in LR */ /* The exception handler for IRQ exceptions from the current EL using SP0. */ curr_el_sp0_irq: stp x0, lr, [sp, #-0x10]! /* Push x0,lr on to the stack */ - ldr JUMP_REG(0), =aarch64_exception_sp0_synchronous + ldr JUMP_REG(0), =aarch64_exception_sp0_irq JUMP_HANDLER .balign 0x80 /* The exception handler for FIQ exceptions from the current EL using SP0. */ @@ -274,7 +274,7 @@ lower_el_aarch32_fiq: lower_el_aarch32_serror: /* Push x0,lr on to the stack */ stp x0, lr, [sp, #-0x10]! - ldr JUMP_REG(0), =aarch64_exception_lel32_fiq + ldr JUMP_REG(0), =aarch64_exception_lel32_serror JUMP_HANDLER bsp_start_vector_table_end: