uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Some fixes in ASM code

Browse source
This commit is contained in:
Joel Bodenmann 2015-07-12 13:08:48 +02:00
parent 6a75ab2588
commit 185cb998e2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gos/gos_raw32.c
View file

@ -708,11 +708,11 @@ static void cleanUpDeadThreads(void) {
"mov r6, r10 \n\t" \ "mov r6, r10 \n\t" \
"mov r7, r11 \n\t" \ "mov r7, r11 \n\t" \
"push {r4, r5, r6, r7}" : : : "memory"); \ "push {r4, r5, r6, r7}" : : : "memory"); \
current->ctx = r13; \ current->cxt = r13; \
} }
#define CXT_RESTORE() { \ #define CXT_RESTORE() { \
register void * r13 asm ("r13"); \ register void * r13 asm ("r13"); \
r13 = current->ctx; \ r13 = current->cxt; \
asm volatile ( "pop {r4, r5, r6, r7} \n\t" \ asm volatile ( "pop {r4, r5, r6, r7} \n\t" \
"mov r8, r4 \n\t" \ "mov r8, r4 \n\t" \
"mov r9, r5 \n\t" \ "mov r9, r5 \n\t" \
@ -726,33 +726,33 @@ static void cleanUpDeadThreads(void) {
// Use the EABI calling standard (ARM's AAPCS) - Save r4 - r11 and floating point if needed // Use the EABI calling standard (ARM's AAPCS) - Save r4 - r11 and floating point if needed
#define CXT_SET(t) { \ #define CXT_SET(t) { \
register void *r13 asm ("r13"); \ register void* r13 asm("r13"); \
current = t; \ current = t; \
r13 = (char *)current + current->size; \ r13 = (char *)current + current->size; \
} }
#if CORTEX_USE_FPU #if CORTEX_USE_FPU
#define CXT_SAVE() { \ #define CXT_SAVE() { \
register void *r13 asm ("r13"); \ register void* r13 asm("r13"); \
asm volatile ("push {r4, r5, r6, r7, r8, r9, r10, r11, lr}" : : : "memory");\ asm volatile ("push {r4, r5, r6, r7, r8, r9, r10, r11, lr}" : : : "memory");\
asm volatile ("vpush {s16-s31}" : : : "memory"); \ asm volatile ("vpush {s16-s31}" : : : "memory"); \
current->ctx = r13; \ current->cxt = r13; \
} }
#define CXT_RESTORE() { \ #define CXT_RESTORE() { \
register void * r13 asm ("r13"); \ register void* r13 asm("r13"); \
r13 = current->ctx; \ r13 = current->cxt; \
asm volatile ("vpop {s16-s31}" : : : "memory"); \ asm volatile ("vpop {s16-s31}" : : : "memory"); \
asm volatile ("pop {r4, r5, r6, r7, r8, r9, r10, r11, pc}" : : : "memory"); \ asm volatile ("pop {r4, r5, r6, r7, r8, r9, r10, r11, pc}" : : : "memory"); \
} }
#else #else
#define CXT_SAVE() { \ #define CXT_SAVE() { \
register void *r13 asm ("r13"); \ register void* r13 asm("r13"); \
asm volatile ("push {r4, r5, r6, r7, r8, r9, r10, r11, lr}" : : : "memory");\ asm volatile ("push {r4, r5, r6, r7, r8, r9, r10, r11, lr}" : : : "memory");\
current->ctx = r13; \ current->cxt = r13; \
} }
#define CXT_RESTORE() { \ #define CXT_RESTORE() { \
register void * r13 asm ("r13"); \ register void* r13 asm("r13"); \
r13 = current->ctx; \ r13 = current->cxt; \
asm volatile ("pop {r4, r5, r6, r7, r8, r9, r10, r11, pc}" : : : "memory"); \ asm volatile ("pop {r4, r5, r6, r7, r8, r9, r10, r11, pc}" : : : "memory"); \
} }
#endif #endif