springcute
/
rt-thread
mirror of https://github.com/RT-Thread/rt-thread.git
2
0
Fork 3
Code Issues Releases Wiki Activity

update libcpu cortex-m4. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1967 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
wuyangyong 2012-02-18 17:46:08 +00:00
parent 3c6c8063ce
commit 38ba67a867
4 changed files with 180 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcpu/arm/cortex-m4/context_gcc.S
View File

@ -19,7 +19,6 @@
/*@{*/ /*@{*/
.cpu cortex-m4 .cpu cortex-m4
.fpu vfpv4
.syntax unified .syntax unified
.thumb .thumb
.text .text
@ -105,7 +104,11 @@ PendSV_Handler:
CBZ r1, swtich_to_thread /* skip register save at the first time */ CBZ r1, swtich_to_thread /* skip register save at the first time */
MRS r1, psp /* get from thread stack pointer */ MRS r1, psp /* get from thread stack pointer */
VSTMDB r1!, {d8 - d15} /* push FPU register s16~s31 */
#if defined (__VFP_FP__) && !defined(__SOFTFP__)
VSTMDB r1!, {d8 - d15} /* push FPU register s16~s31 */
#endif
STMFD r1!, {r4 - r11} /* push r4 - r11 register */ STMFD r1!, {r4 - r11} /* push r4 - r11 register */
LDR r0, [r0] LDR r0, [r0]
STR r1, [r0] /* update from thread stack pointer */ STR r1, [r0] /* update from thread stack pointer */
@ -116,7 +119,11 @@ swtich_to_thread:
LDR r1, [r1] /* load thread stack pointer */ LDR r1, [r1] /* load thread stack pointer */
LDMFD r1!, {r4 - r11} /* pop r4 - r11 register */ LDMFD r1!, {r4 - r11} /* pop r4 - r11 register */
#if defined (__VFP_FP__) && !defined(__SOFTFP__)
VLDMIA r1!, {d8 - d15} /* pop FPU register s16~s31 */ VLDMIA r1!, {d8 - d15} /* pop FPU register s16~s31 */
#endif
MSR psp, r1 /* update stack pointer */ MSR psp, r1 /* update stack pointer */
pendsv_exit: pendsv_exit:

8
libcpu/arm/cortex-m4/context_iar.S
View File

@ -103,7 +103,11 @@ PendSV_Handler:
CBZ r1, swtich_to_thread ; skip register save at the first time CBZ r1, swtich_to_thread ; skip register save at the first time
MRS r1, psp ; get from thread stack pointer MRS r1, psp ; get from thread stack pointer
#if defined ( __ARMVFP__ )
VSTMDB r1!, {d8 - d15} ; push FPU register s16~s31 VSTMDB r1!, {d8 - d15} ; push FPU register s16~s31
#endif
STMFD r1!, {r4 - r11} ; push r4 - r11 register STMFD r1!, {r4 - r11} ; push r4 - r11 register
LDR r0, [r0] LDR r0, [r0]
STR r1, [r0] ; update from thread stack pointer STR r1, [r0] ; update from thread stack pointer
@ -114,7 +118,11 @@ swtich_to_thread
LDR r1, [r1] ; load thread stack pointer LDR r1, [r1] ; load thread stack pointer
LDMFD r1!, {r4 - r11} ; pop r4 - r11 register LDMFD r1!, {r4 - r11} ; pop r4 - r11 register
#if defined ( __ARMVFP__ )
VLDMIA r1!, {d8 - d15} ; pop FPU register s16~s31 VLDMIA r1!, {d8 - d15} ; pop FPU register s16~s31
#endif
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit pendsv_exit

12
libcpu/arm/cortex-m4/context_rvds.S
View File

