Commit 0b930a21 authored by Stephanos Ioannidis's avatar Stephanos Ioannidis Committed by Ioannis Glaropoulos
Browse files

kconfig: Rename x86 FPU sharing symbols 



This commit renames the x86 Kconfig `CONFIG_{EAGER,LAZY}_FP_SHARING`
symbol to `CONFIG_{EAGER,LAZY}_FPU_SHARING`, in order to align with the
recent `CONFIG_FP_SHARING` to `CONFIG_FPU_SHARING` renaming.

Signed-off-by: default avatarStephanos Ioannidis <root@stephanos.io>
parent aaf93205

arch/x86/core/Kconfig.ia32

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ config SSE_FP_MATH 
	  Disabling this option means that the compiler utilizes only the

	  x87 instruction set for floating point operations.



config EAGER_FP_SHARING

config EAGER_FPU_SHARING

	bool

	depends on FPU

	depends on USERSPACE
@@ -113,10 +113,10 @@ config EAGER_FP_SHARING 
	  FPU register set, should be used any time CONFIG_FPU is

	  enabled, regardless if the FPU is used by one thread or multiple.



config LAZY_FP_SHARING

config LAZY_FPU_SHARING

	bool

	depends on FPU

	depends on !EAGER_FP_SHARING

	depends on !EAGER_FPU_SHARING

	depends on FPU_SHARING

	default y if X86_NO_LAZY_FP || !USERSPACE

	help

arch/x86/core/ia32.cmake

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ zephyr_library_sources( 


zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD		ia32/irq_offload.c)

zephyr_library_sources_ifdef(CONFIG_X86_USERSPACE	ia32/userspace.S)

zephyr_library_sources_ifdef(CONFIG_LAZY_FP_SHARING	ia32/float.c)

zephyr_library_sources_ifdef(CONFIG_LAZY_FPU_SHARING	ia32/float.c)



# Last since we declare default exception handlers here

zephyr_library_sources(ia32/fatal.c)

arch/x86/core/ia32/excstub.S

+4 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ SECTION_FUNC(TEXT, _exception_enter) 
#endif

	/* ESP is pointing to the ESF at this point */



#if defined(CONFIG_LAZY_FP_SHARING)

#if defined(CONFIG_LAZY_FPU_SHARING)



	movl	_kernel + _kernel_offset_to_current, %edx
@@ -141,7 +141,7 @@ SECTION_FUNC(TEXT, _exception_enter) 


	orb	$X86_THREAD_FLAG_EXC, _thread_offset_to_flags(%edx)



#endif /* CONFIG_LAZY_FP_SHARING */

#endif /* CONFIG_LAZY_FPU_SHARING */



	/*

	 * restore interrupt enable state, then call the handler
@@ -164,7 +164,7 @@ allDone: 
	call	*%ecx			/* call exception handler */

	addl	$0x4, %esp



#if defined(CONFIG_LAZY_FP_SHARING)

#if defined(CONFIG_LAZY_FPU_SHARING)



	movl	_kernel + _kernel_offset_to_current, %ecx
@@ -194,7 +194,7 @@ allDone: 
	andb	$~X86_THREAD_FLAG_EXC, _thread_offset_to_flags(%ecx)



nestedException:

#endif /* CONFIG_LAZY_FP_SHARING */

#endif /* CONFIG_LAZY_FPU_SHARING */



	/*

	 * Pop the non-volatile registers from the stack.

arch/x86/core/ia32/float.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 * safely by one or more cooperative threads OR by a single preemptive thread,

 * but not by both.

 *

 * This code is not necessary for systems with CONFIG_EAGER_FP_SHARING, as

 * This code is not necessary for systems with CONFIG_EAGER_FPU_SHARING, as

 * the floating point context is unconditionally saved/restored with every

 * context switch.

 *

arch/x86/core/ia32/intstub.S

+3 −3
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ alreadyOnIntStack: 
	 * debug tools that a preemptive context switch has occurred.

	 */



#if defined(CONFIG_LAZY_FP_SHARING)

#if defined(CONFIG_LAZY_FPU_SHARING)

	orb	$X86_THREAD_FLAG_INT, _thread_offset_to_flags(%edx)

#endif
@@ -261,7 +261,7 @@ alreadyOnIntStack: 
	 * returning control to it at the point where it was interrupted ...

	 */



#if defined(CONFIG_LAZY_FP_SHARING)

#if defined(CONFIG_LAZY_FPU_SHARING)

	/*

	 * arch_swap() has restored the floating point registers, if needed.

	 * Clear X86_THREAD_FLAG_INT in the interrupted thread's state
@@ -270,7 +270,7 @@ alreadyOnIntStack: 


	movl	_kernel + _kernel_offset_to_current, %eax

	andb	$~X86_THREAD_FLAG_INT, _thread_offset_to_flags(%eax)

#endif /* CONFIG_LAZY_FP_SHARING */

#endif /* CONFIG_LAZY_FPU_SHARING */



	/* Restore volatile registers and return to the interrupted thread */

	popl	%edi

CRA Git | Maintained and supported by SUSTech CRA and CCSE