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-m4/context_gcc.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-m4/context_gcc.S')
| -rw-r--r-- | libcpu/arm/cortex-m4/context_gcc.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcpu/arm/cortex-m4/context_gcc.S b/libcpu/arm/cortex-m4/context_gcc.S index 6a910355a8..908a44f847 100644 --- a/libcpu/arm/cortex-m4/context_gcc.S +++ b/libcpu/arm/cortex-m4/context_gcc.S @@ -82,8 +82,8 @@ _reswitch: STR r1, [r0] BX LR -/* 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 */ .global PendSV_Handler @@ -104,7 +104,7 @@ PendSV_Handler: 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 */ @@ -127,7 +127,7 @@ PendSV_Handler: 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 */ |