Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba741e35 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by H. Peter Anvin
Browse files

x86, asm: change GEN_*_RMWcc() to use CC_SET()/CC_OUT() 



Change the GEN_*_RMWcc() macros to use the CC_SET()/CC_OUT() macros
defined in <asm/asm.h>, and disable the use of asm goto if
__GCC_ASM_FLAG_OUTPUTS__ is enabled.  This allows gcc to receive the
flags output directly in gcc 6+.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/1465414726-197858-6-git-send-email-hpa@linux.intel.com


Reviewed-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent ff3554b4

arch/x86/include/asm/rmwcc.h

+9 −5
Original line number Diff line number Diff line 
#ifndef _ASM_X86_RMWcc

#define _ASM_X86_RMWcc



#ifdef CC_HAVE_ASM_GOTO

#if !defined(__GCC_ASM_FLAG_OUTPUTS__) && defined(CC_HAVE_ASM_GOTO)



/* Use asm goto */



#define __GEN_RMWcc(fullop, var, cc, ...)				\

do {									\
@@ -19,13 +21,15 @@ cc_label: \ 
#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc)			\

	__GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))



#else /* !CC_HAVE_ASM_GOTO */

#else /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CC_HAVE_ASM_GOTO) */



/* Use flags output or a set instruction */



#define __GEN_RMWcc(fullop, var, cc, ...)				\

do {									\

	bool c;								\

	asm volatile (fullop "; set" #cc " %1"				\

			: "+m" (var), "=qm" (c)				\

	asm volatile (fullop ";" CC_SET(cc)				\

			: "+m" (var), CC_OUT(cc) (c)			\

			: __VA_ARGS__ : "memory");			\

	return c;							\

} while (0)
@@ -36,6 +40,6 @@ do { \ 
#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc)			\

	__GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))



#endif /* CC_HAVE_ASM_GOTO */

#endif /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CC_HAVE_ASM_GOTO) */



#endif /* _ASM_X86_RMWcc */