@ -106,8 +106,12 @@ PendSV_Handler PROC
CBZ r1, swtich_to_thread ; skip register save at the first time CBZ r1, swtich_to_thread ; skip register save at the first time
MRS r1, psp ; get from thread stack pointer MRS r1, psp ; get from thread stack pointer
VSTMFD r1!, {d8 - d15} ; push FPU register s16~s31
STMFD r1!, {r4 - r11} ; push r4 - r11 register IF {FPU} != "SoftVFP"
VSTMFD r1!, {d8 - d15} ; push FPU register s16~s31
ENDIF
STMFD r1!, {r4 - r11} ; push r4 - r11 register
LDR r0, [r0] LDR r0, [r0]
STR r1, [r0] ; update from thread stack pointer STR r1, [r0] ; update from thread stack pointer
@ -117,7 +121,11 @@ swtich_to_thread
LDR r1, [r1] ; load thread stack pointer LDR r1, [r1] ; load thread stack pointer
LDMFD r1!, {r4 - r11} ; pop r4 - r11 register LDMFD r1!, {r4 - r11} ; pop r4 - r11 register
IF {FPU} != "SoftVFP"
VLDMFD r1!, {d8 - d15} ; pop FPU register s16~s31 VLDMFD r1!, {d8 - d15} ; pop FPU register s16~s31
ENDIF
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit pendsv_exit

356
libcpu/arm/cortex-m4/cpuport.c
View File

