f6ca7de09c
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>
124 lines
3.3 KiB
C
124 lines
3.3 KiB
C
/*
|
|
* Copyright (c) 2016 Wind River Systems, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/* this file is only meant to be included by kernel_structs.h */
|
|
|
|
#ifndef _kernel_arch_func__h_
|
|
#define _kernel_arch_func__h_
|
|
|
|
#ifndef _ASMLANGUAGE
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* stack alignment related macros: STACK_ALIGN_SIZE is defined above */
|
|
|
|
#define STACK_ROUND_UP(x) ROUND_UP(x, STACK_ALIGN_SIZE)
|
|
#define STACK_ROUND_DOWN(x) ROUND_DOWN(x, STACK_ALIGN_SIZE)
|
|
|
|
/**
|
|
*
|
|
* @brief Performs architecture-specific initialization
|
|
*
|
|
* This routine performs architecture-specific initialization of the nanokernel.
|
|
* Trivial stuff is done inline; more complex initialization is done via
|
|
* function calls.
|
|
*
|
|
* @return N/A
|
|
*/
|
|
static inline void nanoArchInit(void)
|
|
{
|
|
extern void *__isr___SpuriousIntHandler;
|
|
extern void *_dummy_spurious_interrupt;
|
|
extern void *_dummy_exception_vector_stub;
|
|
extern char _interrupt_stack[CONFIG_ISR_STACK_SIZE];
|
|
|
|
extern void _exception_enter(void);
|
|
|
|
_kernel.nested = 0;
|
|
|
|
_kernel.irq_stack = _interrupt_stack + CONFIG_ISR_STACK_SIZE;
|
|
/*
|
|
* Forces the inclusion of the spurious interrupt handlers. If a
|
|
* reference isn't made then intconnect.o is never pulled in by the
|
|
* linker.
|
|
*/
|
|
|
|
_dummy_spurious_interrupt = &__isr___SpuriousIntHandler;
|
|
|
|
/*
|
|
* Forces the inclusion of the exception vector stub code. If a
|
|
* reference isn't made then excstubs.o is never pulled in by the
|
|
* linker.
|
|
*/
|
|
|
|
_dummy_exception_vector_stub = &_exception_enter;
|
|
|
|
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @brief Set the return value for the specified fiber (inline)
|
|
*
|
|
* @param fiber pointer to fiber
|
|
* @param value value to set as return value
|
|
*
|
|
* The register used to store the return value from a function call invocation
|
|
* is set to <value>. It is assumed that the specified <fiber> is pending, and
|
|
* thus the fibers context is stored in its TCS.
|
|
*
|
|
* @return N/A
|
|
*/
|
|
static ALWAYS_INLINE void
|
|
_set_thread_return_value(struct k_thread *thread, unsigned int value)
|
|
{
|
|
/* write into 'eax' slot created in _Swap() entry */
|
|
|
|
*(unsigned int *)(thread->callee_saved.esp) = value;
|
|
}
|
|
|
|
extern void nano_cpu_atomic_idle(unsigned int imask);
|
|
|
|
extern void _MsrWrite(unsigned int msr, uint64_t msrData);
|
|
extern uint64_t _MsrRead(unsigned int msr);
|
|
|
|
/*
|
|
* _IntLibInit() is called from the non-arch specific nanokernel function,
|
|
* _nano_init(). The IA-32 nanokernel does not require any special
|
|
* initialization of the interrupt subsystem. However, we still need to
|
|
* provide an _IntLibInit() of some sort to prevent build errors.
|
|
*/
|
|
static inline void _IntLibInit(void)
|
|
{
|
|
}
|
|
|
|
/* the _idt_base_address symbol is generated via a linker script */
|
|
extern unsigned char _idt_base_address[];
|
|
|
|
#include <stddef.h> /* For size_t */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define _is_in_isr() (_kernel.nested != 0)
|
|
|
|
#endif /* _ASMLANGUAGE */
|
|
|
|
#endif /* _kernel_arch_func__h_ */
|