X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=37b36e07d664c9509f9d920c51357b6b5c027f75;hb=f481adc9d8e495b3a306c996a8e064ccdd70ac43;hp=a9e956243a2677267449f74241541f87f0e55862;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index a9e95624..37b36e07 100644
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -27,7 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 1999,2000,2001 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
@@ -36,24 +36,26 @@
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
 
 #include "proc_p.h"
 #include "proc.h"
-//#include "hw.h"
-#include <mware/event.h>
+
+#include "cfg/cfg_arch.h"  /* ARCH_EMUL */
+#include <cfg/debug.h>
+#include <cfg/module.h>
+#include <cfg/macros.h>       /* ABS() */
+
 #include <cpu/irq.h>
 #include <cpu/types.h>
 #include <cpu/attr.h>
-#include <cfg/debug.h>
-#include <cfg/module.h>
-#include <cfg/arch_config.h>  /* ARCH_EMUL */
-#include <cfg/macros.h>  /* ABS() */
 
-#include <string.h> /* memset() */
+#include <mware/event.h>
+
+#include <string.h>           /* memset() */
 
 /**
  * CPU dependent context switching routines.
@@ -61,7 +63,6 @@
  * \note This function *MUST* preserve also the status of the interrupts.
  */
 EXTERN_C void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp);
-EXTERN_C int asm_switch_version(void);
 
 /*
  * The scheduer tracks ready and waiting processes
@@ -127,8 +128,6 @@ void proc_init(void)
 	proc_init_struct(&MainProcess);
 	CurrentProcess = &MainProcess;
 
-	/* Make sure the assembly routine is up-to-date with us */
-	ASSERT(asm_switch_version() == 1);
 	MOD_INIT(proc);
 }
 
@@ -139,30 +138,30 @@ void proc_init(void)
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
-struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
 {
 	Process *proc;
 	size_t i;
-	size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
+	const size_t PROC_SIZE_WORDS = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
 #if CONFIG_KERN_HEAP
 	bool free_stack = false;
 #endif
 
 #if (ARCH & ARCH_EMUL)
 	/* Ignore stack provided by caller and use the large enough default instead. */
-	stack_base = (cpustack_t *)LIST_HEAD(&StackFreeList);
-	REMOVE(LIST_HEAD(&StackFreeList));
-	stacksize = CONFIG_PROC_DEFSTACKSIZE;
+	stack_base = (cpustack_t *)list_remHead(&StackFreeList);
+
+	stack_size = CONFIG_PROC_DEFSTACKSIZE;
 #elif CONFIG_KERN_HEAP
 	/* Did the caller provide a stack for us? */
 	if (!stack_base)
 	{
 		/* Did the caller specify the desired stack size? */
-		if (!stacksize)
-			stacksize = CONFIG_PROC_DEFSTACKSIZE + sizeof(Process);
+		if (!stack_size)
+			stack_size = CONFIG_PROC_DEFSTACKSIZE + sizeof(Process);
 
 		/* Allocate stack dinamically */
-		if (!(stack_base = heap_alloc(stacksize)))
+		if (!(stack_base = heap_alloc(stack_size)))
 			return NULL;
 
 		free_stack = true;
@@ -170,25 +169,25 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 #else
 	/* Stack must have been provided by the user */
 	ASSERT(stack_base);
-	ASSERT(stacksize);
+	ASSERT(stack_size);
 #endif
 
 #if CONFIG_KERN_MONITOR
 	/* Fill-in the stack with a special marker to help debugging */
-	memset(stack_base, CONFIG_KERN_STACKFILLCODE, stacksize / sizeof(cpustack_t));
+	memset(stack_base, CONFIG_KERN_STACKFILLCODE, stack_size / sizeof(cpustack_t));
 #endif
 
 	/* Initialize the process control block */
 	if (CPU_STACK_GROWS_UPWARD)
 	{
 		proc = (Process*)stack_base;
-		proc->stack = stack_base + proc_size_words;
+		proc->stack = stack_base + PROC_SIZE_WORDS;
 		if (CPU_SP_ON_EMPTY_SLOT)
 			proc->stack++;
 	}
 	else
 	{
-		proc = (Process*)(stack_base + stacksize / sizeof(cpustack_t) - proc_size_words);
+		proc = (Process*)(stack_base + stack_size / sizeof(cpustack_t) - PROC_SIZE_WORDS);
 		proc->stack = (cpustack_t*)proc;
 		if (CPU_SP_ON_EMPTY_SLOT)
 			proc->stack--;
@@ -197,11 +196,13 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 	proc_init_struct(proc);
 	proc->user_data = data;
 
-#if CONFIG_KERN_HEAP
+#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
 	proc->stack_base = stack_base;
 	proc->stack_size = stack_size;
+	#if CONFIG_KERN_HEAP
 	if (free_stack)
 		proc->flags |= PF_FREESTACK;
+	#endif
 #endif
 
 	/* Initialize process stack frame */
@@ -216,7 +217,7 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 	ATOMIC(SCHED_ENQUEUE(proc));
 
 #if CONFIG_KERN_MONITOR
-	monitor_add(proc, name, stack_base, stacksize);
+	monitor_add(proc, name);
 #endif
 
 	return proc;
@@ -264,7 +265,7 @@ void proc_schedule(void)
 		 * are idle-spinning, we must allow interrupts, otherwise no
 		 * process will ever wake up.
 		 *
-		 * During idle-spinning, can occur an interrupt, it may be able to
+		 * During idle-spinning, an interrupt can occur and it may
 		 * modify \p ProcReadyList. To ensure that compiler reload this
 		 * variable every while cycle we call CPU_MEMORY_BARRIER.
 		 * The memory barrier ensure that all variables used in this context