Fix stack alineament on new process.

[bertos.git] / bertos / kern / proc.c

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 7ce077b0c14f7974a2e9a76c95770489fd66ac5b..6b1aaaff51fe97870b35a826ddaa96d4dd21d496 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -202,17 +202,21 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
        {
                proc = (Process *)stack_base;
                proc->stack = stack_base + PROC_SIZE_WORDS;
+               // On some architecture stack should be aligned, so we do it.
+               proc->stack = (void *)proc->stack + (sizeof(cpu_aligned_stack_t) - ((long)proc->stack % sizeof(cpu_stack_aligned_t)));
                if (CPU_SP_ON_EMPTY_SLOT)
                        proc->stack++;
        }
        else
        {
                proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS);
-               proc->stack = (cpu_stack_t *)proc;
+               // On some architecture stack should be aligned, so we do it.
+               proc->stack = (void *)proc - ((long)proc % sizeof(cpu_aligned_stack_t));
                if (CPU_SP_ON_EMPTY_SLOT)
                        proc->stack--;
        }
 
+       stack_size = stack_size - PROC_SIZE_WORDS;
        proc_init_struct(proc);
        proc->user_data = data;
 
@@ -319,7 +323,7 @@ void proc_setPri(struct Process *proc, int pri)
                if (proc != CurrentProcess)
                {
                                proc_forbid();
-                               ATOMIC(SCHED_CHANGE_PRI(proc));
+                               ATOMIC(sched_reenqueue(proc));
                                proc_permit();
                }
 }