arch/x86: move kernel_arch_func.h to ia32/

Refactoring 32- and 64-bit subarchitectures, so this file is moved to ia32/ and a new "redirector" header file is introduced. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
zephyrproject-rtos · Jul 4, 2019 · 820ea28 · 820ea28
1 parent f40fe36
commit 820ea28
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 75 deletions.
diff --git a/arch/x86/include/ia32/kernel_arch_func.h b/arch/x86/include/ia32/kernel_arch_func.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016 Wind River Systems, Inc.
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* this file is only meant to be included by kernel_structs.h */
+
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_IA32_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)
+
+extern K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE);
+
+/**
+ *
+ * @brief Performs architecture-specific initialization
+ *
+ * This routine performs architecture-specific initialization of the kernel.
+ * Trivial stuff is done inline; more complex initialization is done via
+ * function calls.
+ *
+ * @return N/A
+ */
+static inline void kernel_arch_init(void)
+{
+	_kernel.nested = 0;
+	_kernel.irq_stack = Z_THREAD_STACK_BUFFER(_interrupt_stack) +
+				CONFIG_ISR_STACK_SIZE;
+#if CONFIG_X86_STACK_PROTECTION
+	z_x86_mmu_set_flags(&z_x86_kernel_pdpt, _interrupt_stack, MMU_PAGE_SIZE,
+			   MMU_ENTRY_NOT_PRESENT, MMU_PTE_P_MASK);
+#endif
+}
+
+/**
+ *
+ * @brief Set the return value for the specified thread (inline)
+ *
+ * @param thread pointer to thread
+ * @param value value to set as return value
+ *
+ * The register used to store the return value from a function call invocation
+ * is set to @a value.  It is assumed that the specified @a thread is pending, and
+ * thus the threads context is stored in its TCS.
+ *
+ * @return N/A
+ */
+static ALWAYS_INLINE void
+z_set_thread_return_value(struct k_thread *thread, unsigned int value)
+{
+	/* write into 'eax' slot created in z_swap() entry */
+
+	*(unsigned int *)(thread->callee_saved.esp) = value;
+}
+
+extern void k_cpu_atomic_idle(unsigned int key);
+
+extern FUNC_NORETURN void z_x86_userspace_enter(k_thread_entry_t user_entry,
+					       void *p1, void *p2, void *p3,
+					       u32_t stack_end,
+					       u32_t stack_start);
+
+#include <stddef.h> /* For size_t */
+
+#ifdef __cplusplus
+}
+#endif
+
+#define z_is_in_isr() (_kernel.nested != 0U)
+
+#endif /* _ASMLANGUAGE */
+
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_IA32_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/x86/include/kernel_arch_func.h b/arch/x86/include/kernel_arch_func.h
@@ -1,85 +1,13 @@
 /*
- * Copyright (c) 2016 Wind River Systems, Inc.
- * Copyright (c) 2018 Intel Corporation
- *
+ * Copyright (c) 2019 Intel Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* this file is only meant to be included by kernel_structs.h */
-
 #ifndef ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_
 #define ZEPHYR_ARCH_X86_INCLUDE_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)
-
-extern K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE);
-
-/**
- *
- * @brief Performs architecture-specific initialization
- *
- * This routine performs architecture-specific initialization of the kernel.
- * Trivial stuff is done inline; more complex initialization is done via
- * function calls.
- *
- * @return N/A
- */
-static inline void kernel_arch_init(void)
-{
-	_kernel.nested = 0;
-	_kernel.irq_stack = Z_THREAD_STACK_BUFFER(_interrupt_stack) +
-				CONFIG_ISR_STACK_SIZE;
-#if CONFIG_X86_STACK_PROTECTION
-	z_x86_mmu_set_flags(&z_x86_kernel_pdpt, _interrupt_stack, MMU_PAGE_SIZE,
-			   MMU_ENTRY_NOT_PRESENT, MMU_PTE_P_MASK);
-#endif
-}
-
-/**
- *
- * @brief Set the return value for the specified thread (inline)
- *
- * @param thread pointer to thread
- * @param value value to set as return value
- *
- * The register used to store the return value from a function call invocation
- * is set to @a value.  It is assumed that the specified @a thread is pending, and
- * thus the threads context is stored in its TCS.
- *
- * @return N/A
- */
-static ALWAYS_INLINE void
-z_set_thread_return_value(struct k_thread *thread, unsigned int value)
-{
-	/* write into 'eax' slot created in z_swap() entry */
-
-	*(unsigned int *)(thread->callee_saved.esp) = value;
-}
-
-extern void k_cpu_atomic_idle(unsigned int key);
-
-extern FUNC_NORETURN void z_x86_userspace_enter(k_thread_entry_t user_entry,
-					       void *p1, void *p2, void *p3,
-					       u32_t stack_end,
-					       u32_t stack_start);
-
-#include <stddef.h> /* For size_t */
-
-#ifdef __cplusplus
-}
+#ifndef CONFIG_X86_LONGMODE
+#include <ia32/kernel_arch_func.h>
 #endif
 
-#define z_is_in_isr() (_kernel.nested != 0U)
-
-#endif /* _ASMLANGUAGE */
-
 #endif /* ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_ */