Changeset 632:db3ab874e604

Timestamp:

12/08/08 14:38:38 (4 weeks ago)

Author:

"David Anderson <dave@…

Branch:

default

Tags:

tip

Message:

Fix the stack position computation logic.

Files:

• nxos/systems/marvin/scheduler.c (modified) (2 diffs)

nxos/systems/marvin/scheduler.c

@@ -14 +14 @@
 #include "base/drivers/avr.h"
 #include "base/lib/memalloc/memalloc.h"
+#include "base/asm_decls.h"
 
 #include "marvin/_task.h"
@@ -173 +174 @@
   t = nx_calloc(1, sizeof(*t));
   t->stack_base = nx_calloc(1, stack_size);
-  t->stack_current = t->stack_base + (stack_size >> 2) - sizeof(*s);
+  t->stack_current = (U32*) ((U32)t->stack_base + stack_size - sizeof(*s));
   s = (nx_task_stack_t*)t->stack_current;
   s->pc = (U32) func;
   s->lr = (U32) task_shutdown;
-  s->cpsr = 0x1F; /* TODO: Nice define. */
+  s->cpsr = MODE_SYS;
   if (s->pc & 0x1) {
     s->pc &= 0xFFFFFFFE;