diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-12-11 10:51:38 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-12-11 10:51:38 +0000 |
| commit | bc2bcd741781f51daa56af86c7e67f0f91eb50a2 (patch) | |
| tree | 843609b2f1b8ca2c3a6c6609ffc97447fa72ae3b /os/ports | |
| parent | 56cbd69e13472fbca738b054eca7616ac339357e (diff) | |
| download | ChibiOS-bc2bcd741781f51daa56af86c7e67f0f91eb50a2.tar.gz ChibiOS-bc2bcd741781f51daa56af86c7e67f0f91eb50a2.tar.bz2 ChibiOS-bc2bcd741781f51daa56af86c7e67f0f91eb50a2.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4902 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
| -rw-r--r-- | os/ports/GCC/PPC/SPC563Mxx/ivor.s | 2 | ||||
| -rw-r--r-- | os/ports/GCC/PPC/chcore.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/os/ports/GCC/PPC/SPC563Mxx/ivor.s b/os/ports/GCC/PPC/SPC563Mxx/ivor.s index 0eb362ed0..8e5909354 100644 --- a/os/ports/GCC/PPC/SPC563Mxx/ivor.s +++ b/os/ports/GCC/PPC/SPC563Mxx/ivor.s @@ -137,7 +137,7 @@ _IVOR10: #endif
bl chSchIsPreemptionRequired
cmpli cr0, %r3, 0
- beq cr0, .ctxrestore
+ beq cr0, _ivor_exit
bl chSchDoReschedule
b _ivor_exit
diff --git a/os/ports/GCC/PPC/chcore.c b/os/ports/GCC/PPC/chcore.c index 5ad1195a4..b7525468f 100644 --- a/os/ports/GCC/PPC/chcore.c +++ b/os/ports/GCC/PPC/chcore.c @@ -36,10 +36,10 @@ void port_init(void) { #if PPC_SUPPORTS_IVORS
/* The CPU support IVOR registers, the kernel requires IVOR4 and IVOR10
and the initialization is performed here.*/
- asm volatile ("li %r3, _IVOR4@l \t\n"
- "mtIVOR4 %r3 \t\n"
- "li %r3, _IVOR10@l \t\n"
- "mtIVOR10 %r3" : : : "memory");
+ asm volatile ("li %%r3, _IVOR4@l \t\n"
+ "mtIVOR4 %%r3 \t\n"
+ "li %%r3, _IVOR10@l \t\n"
+ "mtIVOR10 %%r3" : : : "memory");
#endif
}
|