riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that stack pointer is correctly aligned during thread creation on MSP430

Browse Source
This commit is contained in:
Kévin Roussel 2014-03-13 11:56:34 +01:00
parent 0c9fd83693
commit 054367c23a
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cpu/msp430-common/cpu.c
View File

@ -53,33 +53,35 @@ __attribute__((section (".fini9"))) void __main_epilogue(void) { __asm__("ret");
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
char *thread_stack_init(void (*task_func)(void), void *stack_start, int stack_size) char *thread_stack_init(void (*task_func)(void), void *stack_start, int stack_size)
{ {
unsigned short *stk; unsigned short stk = (unsigned short)(stack_start + stack_size);
/* XXX: work around for misalignment, remove once solved properly in thread.c */ /* ensure correct stack alignment (on 16-bit boundary) */
stack_size--; stk &= 0xfffe;
unsigned short *stackptr = (unsigned short *)stk;
stk = (unsigned short *)(stack_start + stack_size); /* now make SP point on the first AVAILABLE slot in stack */
--stackptr;
*stk = (unsigned short) sched_task_exit; *stackptr = (unsigned short) sched_task_exit;
--stk; --stackptr;
*stk = (unsigned short) task_func; *stackptr = (unsigned short) task_func;
--stk; --stackptr;
/* initial value for SR */ /* initial value for SR */
*stk = GIE; *stackptr = GIE;
--stk; --stackptr;
/* Space for registers. */ /* Space for registers. */
for (unsigned int i = 15; i > 4; i--) { for (unsigned int i = 15; i > 4; i--) {
*stk = i; *stackptr = i;
--stk; --stackptr;
} }
//stk -= 11; //stackptr -= 11;
return (char *) stk; return (char *) stackptr;
} }
int inISR() int inISR()