nrf_sdh: Update irq forwarding for compact vector table

Softdevice no longer stores the full vector table. Instead
it gived the offsets where the relevant handlers are stored.

Signed-off-by: Herman Berget <[email protected]>

Author: hermabe

subsys/softdevice_handler/irq_forward.s

@@ -18,6 +18,7 @@
     .arch armv8-m.main
 
 #include "irq_connect.h"
+#include "nrf_sd_isr_vectors.h"
 
     .section .text.STACK_INTERRUPTS, "x"
 
@@ -48,11 +49,8 @@ ConsumeOrForwardIRQ:
     .globl  SVC_Handler
     .type   SVC_Handler, %function
 SVC_Handler:
+    LDR   R0, =SOFTDEVICE_SVC_HANDLER_OFFSET
 ForwardIRQ_ForwardToSoftDevice:
-    /* Fetch current exception number */
-    MRS   R0, IPSR
-    /* Get offset into exception vector (multiplying by 4) */
-    LSLS  R0, R0, #2
     /* SoftDevice interrupt vector is located in softdevice_vector_forward_address */
     LDR   R1, =softdevice_vector_forward_address
     LDR   R1, [R1]
@@ -70,10 +68,7 @@ ForwardIRQ_ForwardToSoftDevice:
     .globl  CallSoftDeviceResetHandler
     .type   CallSoftDeviceResetHandler, %function
 CallSoftDeviceResetHandler:
-    /* Fetch current exception number */
-    MOV   R0, #1
-    /* Get offset into exception vector (multiplying by 4) */
-    LSLS  R0, R0, #2
+    LDR   R0, =SOFTDEVICE_RESET_HANDLER_OFFSET
     /* SoftDevice interrupt vector is located in softdevice_vector_forward_address */
     LDR   R1, =softdevice_vector_forward_address
     LDR   R1, [R1]
@@ -92,6 +87,7 @@ CallSoftDeviceResetHandler:
     .type HardFault_Handler, "function"
 HardFault_Handler:
     LDR   R3, =C_HardFault_Handler
+    LDR   R0, =SOFTDEVICE_HARDFAULT_HANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -102,6 +98,7 @@ HardFault_Handler:
     .type CLOCK_POWER_IRQHandler, "function"
 CLOCK_POWER_IRQHandler:
     LDR   R3, =C_POWER_CLOCK_Handler
+    LDR   R0, =SOFTDEVICE_CLOCK_POWER_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -112,6 +109,7 @@ CLOCK_POWER_IRQHandler:
     .type RADIO_0_IRQHandler, "function"
 RADIO_0_IRQHandler:
     LDR   R3, =C_RADIO_Handler
+    LDR   R0, =SOFTDEVICE_RADIO_0_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -122,6 +120,7 @@ RADIO_0_IRQHandler:
     .type TIMER10_IRQHandler, "function"
 TIMER10_IRQHandler:
     LDR   R3, =C_TIMER0_Handler
+    LDR   R0, =SOFTDEVICE_TIMER10_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -132,6 +131,7 @@ TIMER10_IRQHandler:
     .type GRTC_3_IRQHandler, "function"
 GRTC_3_IRQHandler:
     LDR   R3, =C_RTC0_Handler
+    LDR   R0, =SOFTDEVICE_GRTC_3_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -142,6 +142,7 @@ GRTC_3_IRQHandler:
     .type CRACEN_IRQHandler, "function"
 CRACEN_IRQHandler:
     LDR   R3, =C_RNG_Handler
+    LDR   R0, =SOFTDEVICE_CRACEN_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -152,6 +153,7 @@ CRACEN_IRQHandler:
     .type ECB00_IRQHandler, "function"
 ECB00_IRQHandler:
     LDR   R3, =C_ECB_Handler
+    LDR   R0, =SOFTDEVICE_ECB00_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -162,6 +164,7 @@ ECB00_IRQHandler:
     .type AAR00_CCM00_IRQHandler, "function"
 AAR00_CCM00_IRQHandler:
     LDR   R3, =C_CCM_Handler
+    LDR   R0, =SOFTDEVICE_AAR00_CCM00_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
@@ -172,20 +175,9 @@ AAR00_CCM00_IRQHandler:
     .type SWI00_IRQHandler, "function"
 SWI00_IRQHandler:
     LDR   R3, =C_SIGNALLING_Handler
+    LDR   R0, =SOFTDEVICE_SWI00_IRQHANDLER_OFFSET
     LDR   R1, =ConsumeOrForwardIRQ
     BX    R1
 
-#ifdef INCLUDE_FEATURE_MWU
-    .thumb
-    .thumb_func
-    .align 1
-    .global MWU_IRQHandler
-    .type MWU_IRQHandler, "function"FEATURE_MWU
-MWU_IRQHandler:
-    LDR   R3, =C_MWU_Handler
-    LDR   R1, =ConsumeOrForwardIRQ
-    BX    R1
-#endif
-
     .balign
     .end   /* End of file */