diff options
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/cpu/arm/arm_exc_abort.S | 16 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/rtems/score/armv4.h | 14 |
2 files changed, 17 insertions, 13 deletions
diff --git a/cpukit/score/cpu/arm/arm_exc_abort.S b/cpukit/score/cpu/arm/arm_exc_abort.S index 59ab5d2988..183773d64e 100644 --- a/cpukit/score/cpu/arm/arm_exc_abort.S +++ b/cpukit/score/cpu/arm/arm_exc_abort.S @@ -30,11 +30,11 @@ .extern rtems_fatal_error_occurred -.globl arm_exc_data_abort_set_handler -.globl arm_exc_data_abort +.globl _ARMV4_Exception_data_abort_set_handler +.globl _ARMV4_Exception_data_abort -.globl arm_exc_prefetch_abort_set_handler -.globl arm_exc_prefetch_abort +.globl _ARMV4_Exception_prefetch_abort_set_handler +.globl _ARMV4_Exception_prefetch_abort .section ".bss" @@ -50,7 +50,7 @@ prefetch_abort_handler: .thumb_func #endif -arm_exc_data_abort_set_handler: +_ARMV4_Exception_data_abort_set_handler: ldr r1, =data_abort_handler str r0, [r1] #ifdef __thumb__ @@ -63,7 +63,7 @@ arm_exc_data_abort_set_handler: .thumb_func #endif -arm_exc_prefetch_abort_set_handler: +_ARMV4_Exception_prefetch_abort_set_handler: ldr r1, =prefetch_abort_handler str r0, [r1] #ifdef __thumb__ @@ -74,7 +74,7 @@ arm_exc_prefetch_abort_set_handler: .arm -arm_exc_prefetch_abort: +_ARMV4_Exception_prefetch_abort: /* Save context and load handler */ sub sp, #16 @@ -83,7 +83,7 @@ arm_exc_prefetch_abort: b save_more_context -arm_exc_data_abort: +_ARMV4_Exception_data_abort: /* Save context and load handler */ sub sp, #16 diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/rtems/score/armv4.h index 022f0c19aa..5100413363 100644 --- a/cpukit/score/cpu/arm/rtems/score/armv4.h +++ b/cpukit/score/cpu/arm/rtems/score/armv4.h @@ -27,15 +27,19 @@ void bsp_interrupt_dispatch( void ); void _ARMV4_Exception_interrupt( void ); -typedef void arm_exc_abort_handler( arm_cpu_context *context ); +typedef void ARMV4_Exception_abort_handler( arm_cpu_context *context ); -void arm_exc_data_abort_set_handler( arm_exc_abort_handler handler ); +void _ARMV4_Exception_data_abort_set_handler( + ARMV4_Exception_abort_handler handler +); -void arm_exc_data_abort( void ); +void _ARMV4_Exception_data_abort( void ); -void arm_exc_prefetch_abort_set_handler( arm_exc_abort_handler handler ); +void _ARMV4_Exception_prefetch_abort_set_handler( + ARMV4_Exception_abort_handler handler +); -void arm_exc_prefetch_abort( void ); +void _ARMV4_Exception_prefetch_abort( void ); #endif /* ARM_MULTILIB_ARCH_V4 */ |