diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-02-19 21:23:12 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-02-19 21:23:12 +0000 |
| commit | 11af394fec5d2723827819ce43c7205bc20fa6dc (patch) | |
| tree | 29595c758ccd9016ba37de0db5604641d9b424c5 /os/ports/RVCT/ARMCMx | |
| parent | 690d08a1f93848ee8b467299b5d672d1f69f23c5 (diff) | |
| download | ChibiOS-11af394fec5d2723827819ce43c7205bc20fa6dc.tar.gz ChibiOS-11af394fec5d2723827819ce43c7205bc20fa6dc.tar.bz2 ChibiOS-11af394fec5d2723827819ce43c7205bc20fa6dc.zip | |
Fixed bug 3187105.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2744 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/RVCT/ARMCMx')
| -rw-r--r-- | os/ports/RVCT/ARMCMx/chcoreasm_v6m.s | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s index 8f348f099..2424de03f 100644 --- a/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s +++ b/os/ports/RVCT/ARMCMx/chcoreasm_v6m.s @@ -93,8 +93,9 @@ _port_switch_from_isr PROC mov r12, r1
msr APSR, r0
mov lr, r2
+ pop {r0, r1, r2, r3}
cpsie i
- pop {r0, r1, r2, r3, pc}
+ pop {pc}
ENDP
/*
|