@ -1,203 +1,153 @@
/* /*
* File : cpuport.c * File : cpuport.c
* This file is part of RT-Thread RTOS * This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team * COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at * found in the file LICENSE in this distribution or at
* http://www.rt-thread.org/license/LICENSE * http://www.rt-thread.org/license/LICENSE
* *
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2011-10-21 Bernard the first version. * 2011-10-21 Bernard the first version.
* 2011-10-27 aozima update for cortex-M4 FPU. * 2011-10-27 aozima update for cortex-M4 FPU.
* 2011-12-31 aozima fixed stack align issues. * 2011-12-31 aozima fixed stack align issues.
* 2012-01-01 aozima support context switch load/store FPU register. * 2012-01-01 aozima support context switch load/store FPU register.
*/ */
#include <rtthread.h> #include <rtthread.h>
#define _CPACR (*(rt_uint32_t *)0xE000ED88) /* Coprocessor Access Control Register */ #define USE_FPU /* ARMCC */ ( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP )) \
/* IAR */ || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ )) \
/* exception and interrupt handler table */ /* GNU */ || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
rt_uint32_t rt_thread_switch_interrupt_flag; /* exception and interrupt handler table */
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
struct exception_stack_frame rt_uint32_t rt_thread_switch_interrupt_flag;
{
rt_uint32_t r0; struct exception_stack_frame
rt_uint32_t r1; {
rt_uint32_t r2; rt_uint32_t r0;
rt_uint32_t r3; rt_uint32_t r1;
rt_uint32_t r12; rt_uint32_t r2;
rt_uint32_t lr; rt_uint32_t r3;
rt_uint32_t pc; rt_uint32_t r12;
rt_uint32_t psr; rt_uint32_t lr;
}; rt_uint32_t pc;
rt_uint32_t psr;
struct exception_stack_frame_fpu
{ #if USE_FPU
rt_uint32_t r0; /* FPU register */
rt_uint32_t r1; rt_uint32_t S0;
rt_uint32_t r2; rt_uint32_t S1;
rt_uint32_t r3; rt_uint32_t S2;
rt_uint32_t r12; rt_uint32_t S3;
rt_uint32_t lr; rt_uint32_t S4;
rt_uint32_t pc; rt_uint32_t S5;
rt_uint32_t psr; rt_uint32_t S6;
rt_uint32_t S7;
/* FPU register */ rt_uint32_t S8;
rt_uint32_t S0; rt_uint32_t S9;
rt_uint32_t S1; rt_uint32_t S10;
rt_uint32_t S2; rt_uint32_t S11;
rt_uint32_t S3; rt_uint32_t S12;
rt_uint32_t S4; rt_uint32_t S13;
rt_uint32_t S5; rt_uint32_t S14;
rt_uint32_t S6; rt_uint32_t S15;
rt_uint32_t S7; rt_uint32_t FPSCR;
rt_uint32_t S8; rt_uint32_t NO_NAME;
rt_uint32_t S9; #endif
rt_uint32_t S10; };
rt_uint32_t S11;
rt_uint32_t S12; struct stack_frame
rt_uint32_t S13; {
rt_uint32_t S14; /* r4 ~ r11 register */
rt_uint32_t S15; rt_uint32_t r4;
rt_uint32_t FPSCR; rt_uint32_t r5;
rt_uint32_t NO_NAME; rt_uint32_t r6;
}; rt_uint32_t r7;
rt_uint32_t r8;
struct stack_frame rt_uint32_t r9;
{ rt_uint32_t r10;
/* r4 ~ r11 register */ rt_uint32_t r11;
rt_uint32_t r4;
rt_uint32_t r5; #if USE_FPU
rt_uint32_t r6; /* FPU register s16 ~ s31 */
rt_uint32_t r7; rt_uint32_t s16;
rt_uint32_t r8; rt_uint32_t s17;
rt_uint32_t r9; rt_uint32_t s18;
rt_uint32_t r10; rt_uint32_t s19;
rt_uint32_t r11; rt_uint32_t s20;
rt_uint32_t s21;
struct exception_stack_frame exception_stack_frame; rt_uint32_t s22;
}; rt_uint32_t s23;
rt_uint32_t s24;
struct stack_frame_fpu rt_uint32_t s25;
{ rt_uint32_t s26;
/* r4 ~ r11 register */ rt_uint32_t s27;
rt_uint32_t r4; rt_uint32_t s28;
rt_uint32_t r5; rt_uint32_t s29;
rt_uint32_t r6; rt_uint32_t s30;
rt_uint32_t r7; rt_uint32_t s31;
rt_uint32_t r8; #endif
rt_uint32_t r9;
rt_uint32_t r10; struct exception_stack_frame exception_stack_frame;
rt_uint32_t r11; };
/* FPU register s16 ~ s31 */ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint32_t s16; rt_uint8_t *stack_addr, void *texit)
rt_uint32_t s17; {
rt_uint32_t s18; struct stack_frame * stack_frame;
rt_uint32_t s19; rt_uint8_t * stk;
rt_uint32_t s20; unsigned long i;
rt_uint32_t s21;
rt_uint32_t s22; stk = stack_addr + sizeof(rt_uint32_t);
rt_uint32_t s23;
rt_uint32_t s24; stk -= sizeof(struct stack_frame);
rt_uint32_t s25; stack_frame = (struct stack_frame *)stk;
rt_uint32_t s26;
rt_uint32_t s27; /* init all register */
rt_uint32_t s28; for(i=0; i<sizeof(struct stack_frame)/sizeof(rt_uint32_t); i++)
rt_uint32_t s29; {
rt_uint32_t s30; ((rt_uint32_t*)stack_frame)[i] = 0xdeadbeef;
rt_uint32_t s31; }
struct exception_stack_frame_fpu exception_stack_frame; stack_frame->exception_stack_frame.r0 = (unsigned long)parameter; /* r0 : argument */
}; stack_frame->exception_stack_frame.r1 = 0; /* r1 */
stack_frame->exception_stack_frame.r2 = 0; /* r2 */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, stack_frame->exception_stack_frame.r3 = 0; /* r3 */
rt_uint8_t *stack_addr, void *texit) stack_frame->exception_stack_frame.r12 = 0; /* r12 */
{ stack_frame->exception_stack_frame.lr = (unsigned long)texit; /* lr */
rt_uint8_t * stk; stack_frame->exception_stack_frame.pc = (unsigned long)tentry; /* entry point, pc */
unsigned long i; stack_frame->exception_stack_frame.psr = 0x01000000L; /* PSR */
stk = stack_addr + sizeof(rt_uint32_t); /* return task's current stack address */
return stk;
/* check FPU enable ? */ }
if((_CPACR & (0xF << 20)) == (0xF << 20))
{ extern void rt_hw_interrupt_thread_switch(void);
/* FPU is enable */ extern void list_thread(void);
struct stack_frame_fpu * stack_frame_fpu; extern rt_thread_t rt_current_thread;
void rt_hw_hard_fault_exception(struct exception_stack_frame * exception_stack)
stk -= sizeof(struct stack_frame_fpu); {
stack_frame_fpu = (struct stack_frame_fpu *)stk; rt_kprintf("psr: 0x%08x\n", exception_stack->psr);
rt_kprintf(" pc: 0x%08x\n", exception_stack->pc);
/* init all register */ rt_kprintf(" lr: 0x%08x\n", exception_stack->lr);
for(i=0; i<sizeof(struct stack_frame_fpu)/sizeof(rt_uint32_t); i++) rt_kprintf("r12: 0x%08x\n", exception_stack->r12);
{ rt_kprintf("r03: 0x%08x\n", exception_stack->r3);
((rt_uint32_t*)stack_frame_fpu)[i] = 0xdeadbeef; rt_kprintf("r02: 0x%08x\n", exception_stack->r2);
} rt_kprintf("r01: 0x%08x\n", exception_stack->r1);
rt_kprintf("r00: 0x%08x\n", exception_stack->r0);
stack_frame_fpu->exception_stack_frame.r0 = (unsigned long)parameter; /* r0 : argument */
stack_frame_fpu->exception_stack_frame.r1 = 0; /* r1 */ rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);
stack_frame_fpu->exception_stack_frame.r2 = 0; /* r2 */ #ifdef RT_USING_FINSH
stack_frame_fpu->exception_stack_frame.r3 = 0; /* r3 */ list_thread();
stack_frame_fpu->exception_stack_frame.r12 = 0; /* r12 */ #endif
stack_frame_fpu->exception_stack_frame.lr = (unsigned long)texit; /* lr */ while (1);
stack_frame_fpu->exception_stack_frame.pc = (unsigned long)tentry; /* entry point, pc */ }
stack_frame_fpu->exception_stack_frame.psr = 0x01000000L; /* PSR */
} void rt_hw_cpu_shutdown()
else {
{ rt_kprintf("shutdown...\n");
/* FPU is disable */
struct stack_frame * stack_frame; RT_ASSERT(0);
}
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++)
{
((rt_uint32_t*)stack_frame)[i] = 0xdeadbeef;
}
stack_frame->exception_stack_frame.r0 = (unsigned long)parameter; /* r0 : argument */
stack_frame->exception_stack_frame.r1 = 0; /* r1 */
stack_frame->exception_stack_frame.r2 = 0; /* r2 */
stack_frame->exception_stack_frame.r3 = 0; /* r3 */
stack_frame->exception_stack_frame.r12 = 0; /* r12 */
stack_frame->exception_stack_frame.lr = (unsigned long)texit; /* lr */
stack_frame->exception_stack_frame.pc = (unsigned long)tentry; /* entry point, pc */
stack_frame->exception_stack_frame.psr = 0x01000000L; /* PSR */
}
/* return task's current stack address */
return stk;
}
extern void rt_hw_interrupt_thread_switch(void);
extern void list_thread(void);
extern rt_thread_t rt_current_thread;
void rt_hw_hard_fault_exception(struct exception_stack_frame * exception_stack)
{
rt_kprintf("psr: 0x%08x\n", exception_stack->psr);
rt_kprintf(" pc: 0x%08x\n", exception_stack->pc);
rt_kprintf(" lr: 0x%08x\n", exception_stack->lr);
rt_kprintf("r12: 0x%08x\n", exception_stack->r12);
rt_kprintf("r03: 0x%08x\n", exception_stack->r3);
rt_kprintf("r02: 0x%08x\n", exception_stack->r2);
rt_kprintf("r01: 0x%08x\n", exception_stack->r1);
rt_kprintf("r00: 0x%08x\n", exception_stack->r0);
rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);
#ifdef RT_USING_FINSH
list_thread();
#endif
while (1);
}
void rt_hw_cpu_shutdown()
{
rt_kprintf("shutdown...\n");
RT_ASSERT(0);
}