From: "tip-bot for H. Peter Anvin" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com,
tglx@linutronix.de
Subject: [tip:x86/asm] x86, asm: change GEN_*_RMWcc() to use CC_SET()/CC_OUT()
Date: Tue, 7 Jun 2016 16:41:23 -0700 [thread overview]
Message-ID: <tip-560a154bc1fa2143b25b66ca013424a280bd8377@git.kernel.org> (raw)
In-Reply-To: <1465342269-492350-6-git-send-email-hpa@linux.intel.com>
Commit-ID: 560a154bc1fa2143b25b66ca013424a280bd8377
Gitweb: http://git.kernel.org/tip/560a154bc1fa2143b25b66ca013424a280bd8377
Author: H. Peter Anvin <hpa@zytor.com>
AuthorDate: Tue, 7 Jun 2016 16:31:04 -0700
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Tue, 7 Jun 2016 16:36:42 -0700
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: H. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/1465342269-492350-6-git-send-email-hpa@linux.intel.com
---
arch/x86/include/asm/rmwcc.h | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
index e3264c4..661dd30 100644
--- a/arch/x86/include/asm/rmwcc.h
+++ b/arch/x86/include/asm/rmwcc.h
@@ -1,7 +1,9 @@
#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 */
next prev parent reply other threads:[~2016-06-07 23:41 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 23:30 [PATCH 00/10] x86: use gcc 6+ asm flag output feature H. Peter Anvin
2016-06-07 23:31 ` [PATCH 01/10] x86, bitops: remove use of "sbb" to return CF H. Peter Anvin
2016-06-07 23:39 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-07 23:31 ` [PATCH 02/10] x86, asm: use bool for bitops and other assembly outputs H. Peter Anvin
2016-06-07 23:40 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-08 7:49 ` [PATCH 02/10] " Peter Zijlstra
2016-06-08 8:28 ` Ingo Molnar
2016-06-08 8:33 ` Ingo Molnar
2016-06-08 8:55 ` H. Peter Anvin
2016-06-08 9:01 ` Ingo Molnar
2016-06-08 9:12 ` H. Peter Anvin
2016-06-08 9:20 ` Ingo Molnar
2016-06-08 9:31 ` H. Peter Anvin
2016-06-08 9:39 ` Peter Zijlstra
2016-06-08 9:43 ` H. Peter Anvin
2016-06-08 9:40 ` H. Peter Anvin
2016-06-08 8:58 ` H. Peter Anvin
2016-06-08 9:06 ` Ingo Molnar
2016-06-07 23:31 ` [PATCH 03/10] x86, asm: change the GEN_*_RMWcc() macros to not quote the condition H. Peter Anvin
2016-06-07 23:40 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-07 23:31 ` [PATCH 04/10] x86, asm: define CC_SET() and CC_OUT() macros H. Peter Anvin
2016-06-07 23:40 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-08 5:09 ` [PATCH 04/10] " Andy Lutomirski
2016-06-08 19:29 ` H. Peter Anvin
2016-06-08 19:34 ` H. Peter Anvin
2016-06-08 19:35 ` Borislav Petkov
2016-06-07 23:31 ` [PATCH 05/10] x86, asm: change GEN_*_RMWcc() to use CC_SET()/CC_OUT() H. Peter Anvin
2016-06-07 23:41 ` tip-bot for H. Peter Anvin [this message]
2016-06-07 23:31 ` [PATCH 06/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/bitops.h> H. Peter Anvin
2016-06-07 23:41 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-07 23:31 ` [PATCH 07/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/percpu.h> H. Peter Anvin
2016-06-07 23:42 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-07 23:31 ` [PATCH 08/10] x86, asm: Use CC_SET()/CC_OUT() in <asm/rwsem.h> H. Peter Anvin
2016-06-07 23:42 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-07 23:31 ` [PATCH 09/10] x86, asm: Use CC_SET()/CC_OUT() and static_cpu_has() in archrandom.h H. Peter Anvin
2016-06-07 23:42 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-08 5:12 ` [PATCH 09/10] " Andy Lutomirski
2016-06-07 23:31 ` [PATCH 10/10] x86, asm, boot: Use CC_SET()/CC_OUT() in arch/x86/boot/boot.h H. Peter Anvin
2016-06-07 23:43 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
2016-06-08 8:00 ` [PATCH 00/10] x86: use gcc 6+ asm flag output feature Peter Zijlstra
2016-06-08 8:56 ` H. Peter Anvin
2016-06-08 8:26 ` Ingo Molnar
2016-06-08 19:38 [PATCH v2 05/10] x86, asm: change GEN_*_RMWcc() to use CC_SET()/CC_OUT() H. Peter Anvin
2016-06-08 19:47 ` [tip:x86/asm] " tip-bot for H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-560a154bc1fa2143b25b66ca013424a280bd8377@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).