projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Declare task stack as union of uint8_t and uint32_t
[fw/altos]
/
src
/
stmf0
/
ao_arch_funcs.h
diff --git
a/src/stmf0/ao_arch_funcs.h
b/src/stmf0/ao_arch_funcs.h
index b2ce77a054cf878549797db38f405c044b89e8c8..9233f0440eb9d8c6f49c62dee60281f9dfd8e273 100644
(file)
--- a/
src/stmf0/ao_arch_funcs.h
+++ b/
src/stmf0/ao_arch_funcs.h
@@
-389,7
+389,7
@@
ao_arch_memory_barrier(void) {
static inline void
ao_arch_init_stack(struct ao_task *task, void *start)
{
static inline void
ao_arch_init_stack(struct ao_task *task, void *start)
{
- uint32_t *sp =
(uint32_t *) ((void *) task->stack + AO_STACK_SIZE)
;
+ uint32_t *sp =
&task->stack32[AO_STACK_SIZE >> 2]
;
uint32_t a = (uint32_t) start;
int i;
uint32_t a = (uint32_t) start;
int i;
@@
-407,7
+407,7
@@
ao_arch_init_stack(struct ao_task *task, void *start)
/* PRIMASK with interrupts enabled */
ARM_PUSH32(sp, 0);
/* PRIMASK with interrupts enabled */
ARM_PUSH32(sp, 0);
- task->sp = sp;
+ task->sp
32
= sp;
}
static inline void ao_arch_save_regs(void) {
}
static inline void ao_arch_save_regs(void) {
@@
-426,17
+426,14
@@
static inline void ao_arch_save_regs(void) {
static inline void ao_arch_save_stack(void) {
uint32_t *sp;
asm("mov %0,sp" : "=&r" (sp) );
static inline void ao_arch_save_stack(void) {
uint32_t *sp;
asm("mov %0,sp" : "=&r" (sp) );
- ao_cur_task->sp = (sp);
- if (
(uint8_t *) sp < &ao_cur_task->stack
[0])
+ ao_cur_task->sp
32
= (sp);
+ if (
sp < &ao_cur_task->stack32
[0])
ao_panic (AO_PANIC_STACK);
}
static inline void ao_arch_restore_stack(void) {
ao_panic (AO_PANIC_STACK);
}
static inline void ao_arch_restore_stack(void) {
- uint32_t sp;
- sp = (uint32_t) ao_cur_task->sp;
-
/* Switch stacks */
/* Switch stacks */
- asm("mov sp, %0" : : "r" (
sp
) );
+ asm("mov sp, %0" : : "r" (
ao_cur_task->sp32
) );
/* Restore PRIMASK */
asm("pop {r0}");
/* Restore PRIMASK */
asm("pop {r0}");