diff options
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/arm/cortex-m0/cpuport.c | 24 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/cpuport.c | 24 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/cpuport.c | 6 |
3 files changed, 29 insertions, 25 deletions
diff --git a/libcpu/arm/cortex-m0/cpuport.c b/libcpu/arm/cortex-m0/cpuport.c index fcd7d8635f..f8d475a4c8 100644 --- a/libcpu/arm/cortex-m0/cpuport.c +++ b/libcpu/arm/cortex-m0/cpuport.c @@ -60,25 +60,25 @@ rt_uint32_t rt_thread_switch_interrupt_flag; * * @return stack address */ -rt_uint8_t *rt_hw_stack_init(void *tentry, - void *parameter, +rt_uint8_t *rt_hw_stack_init(void *tentry, + void *parameter, rt_uint8_t *stack_addr, - void *texit) + void *texit) { - struct stack_frame * stack_frame; - rt_uint8_t * stk; - unsigned long i; + struct stack_frame *stack_frame; + rt_uint8_t *stk; + unsigned long i; - stk = stack_addr + sizeof(rt_uint32_t); - stk = (rt_uint8_t*)RT_ALIGN_DOWN((rt_uint32_t)stk, 8); + stk = stack_addr + sizeof(rt_uint32_t); + stk = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stk, 8); stk -= sizeof(struct stack_frame); stack_frame = (struct stack_frame *)stk; /* init all register */ - for(i=0; i<sizeof(struct stack_frame)/sizeof(rt_uint32_t); i++) + for (i = 0; i < sizeof(struct stack_frame) / sizeof(rt_uint32_t); i ++) { - ((rt_uint32_t*)stack_frame)[i] = 0xdeadbeef; + ((rt_uint32_t *)stack_frame)[i] = 0xdeadbeef; } stack_frame->exception_stack_frame.r0 = (unsigned long)parameter; /* r0 : argument */ @@ -99,7 +99,7 @@ extern rt_thread_t rt_current_thread; /** * fault exception handling */ -void rt_hw_hard_fault_exception(struct exception_stack_frame* contex) +void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) { rt_kprintf("psr: 0x%08x\n", contex->psr); rt_kprintf(" pc: 0x%08x\n", contex->pc); @@ -111,8 +111,10 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame* contex) rt_kprintf("r00: 0x%08x\n", contex->r0); rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); + #ifdef RT_USING_FINSH list_thread(); #endif + while (1); } diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index 967a6610c5..334ccf5a96 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -8,10 +8,10 @@ * http://www.rt-thread.org/license/LICENSE * * Change Logs: - * Date Author Notes - * 2009-01-05 Bernard first version - * 2011-02-14 onelife Modify for EFM32 - * 2011-06-17 onelife Merge all of the C source code into cpuport.c + * Date Author Notes + * 2009-01-05 Bernard first version + * 2011-02-14 onelife Modify for EFM32 + * 2011-06-17 onelife Merge all of the C source code into cpuport.c * 2012-12-23 aozima stack addr align to 8byte. */ @@ -58,18 +58,18 @@ rt_uint32_t rt_thread_switch_interrupt_flag; * * @return stack address */ -rt_uint8_t *rt_hw_stack_init(void *tentry, - void *parameter, +rt_uint8_t *rt_hw_stack_init(void *tentry, + void *parameter, rt_uint8_t *stack_addr, - void *texit) + void *texit) { struct stack_frame *stack_frame; rt_uint8_t *stk; unsigned long i; - stk = stack_addr + sizeof(rt_uint32_t); - stk = (rt_uint8_t*)RT_ALIGN_DOWN((rt_uint32_t)stk, 8); - stk -= sizeof(struct stack_frame); + stk = stack_addr + sizeof(rt_uint32_t); + stk = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stk, 8); + stk -= sizeof(struct stack_frame); stack_frame = (struct stack_frame *)stk; @@ -109,16 +109,18 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame* contex) rt_kprintf("r00: 0x%08x\n", contex->r0); rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); + #ifdef RT_USING_FINSH list_thread(); #endif + while (1); } /** * shutdown CPU */ -void rt_hw_cpu_shutdown() +void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c index c2921b3af9..57e792a8d5 100644 --- a/libcpu/arm/cortex-m4/cpuport.c +++ b/libcpu/arm/cortex-m4/cpuport.c @@ -106,9 +106,9 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, rt_uint8_t *stk; unsigned long i; - stk = stack_addr + sizeof(rt_uint32_t); - stk = (rt_uint8_t*)RT_ALIGN_DOWN((rt_uint32_t)stk, 8); - stk -= sizeof(struct stack_frame); + stk = stack_addr + sizeof(rt_uint32_t); + stk = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stk, 8); + stk -= sizeof(struct stack_frame); stack_frame = (struct stack_frame *)stk; |