diff options
Diffstat (limited to 'cpukit/score/cpu/arm')
| -rw-r--r-- | cpukit/score/cpu/arm/arm_exc_handler_high.c | 32 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/arm_exc_handler_low.S | 2 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/cpu.c | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/cpu_asm.S | 6 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/rtems/asm.h | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/arm/rtems/score/arm.h | 2 |
6 files changed, 25 insertions, 25 deletions
diff --git a/cpukit/score/cpu/arm/arm_exc_handler_high.c b/cpukit/score/cpu/arm/arm_exc_handler_high.c index 0b256ffc7e..8a08bde055 100644 --- a/cpukit/score/cpu/arm/arm_exc_handler_high.c +++ b/cpukit/score/cpu/arm/arm_exc_handler_high.c @@ -44,18 +44,18 @@ static void _defaultExcHandler (CPU_Exception_frame *ctx) printk("----------------------------------------------------------\n\r"); #if 0 printk(" r0 = %8x r1 = %8x r2 = %8x r3 = %8x\n\r", - ctx->register_r0, ctx->register_r1, + ctx->register_r0, ctx->register_r1, ctx->register_r2, ctx->register_r3); printk(" r4 = %8x r5 = %8x r6 = %8x r7 = %8x\n\r", - ctx->register_r4, ctx->register_r5, + ctx->register_r4, ctx->register_r5, ctx->register_r6, ctx->register_r7); printk(" r8 = %8x r9 = %8x r10 = %8x\n\r", ctx->register_r8, ctx->register_r9, ctx->register_r10); printk(" fp = %8x ip = %8x sp = %8x pc = %8x\n\r", - ctx->register_fp, ctx->register_ip, + ctx->register_fp, ctx->register_ip, ctx->register_sp, ctx->register_lr - 4); printk("----------------------------------------------------------\n\r"); -#endif +#endif if (_ISR_Nest_level > 0) { /* * In this case we shall not delete the task interrupted as @@ -75,9 +75,9 @@ typedef void (*cpuExcHandlerType) (CPU_Exception_frame*); cpuExcHandlerType _currentExcHandler = _defaultExcHandler; -extern void _Exception_Handler_Undef_Swi(void); -extern void _Exception_Handler_Abort(void); -extern void _exc_data_abort(void); +extern void _Exception_Handler_Undef_Swi(void); +extern void _Exception_Handler_Abort(void); +extern void _exc_data_abort(void); @@ -85,31 +85,31 @@ extern void _exc_data_abort(void); void rtems_exception_init_mngt(void) { ISR_Level level; - + _CPU_ISR_Disable(level); _CPU_ISR_install_vector(ARM_EXCEPTION_UNDEF, _Exception_Handler_Undef_Swi, NULL); - + _CPU_ISR_install_vector(ARM_EXCEPTION_SWI, _Exception_Handler_Undef_Swi, NULL); - + _CPU_ISR_install_vector(ARM_EXCEPTION_PREF_ABORT, _Exception_Handler_Abort, NULL); - + _CPU_ISR_install_vector(ARM_EXCEPTION_DATA_ABORT, _exc_data_abort, NULL); - - _CPU_ISR_install_vector(ARM_EXCEPTION_FIQ, + + _CPU_ISR_install_vector(ARM_EXCEPTION_FIQ, _Exception_Handler_Abort, NULL); - - _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, + + _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _Exception_Handler_Abort, NULL); - + _CPU_ISR_Enable(level); } diff --git a/cpukit/score/cpu/arm/arm_exc_handler_low.S b/cpukit/score/cpu/arm/arm_exc_handler_low.S index 26b75cb435..9aaff215e8 100644 --- a/cpukit/score/cpu/arm/arm_exc_handler_low.S +++ b/cpukit/score/cpu/arm/arm_exc_handler_low.S @@ -63,7 +63,7 @@ _go_back_1: ldr sp, [r13, #REG_SP] ldr lr, [r13, #REG_LR] add r13,r13,#SIZE_REGS - movs pc,r14 /* return */ + movs pc,r14 /* return */ /* FIXME: _Exception_Handler_Abort is untested */ DEFINE_FUNCTION_ARM(_Exception_Handler_Abort) diff --git a/cpukit/score/cpu/arm/cpu.c b/cpukit/score/cpu/arm/cpu.c index 3c4d96da48..a44cff59bb 100644 --- a/cpukit/score/cpu/arm/cpu.c +++ b/cpukit/score/cpu/arm/cpu.c @@ -93,10 +93,10 @@ void _CPU_ISR_install_vector( ) { /* Redirection table starts at the end of the vector table */ - volatile uint32_t *table = (volatile uint32_t *) (MAX_EXCEPTIONS * 4); + volatile uint32_t *table = (volatile uint32_t *) (MAX_EXCEPTIONS * 4); uint32_t current_handler = table [vector]; - + /* The current handler is now the old one */ if (old_handler != NULL) { *old_handler = (proc_ptr) current_handler; diff --git a/cpukit/score/cpu/arm/cpu_asm.S b/cpukit/score/cpu/arm/cpu_asm.S index 2c0ed16e79..efba34aa79 100644 --- a/cpukit/score/cpu/arm/cpu_asm.S +++ b/cpukit/score/cpu/arm/cpu_asm.S @@ -37,9 +37,9 @@ * * Using the ldm/stm opcodes save 2-3 us on 100 MHz ARM9TDMI with * a 16 bit data bus. - * + * */ - + DEFINE_FUNCTION_ARM(_CPU_Context_switch) /* Start saving context */ mrs r2, cpsr @@ -47,7 +47,7 @@ DEFINE_FUNCTION_ARM(_CPU_Context_switch) /* Start restoring context */ -_restore: +_restore: ldmia r1, {r2, r4, r5, r6, r7, r8, r9, r10, r11, r13, r14} msr cpsr, r2 #ifdef __thumb__ diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/rtems/asm.h index 176ac064ee..04c5360790 100644 --- a/cpukit/score/cpu/arm/rtems/asm.h +++ b/cpukit/score/cpu/arm/rtems/asm.h @@ -11,7 +11,7 @@ * NOTE: The spacing in the use of these macros * is critical to them working as advertised. */ - + /* * COPYRIGHT: * @@ -96,7 +96,7 @@ #define NUM_IRQ_VECTOR 6 // IRQ number #define NUM_FIQ_VECTOR 7 // IRQ number - // // + // // #define CPSR_IRQ_DISABLE 0x80 // FIQ disabled when =1 #define CPSR_FIQ_DISABLE 0x40 // FIQ disabled when =1 #define CPSR_THUMB_ENABLE 0x20 // Thumb mode when =1 diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h index c724c78148..54da4a7e7b 100644 --- a/cpukit/score/cpu/arm/rtems/score/arm.h +++ b/cpukit/score/cpu/arm/rtems/score/arm.h @@ -2,7 +2,7 @@ * @file rtems/score/arm.h */ -/* +/* * $Id$ * * COPYRIGHT (c) 2000 Canon Research Centre France SA. |