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

10
kernel/unified/sem.c
View file

@ -27,7 +27,7 @@
*/
#include <kernel.h>
#include <nano_private.h>
#include <kernel_structs.h>
#include <misc/debug/object_tracing_common.h>
#include <toolchain.h>
#include <sections.h>
@ -44,7 +44,7 @@ struct _sem_desc {
};
struct _sem_thread {
struct tcs_base dummy;
struct _thread_base dummy;
struct _sem_desc desc;
};
#endif
@ -120,7 +120,7 @@ int k_sem_group_take(struct k_sem *sem_array[], struct k_sem **sem,
sys_dlist_t list;
sys_dlist_init(&list);
_current->swap_data = &list;
_current->base.swap_data = &list;
for (int i = 0; i < num; i++) {
wait_objects[i].dummy.flags = K_DUMMY;
@ -172,7 +172,7 @@ static int handle_sem_group(struct k_sem *sem, struct k_thread *thread)
sys_dnode_t *node;
sys_dnode_t *next;
if (!(thread->flags & K_DUMMY)) {
if (!(thread->base.flags & K_DUMMY)) {
/*
* The awakened thread is a real thread and thus was not
* involved in a semaphore group operation.
@ -185,7 +185,7 @@ static int handle_sem_group(struct k_sem *sem, struct k_thread *thread)
* in a semaphore group operation.
*/
list = (sys_dlist_t *)dummy->desc.thread->swap_data;
list = (sys_dlist_t *)dummy->desc.thread->base.swap_data;
node = sys_dlist_peek_head(list);
__ASSERT(node != NULL, "");