X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=15fe5b7f79112bf6b36662611e603148692c6036;hb=f709a37e5659fd591b5a61d80b45257105ac1850;hp=26bac5e1c47c0bf55f68f69decbe351ee2a8be28;hpb=9d22fd92fd90cfbf6db5651b01042a7a29826e5f;p=bertos.git

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 26bac5e1..15fe5b7f 100644
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -41,7 +41,8 @@
 #include "proc.h"
 
 #include "cfg/cfg_arch.h"  // ARCH_EMUL
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
 #include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
 #include <cfg/depend.h>    // CONFIG_DEPEND()
@@ -57,12 +58,6 @@
 
 #include <string.h>           /* memset() */
 
-// Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_SIGNALS,    CONFIG_KERN_SCHED);
-CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS);
-CONFIG_DEPEND(CONFIG_KERN_MONITOR,    CONFIG_KERN_SCHED);
-
-
 /*
  * The scheduer tracks ready processes by enqueuing them in the
  * ready list.
@@ -207,17 +202,23 @@ 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 = (cpu_stack_t *)((uintptr_t)proc->stack + (sizeof(cpu_aligned_stack_t) - ((uintptr_t)proc->stack % sizeof(cpu_aligned_stack_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 = (cpu_stack_t *)((uintptr_t)proc - ((uintptr_t)proc % sizeof(cpu_aligned_stack_t)));
 		if (CPU_SP_ON_EMPTY_SLOT)
 			proc->stack--;
 	}
+	/* Ensure stack is aligned */
+	ASSERT((uintptr_t)proc->stack % sizeof(cpu_aligned_stack_t) == 0);
 
+	stack_size -= PROC_SIZE_WORDS * sizeof(cpu_stack_t);
 	proc_init_struct(proc);
 	proc->user_data = data;
 
@@ -234,22 +235,14 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 
 		getcontext(&proc->context);
 		proc->context.uc_stack.ss_sp = proc->stack;
-		proc->context.uc_stack.ss_size = stack_size - PROC_SIZE_WORDS - 1;
+		proc->context.uc_stack.ss_size = stack_size - 1;
 		proc->context.uc_link = NULL;
 		makecontext(&proc->context, (void (*)(void))proc_entry, 1, entry);
 
 	#else // !CONFIG_KERN_PREEMPT
-	{
-		size_t i;
-
-		/* Initialize process stack frame */
-		CPU_PUSH_CALL_FRAME(proc->stack, proc_exit);
-		CPU_PUSH_CALL_FRAME(proc->stack, entry);
-
-		/* Push a clean set of CPU registers for asm_switch_context() */
-		for (i = 0; i < CPU_SAVED_REGS_CNT; i++)
-			CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i));
-	}
+	
+		CPU_CREATE_NEW_STACK(proc->stack, entry, proc_exit);
+		
 	#endif // CONFIG_KERN_PREEMPT
 
 	#if CONFIG_KERN_MONITOR
@@ -323,9 +316,9 @@ void proc_setPri(struct Process *proc, int pri)
 
 		if (proc != CurrentProcess)
 		{
-				//proc_forbid();
-				//TODO: re-enqueue process
-				//pric_permit();
+				proc_forbid();
+				ATOMIC(sched_reenqueue(proc));
+				proc_permit();
 		}
 }
 #endif // CONFIG_KERN_PRI