libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support context switch load/store FPU register. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1901 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
wuyangyong 2011-12-31 20:25:44 +00:00
parent 1097104c7f
commit aad32f8546
4 changed files with 174 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2009-10-11 Bernard first version * 2009-10-11 Bernard first version
* 2012-01-01 aozima support context switch load/store FPU register.
*/ */
/** /**
@ -17,8 +18,8 @@
*/ */
/*@{*/ /*@{*/
.cpu cortex-m3 .cpu cortex-m4
.fpu softvfp .fpu vfpv4
.syntax unified .syntax unified
.thumb .thumb
.text .text
@ -104,6 +105,7 @@ 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 */
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,6 +116,7 @@ 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 */
VLDMIA r1!, {d8 - d15} /* pop FPU register s16~s31 */
MSR psp, r1 /* update stack pointer */ MSR psp, r1 /* update stack pointer */
pendsv_exit: pendsv_exit:

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

@ -11,6 +11,7 @@
; * Date Author Notes ; * Date Author Notes
; * 2009-01-17 Bernard first version ; * 2009-01-17 Bernard first version
; * 2009-09-27 Bernard add protect when contex switch occurs ; * 2009-09-27 Bernard add protect when contex switch occurs
; * 2012-01-01 aozima support context switch load/store FPU register.
; */ ; */
;/** ;/**
@ -102,6 +103,7 @@ 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
VSTMFD r1!, {d8 - d15} ; push FPU register s16~s31
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
@ -112,6 +114,7 @@ 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
VLDMFD r1!, {d8 - d15} ; pop FPU register s16~s31
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit pendsv_exit

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

@ -9,7 +9,8 @@
; * ; *
; * Change Logs: ; * Change Logs:
; * Date Author Notes ; * Date Author Notes
; * 2009-01-17 Bernard first version ; * 2009-01-17 Bernard first version.
; * 2012-01-01 aozima support context switch load/store FPU register.
; */ ; */
;/** ;/**
@ -105,6 +106,7 @@ 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 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
@ -115,6 +117,7 @@ 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
VLDMFD r1!, {d8 - d15} ; pop FPU register s16~s31
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit pendsv_exit

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

@ -1,7 +1,7 @@
/* /*
* File : cpuport.c * File : cpuport.c
* This file is part of RT-Thread RTOS * This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2009 - 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
@ -9,16 +9,20 @@
* *
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2006-08-23 Bernard the first version * 2011-10-21 Bernard the first version.
* 2011-06-03 Bernard merge all of C source code into cpuport.c * 2011-10-27 aozima update for cortex-M4 FPU.
* 2011-12-31 aozima fixed stack align issues.
* 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 */
/* exception and interrupt handler table */ /* exception and interrupt handler table */
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
rt_uint32_t rt_thread_switch_interrupt_flag; rt_uint32_t rt_thread_switch_interrupt_flag;
struct stack_contex struct exception_stack_frame
{ {
rt_uint32_t r0; rt_uint32_t r0;
rt_uint32_t r1; rt_uint32_t r1;
@ -30,7 +34,7 @@ struct stack_contex
rt_uint32_t psr; rt_uint32_t psr;
}; };
struct stack_contex_fpu struct exception_stack_frame_fpu
{ {
rt_uint32_t r0; rt_uint32_t r0;
rt_uint32_t r1; rt_uint32_t r1;
@ -40,6 +44,7 @@ struct stack_contex_fpu
rt_uint32_t lr; rt_uint32_t lr;
rt_uint32_t pc; rt_uint32_t pc;
rt_uint32_t psr; rt_uint32_t psr;
/* FPU register */ /* FPU register */
rt_uint32_t S0; rt_uint32_t S0;
rt_uint32_t S1; rt_uint32_t S1;
@ -61,51 +66,127 @@ struct stack_contex_fpu
rt_uint32_t NO_NAME; rt_uint32_t NO_NAME;
}; };
struct stack_frame
{
/* r4 ~ r11 register */
rt_uint32_t r4;
rt_uint32_t r5;
rt_uint32_t r6;
rt_uint32_t r7;
rt_uint32_t r8;
rt_uint32_t r9;
rt_uint32_t r10;
rt_uint32_t r11;
struct exception_stack_frame exception_stack_frame;
};
struct stack_frame_fpu
{
/* r4 ~ r11 register */
rt_uint32_t r4;
rt_uint32_t r5;
rt_uint32_t r6;
rt_uint32_t r7;
rt_uint32_t r8;
rt_uint32_t r9;
rt_uint32_t r10;
rt_uint32_t r11;
/* FPU register s16 ~ s31 */
rt_uint32_t s16;
rt_uint32_t s17;
rt_uint32_t s18;
rt_uint32_t s19;
rt_uint32_t s20;
rt_uint32_t s21;
rt_uint32_t s22;
rt_uint32_t s23;
rt_uint32_t s24;
rt_uint32_t s25;
rt_uint32_t s26;
rt_uint32_t s27;
rt_uint32_t s28;
rt_uint32_t s29;
rt_uint32_t s30;
rt_uint32_t s31;
struct exception_stack_frame_fpu exception_stack_frame;
};
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) rt_uint8_t *stack_addr, void *texit)
{ {
unsigned long *stk; rt_uint8_t * stk;
struct stack_contex_fpu * stack_contex_fpu; unsigned long i;
stk = (unsigned long *)stack_addr + sizeof(rt_uint32_t); stk = stack_addr + sizeof(rt_uint32_t);
stk -= sizeof(struct stack_contex_fpu); /* check FPU enable ? */
stack_contex_fpu = (struct stack_contex_fpu *)stk; if((_CPACR & (0xF << 20)) == (0xF << 20))
stack_contex_fpu->r0 = (unsigned long)parameter; /* r0 : argument */ {
stack_contex_fpu->r1 = 0; /* r1 */ /* FPU is enable */
stack_contex_fpu->r2 = 0; /* r2 */ struct stack_frame_fpu * stack_frame_fpu;
stack_contex_fpu->r3 = 0; /* r3 */
stack_contex_fpu->r12 = 0; /* r12 */
stack_contex_fpu->lr = (unsigned long)texit; /* lr */
stack_contex_fpu->pc = (unsigned long)tentry; /* entry point, pc */
stack_contex_fpu->psr = 0x01000000L; /* PSR */
*(--stk) = 0; /* r11 */ stk -= sizeof(struct stack_frame_fpu);
*(--stk) = 0; /* r10 */ stack_frame_fpu = (struct stack_frame_fpu *)stk;
*(--stk) = 0; /* r9 */
*(--stk) = 0; /* r8 */ /* init all register */
*(--stk) = 0; /* r7 */ for(i=0; i<sizeof(struct stack_frame_fpu)/sizeof(rt_uint32_t); i++)
*(--stk) = 0; /* r6 */ {
*(--stk) = 0; /* r5 */ ((rt_uint32_t*)stack_frame_fpu)[i] = 0xdeadbeef;
*(--stk) = 0; /* r4 */ }
stack_frame_fpu->exception_stack_frame.r0 = (unsigned long)parameter; /* r0 : argument */
stack_frame_fpu->exception_stack_frame.r1 = 0; /* r1 */
stack_frame_fpu->exception_stack_frame.r2 = 0; /* r2 */
stack_frame_fpu->exception_stack_frame.r3 = 0; /* r3 */
stack_frame_fpu->exception_stack_frame.r12 = 0; /* r12 */
stack_frame_fpu->exception_stack_frame.lr = (unsigned long)texit; /* lr */
stack_frame_fpu->exception_stack_frame.pc = (unsigned long)tentry; /* entry point, pc */
stack_frame_fpu->exception_stack_frame.psr = 0x01000000L; /* PSR */
}
else
{
/* FPU is disable */
struct stack_frame * stack_frame;
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 task's current stack address */
return (rt_uint8_t *)stk; return stk;
} }
extern void rt_hw_interrupt_thread_switch(void); extern void rt_hw_interrupt_thread_switch(void);
extern void list_thread(void); extern void list_thread(void);
extern rt_thread_t rt_current_thread; extern rt_thread_t rt_current_thread;
void rt_hw_hard_fault_exception(struct stack_contex* contex) void rt_hw_hard_fault_exception(struct exception_stack_frame * exception_stack)
{ {
rt_kprintf("psr: 0x%08x\n", contex->psr); rt_kprintf("psr: 0x%08x\n", exception_stack->psr);
rt_kprintf(" pc: 0x%08x\n", contex->pc); rt_kprintf(" pc: 0x%08x\n", exception_stack->pc);
rt_kprintf(" lr: 0x%08x\n", contex->lr); rt_kprintf(" lr: 0x%08x\n", exception_stack->lr);
rt_kprintf("r12: 0x%08x\n", contex->r12); rt_kprintf("r12: 0x%08x\n", exception_stack->r12);
rt_kprintf("r03: 0x%08x\n", contex->r3); rt_kprintf("r03: 0x%08x\n", exception_stack->r3);
rt_kprintf("r02: 0x%08x\n", contex->r2); rt_kprintf("r02: 0x%08x\n", exception_stack->r2);
rt_kprintf("r01: 0x%08x\n", contex->r1); rt_kprintf("r01: 0x%08x\n", exception_stack->r1);
rt_kprintf("r00: 0x%08x\n", contex->r0); rt_kprintf("r00: 0x%08x\n", exception_stack->r0);
rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);
#ifdef RT_USING_FINSH #ifdef RT_USING_FINSH