devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

ARM: r12 is scratch, so don't save it.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8505 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2006-01-31 14:48:10 +00:00
parent ae0ae6d5cf
commit 023936d5e4
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
firmware/thread.c
View file

@ -44,7 +44,7 @@ struct regs
#elif defined(CPU_ARM) #elif defined(CPU_ARM)
struct regs struct regs
{ {
unsigned int r[9]; /* Registers r4-r12 */ unsigned int r[8]; /* Registers r4-r11 */
void *sp; /* Stack pointer (r13) */ void *sp; /* Stack pointer (r13) */
unsigned int lr; /* r14 (lr) */ unsigned int lr; /* r14 (lr) */
void *start; /* Thread start address, or NULL when started */ void *start; /* Thread start address, or NULL when started */
@ -93,7 +93,7 @@ void profile_thread(void) {
static inline void store_context(void* addr) static inline void store_context(void* addr)
{ {
asm volatile( asm volatile(
"stmia %0, { r4-r14 } \n" "stmia %0, { r4-r11, sp, lr }\n"
: : "r" (addr) : : "r" (addr)
); );
} }
@ -105,17 +105,16 @@ static inline void store_context(void* addr)
static inline void load_context(const void* addr) static inline void load_context(const void* addr)
{ {
asm volatile( asm volatile(
"ldmia %0, { r4-r14 } \n" /* load regs r4 to r14 from context */ "ldmia %0, { r4-r11, sp, lr }\n" /* load regs r4 to r14 from context */
"ldr r0, [%0, #44] \n" /* load start pointer */ "ldr r0, [%0, #40] \n" /* load start pointer */
"mov r1, #0 \n" "mov r1, #0 \n"
"cmp r0, r1 \n" /* check for NULL */ "cmp r0, r1 \n" /* check for NULL */
"strne r1, [%0, #44] \n" /* if it's NULL, we're already running */ "strne r1, [%0, #40] \n" /* if it's NULL, we're already running */
"movne pc, r0 \n" /* not already running, so jump to start */ "movne pc, r0 \n" /* not already running, so jump to start */
: : "r" (addr) : "r0", "r1" : : "r" (addr) : "r0", "r1"
); );
} }
#elif defined(CPU_COLDFIRE) #elif defined(CPU_COLDFIRE)
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
* Store non-volatile context. * Store non-volatile context.