diff options
-rw-r--r-- | lib/aarch64/exception_stubs.S | 32 | ||||
-rw-r--r-- | tftf/framework/aarch64/exceptions.S | 34 |
2 files changed, 33 insertions, 33 deletions
diff --git a/lib/aarch64/exception_stubs.S b/lib/aarch64/exception_stubs.S index d418451ae..1d243de1b 100644 --- a/lib/aarch64/exception_stubs.S +++ b/lib/aarch64/exception_stubs.S @@ -19,19 +19,19 @@ .endm vector_base exception_stubs -vector_entry_spin SynchronousExceptionSP0 -vector_entry_spin IrqSP0 -vector_entry_spin FiqSP0 -vector_entry_spin SErrorSP0 -vector_entry_spin SynchronousExceptionSPx -vector_entry_spin IrqSPx -vector_entry_spin FiqSPx -vector_entry_spin SErrorSPx -vector_entry_spin SynchronousExceptionA64 -vector_entry_spin IrqA64 -vector_entry_spin FiqA64 -vector_entry_spin SErrorA64 -vector_entry_spin SynchronousExceptionA32 -vector_entry_spin IrqA32 -vector_entry_spin FiqA32 -vector_entry_spin SErrorA32 +vector_entry_spin sync_exception_sp_el0 +vector_entry_spin irq_sp_el0 +vector_entry_spin fiq_sp_el0 +vector_entry_spin serror_sp_el0 +vector_entry_spin sync_exception_sp_elx +vector_entry_spin irq_sp_elx +vector_entry_spin fiq_sp_elx +vector_entry_spin serror_sp_elx +vector_entry_spin sync_exception_aarch64 +vector_entry_spin irq_aarch64 +vector_entry_spin fiq_aarch64 +vector_entry_spin serror_aarch64 +vector_entry_spin sync_exception_aarch32 +vector_entry_spin irq_aarch32 +vector_entry_spin fiq_aarch32 +vector_entry_spin serror_aarch32 diff --git a/tftf/framework/aarch64/exceptions.S b/tftf/framework/aarch64/exceptions.S index 677b30fe9..218cca3b4 100644 --- a/tftf/framework/aarch64/exceptions.S +++ b/tftf/framework/aarch64/exceptions.S @@ -23,38 +23,38 @@ vector_base tftf_vector /* * Current EL with SP0 : 0x0 - 0x200. */ -unhandled_exception SynchronousExceptionSP0 -unhandled_exception IrqSP0 -unhandled_exception FiqSP0 -unhandled_exception SErrorSP0 +unhandled_exception sync_exception_sp_el0 +unhandled_exception irq_sp_el0 +unhandled_exception fiq_sp_el0 +unhandled_exception serror_sp_el0 /* * Current EL with SPx : 0x200 - 0x400. */ -unhandled_exception SynchronousExceptionSPx +unhandled_exception sync_exception_sp_elx -vector_entry IrqSPx +vector_entry irq_sp_elx b irq_vector_entry -end_vector_entry IrqSPx +end_vector_entry irq_sp_elx -unhandled_exception FiqSPx -unhandled_exception SErrorSPx +unhandled_exception fiq_sp_elx +unhandled_exception serror_sp_elx /* * Lower EL using AArch64 : 0x400 - 0x600. */ -unhandled_exception SynchronousExceptionA64 -unhandled_exception IrqA64 -unhandled_exception FiqA64 -unhandled_exception SErrorA64 +unhandled_exception sync_exception_aarch64 +unhandled_exception irq_aarch64 +unhandled_exception fiq_aarch64 +unhandled_exception serror_aarch64 /* * Lower EL using AArch32 : 0x600 - 0x800. */ -unhandled_exception SynchronousExceptionA32 -unhandled_exception IrqA32 -unhandled_exception FiqA32 -unhandled_exception SErrorA32 +unhandled_exception sync_exception_aarch32 +unhandled_exception irq_aarch32 +unhandled_exception fiq_aarch32 +unhandled_exception serror_aarch32 .macro save_gp_regs stp x0, x1, [sp, #0x0] |