diff options
| author | bernard <[email protected]> | 2014-08-01 12:03:24 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2014-08-01 12:03:24 +0800 |
| commit | 582aff86ed91dad23e8ace36f8466ca20c80bebf (patch) | |
| tree | 77b4338a8afe48a1c45be9f4bab9b40de1543c5b /libcpu/arm/cortex-m3/context_rvds.S | |
| parent | 516711dc1d08ed332704ec53fd377edbdd0b9834 (diff) | |
| parent | 2fdef817b1a0ce82ef61bde11f41e651c1cc8d79 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-threadv2.0.0_beta
Diffstat (limited to 'libcpu/arm/cortex-m3/context_rvds.S')
| -rw-r--r-- | libcpu/arm/cortex-m3/context_rvds.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcpu/arm/cortex-m3/context_rvds.S b/libcpu/arm/cortex-m3/context_rvds.S index 7f431cc042..c86b70e1f9 100644 --- a/libcpu/arm/cortex-m3/context_rvds.S +++ b/libcpu/arm/cortex-m3/context_rvds.S @@ -84,8 +84,8 @@ _reswitch BX LR ENDP -; r0 --> swith from thread stack -; r1 --> swith to thread stack +; r0 --> switch from thread stack +; r1 --> switch to thread stack ; psr, pc, lr, r12, r3, r2, r1, r0 are pushed into [from] stack PendSV_Handler PROC EXPORT PendSV_Handler @@ -105,14 +105,14 @@ PendSV_Handler PROC LDR r0, =rt_interrupt_from_thread LDR r1, [r0] - CBZ r1, swtich_to_thread ; skip register save at the first time + CBZ r1, switch_to_thread ; skip register save at the first time MRS r1, psp ; get from thread stack pointer STMFD r1!, {r4 - r11} ; push r4 - r11 register LDR r0, [r0] STR r1, [r0] ; update from thread stack pointer -swtich_to_thread +switch_to_thread LDR r1, =rt_interrupt_to_thread LDR r1, [r1] LDR r1, [r1] ; load thread stack pointer |