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
/
stm
/
ao_arch_funcs.h
diff --git
a/src/stm/ao_arch_funcs.h
b/src/stm/ao_arch_funcs.h
index e55ecb743e5f9e4be9cce08dd24a8a69067736ca..ad46ef32babf9fd52b0f9d58f08fd09e6f534275 100644
(file)
--- a/
src/stm/ao_arch_funcs.h
+++ b/
src/stm/ao_arch_funcs.h
@@
-475,7
+475,7
@@
ao_arch_irq_check(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;
@@
-493,7
+493,7
@@
ao_arch_init_stack(struct ao_task *task, void *start)
/* BASEPRI with interrupts enabled */
ARM_PUSH32(sp, 0);
/* BASEPRI 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) {
@@
-517,12
+517,12
@@
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);
+ ao_cur_task->sp
32
= (sp);
}
static inline void ao_arch_restore_stack(void) {
/* Switch stacks */
}
static inline void ao_arch_restore_stack(void) {
/* Switch stacks */
- asm("mov sp, %0" : : "r" (ao_cur_task->sp) );
+ asm("mov sp, %0" : : "r" (ao_cur_task->sp
32
) );
#ifdef AO_NONMASK_INTERRUPTS
/* Restore BASEPRI */
#ifdef AO_NONMASK_INTERRUPTS
/* Restore BASEPRI */