#include "proc_p.h"
#include "proc.h"
-#include "cfg/cfg_arch.h" /* ARCH_EMUL */
+#include "cfg/cfg_arch.h" // ARCH_EMUL
#include "cfg/cfg_kern.h"
+#include <cfg/macros.h> // ROUND_UP2
#include <cfg/module.h>
#include <cfg/depend.h> // CONFIG_DEPEND()
List StackFreeList;
#define NPROC 8
-cpustack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpustack_t)];
+cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
#endif
/** The main process (the one that executes main()). */
* \return Process structure of new created process
* if successful, NULL otherwise.
*/
-struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpu_stack_t *stack_base)
{
Process *proc;
- const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
+ const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpu_stack_t)) / sizeof(cpu_stack_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. */
- PROC_ATOMIC(stack_base = (cpustack_t *)list_remHead(&StackFreeList));
+ PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList));
stack_size = CONFIG_KERN_MINSTACKSIZE;
#elif CONFIG_KERN_HEAP
#endif // !ARCH_EMUL && !CONFIG_KERN_HEAP
#if CONFIG_KERN_MONITOR
- /* Fill-in the stack with a special marker to help debugging */
- memset(stack_base, CONFIG_KERN_STACKFILLCODE, stack_size);
+ /*
+ * Fill-in the stack with a special marker to help debugging.
+ * On 64bit platforms, CONFIG_KERN_STACKFILLCODE is larger
+ * than an int, so the (int) cast is required to silence the
+ * warning for truncating its size.
+ */
+ memset(stack_base, (int)CONFIG_KERN_STACKFILLCODE, stack_size);
#endif
/* Initialize the process control block */
}
else
{
- proc = (Process *)(stack_base + stack_size / sizeof(cpustack_t) - PROC_SIZE_WORDS);
- proc->stack = (cpustack_t *)proc;
+ proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS);
+ proc->stack = (cpu_stack_t *)proc;
if (CPU_SP_ON_EMPTY_SLOT)
proc->stack--;
}