Skip to content
Permalink
Browse files

arch/x86: move include/arch/x86/asm.h to include/arch/x86/ia32/asm.h

This file is 32-bit specific, so it is moved into the ia32/ directory
and references to it are updated accordingly.

Also, SP_ARG* definitions are no longer used, so they are removed.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
  • Loading branch information...
Charles E. Youse authored and nashif committed Jun 27, 2019
1 parent c7bc7a8 commit 6f3009ecf07fcc8b397f24591bee2cd518787222
@@ -10,7 +10,7 @@
* This module contains functions for manipulating caches.
*/

#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>

#ifndef CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED

@@ -11,7 +11,7 @@
* after having been loaded into RAM.
*/

#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>
#include <arch/x86/msr.h>
#include <kernel_arch_data.h>
#include <arch/cpu.h>
@@ -15,7 +15,7 @@
*/

#include <kernel_structs.h>
#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>
#include <arch/x86/arch.h> /* For MK_ISR_NAME */
#include <offsets_short.h>

@@ -15,7 +15,7 @@
*/

#include <kernel_structs.h>
#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>
#include <offsets_short.h>
#include <arch/cpu.h> /* _NANO_ERR_SPURIOUS_INT */
#include <arch/x86/irq_controller.h>
@@ -18,7 +18,7 @@
*/

#include <kernel_structs.h>
#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>
#include <offsets_short.h>

/* exports (internal APIs) */
@@ -5,7 +5,7 @@
*/

#include <kernel_structs.h>
#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>
#include <arch/cpu.h>
#include <offsets_short.h>
#include <syscall.h>
@@ -10,7 +10,7 @@
*/

#include <kernel_structs.h>
#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>

GTEXT(z_loapic_spurious_handler)

@@ -6,25 +6,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef ZEPHYR_INCLUDE_ARCH_X86_ASM_H_
#define ZEPHYR_INCLUDE_ARCH_X86_ASM_H_

#ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_ASM_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_ASM_H_

#include <toolchain.h>
#include <linker/sections.h>

/* offsets from stack pointer to function arguments */

#define SP_ARG0 0
#define SP_ARG1 4
#define SP_ARG2 8
#define SP_ARG3 12
#define SP_ARG4 16
#define SP_ARG5 20
#define SP_ARG6 24
#define SP_ARG7 28
#define SP_ARG8 32

#if defined(_ASMLANGUAGE)

#if defined(CONFIG_X86_RETPOLINE)
@@ -86,4 +73,4 @@ GTEXT(z_x86_trampoline_to_kernel)
#endif /* CONFIG_X86_KPTI */
#endif /* _ASMLANGUAGE */

#endif /* ZEPHYR_INCLUDE_ARCH_X86_ASM_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_ASM_H_ */
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>

#ifdef CONFIG_SYS_POWER_DEEP_SLEEP_STATES
GDATA(_pm_save_gdtr)
@@ -16,7 +16,7 @@ testing.

#include <arch/cpu.h>
#include <kernel_structs.h>
#include <arch/x86/asm.h>
#include <arch/x86/ia32/asm.h>
#include <asm_inline.h>

/* imports (internal APIs) */

0 comments on commit 6f3009e

Please sign in to comment.
You can’t perform that action at this time.