michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel/arch: consolidate tTCS and TNANO definitions

Browse source 
There was a lot of duplication between architectures for the definition
of threads and the "nanokernel" guts. These have been consolidated.

Now, a common file kernel/unified/include/kernel_structs.h holds the
common definitions. Architectures provide two files to complement it:
kernel_arch_data.h and kernel_arch_func.h. The first one contains at
least the struct _thread_arch and struct _kernel_arch data structures,
as well as the struct _callee_saved and struct _caller_saved register
layouts. The second file contains anything that needs what is provided
by the common stuff in kernel_structs.h. Those two files are only meant
to be included in kernel_structs.h in very specific locations.

The thread data structure has been separated into three major parts:
common struct _thread_base and struct k_thread, and arch-specific struct
_thread_arch. The first and third ones are included in the second.

The struct s_NANO data structure has been split into two: common struct
_kernel and arch-specific struct _kernel_arch. The latter is included in
the former.

Offsets files have also changed: nano_offsets.h has been renamed
kernel_offsets.h and is still included by the arch-specific offsets.c.
Also, since the thread and kernel data structures are now made of
sub-structures, offsets have to be added to make up the full offset.
Some of these additions have been consolidated in shorter symbols,
available from kernel/unified/include/offsets_short.h, which includes an
arch-specific offsets_arch_short.h. Most of the code include
offsets_short.h now instead of offsets.h.

Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2016-11-08 10:36:50 -05:00 • committed by Anas Nashif
commit f6ca7de09c
123 changed files with 2249 additions and 1998 deletions
Download patch file Download diff file Expand all files Collapse all files

54
arch/x86/core/thread.c
View file

@ -28,13 +28,9 @@
#include <toolchain.h>
#include <sections.h>
#include <nano_private.h>
#include <kernel_structs.h>
#include <wait_q.h>
/* the one and only nanokernel control structure */
tNANO _nanokernel = {0};
/* forward declaration */
#if defined(CONFIG_GDB_INFO) || defined(CONFIG_DEBUG_INFO) \
@ -47,17 +43,17 @@ void _thread_entry_wrapper(_thread_entry_t, void *,
/*
* Add a thread to the kernel's list of active threads.
*/
static ALWAYS_INLINE void thread_monitor_init(struct tcs *tcs)
static ALWAYS_INLINE void thread_monitor_init(struct k_thread *thread)
{
unsigned int key;
key = irq_lock();
tcs->next_thread = _nanokernel.threads;
_nanokernel.threads = tcs;
thread->next_thread = _kernel.threads;
_kernel.threads = thread;
irq_unlock(key);
}
#else
#define thread_monitor_init(tcs) \
#define thread_monitor_init(thread) \
do {/* do nothing */ \
} while ((0))
#endif /* CONFIG_THREAD_MONITOR */
@ -84,27 +80,27 @@ static void _new_thread_internal(char *pStackMem, unsigned stackSize,
unsigned options)
{
unsigned long *pInitialCtx;
/* ptr to the new task's tcs */
struct tcs *tcs = (struct tcs *)pStackMem;
/* ptr to the new task's k_thread */
struct k_thread *thread = (struct k_thread *)pStackMem;
tcs->prio = priority;
thread->base.prio = priority;
#if (defined(CONFIG_FP_SHARING) || defined(CONFIG_GDB_INFO))
tcs->excNestCount = 0;
thread->arch.excNestCount = 0;
#endif /* CONFIG_FP_SHARING || CONFIG_GDB_INFO */
/* k_q_node initialized upon first insertion in a list */
tcs->flags = options | K_PRESTART;
tcs->sched_locked = 0;
thread->base.flags = options | K_PRESTART;
thread->base.sched_locked = 0;
/* static threads overwrite it afterwards with real value */
tcs->init_data = NULL;
tcs->fn_abort = NULL;
thread->init_data = NULL;
thread->fn_abort = NULL;
#ifdef CONFIG_THREAD_CUSTOM_DATA
/* Initialize custom data field (value is opaque to kernel) */
tcs->custom_data = NULL;
thread->custom_data = NULL;
#endif
ARG_UNUSED(uk_task_ptr);
@ -121,10 +117,10 @@ static void _new_thread_internal(char *pStackMem, unsigned stackSize,
#ifdef CONFIG_THREAD_MONITOR
/*
* In debug mode tcs->entry give direct access to the thread entry
* In debug mode thread->entry give direct access to the thread entry
* and the corresponding parameters.
*/
tcs->entry = (struct __thread_entry *)(pInitialCtx -
thread->entry = (struct __thread_entry *)(pInitialCtx -
sizeof(struct __thread_entry));
#endif
@ -137,14 +133,14 @@ static void _new_thread_internal(char *pStackMem, unsigned stackSize,
*/
pInitialCtx -= 11;
tcs->coopReg.esp = (unsigned long)pInitialCtx;
PRINTK("\nInitial context ESP = 0x%x\n", tcs->coopReg.esp);
thread->callee_saved.esp = (unsigned long)pInitialCtx;
PRINTK("\nInitial context ESP = 0x%x\n", thread->coopReg.esp);
PRINTK("\nstruct tcs * = 0x%x", tcs);
PRINTK("\nstruct thread * = 0x%x", thread);
thread_monitor_init(tcs);
thread_monitor_init(thread);
_nano_timeout_tcs_init(tcs);
_nano_timeout_thread_init(thread);
}
#if defined(CONFIG_GDB_INFO) || defined(CONFIG_DEBUG_INFO) \
@ -234,7 +230,7 @@ __asm__("\t.globl _thread_entry\n"
* This function is utilized to create execution threads for both fiber
* threads and kernel tasks.
*
* The "thread control block" (TCS) is carved from the "end" of the specified
* The k_thread structure is carved from the "end" of the specified
* thread stack memory.
*
* @param pStackmem the pointer to aligned stack memory
@ -247,7 +243,7 @@ __asm__("\t.globl _thread_entry\n"
* @param options thread options: K_ESSENTIAL, K_FP_REGS, K_SSE_REGS
*
*
* @return opaque pointer to initialized TCS structure
* @return opaque pointer to initialized k_thread structure
*/
void _new_thread(char *pStackMem, unsigned stackSize,
void *uk_task_ptr, _thread_entry_t pEntry,
@ -308,8 +304,8 @@ void _new_thread(char *pStackMem, unsigned stackSize,
*/
/*
* For kernel tasks and fibers the thread the thread control struct (TCS)
* is located at the "low end" of memory set aside for the thread's stack.
* The k_thread structure is located at the "low end" of memory set
* aside for the thread's stack.
*/
_new_thread_internal(pStackMem, stackSize, uk_task_ptr, priority, options);