[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/15] tcg-arm: Simplify logic in detecting the A
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v4 10/15] tcg-arm: Simplify logic in detecting the ARM ISA in use |
Date: |
Thu, 4 Jul 2013 13:40:57 -0700 |
GCC 4.8 defines a handy __ARM_ARCH symbol that we can use, which
will make us nicely forward compatible with ARMv8 AArch32.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/arm/tcg-target.c | 62 +++++++++++++++++++---------------------------------
1 file changed, 23 insertions(+), 39 deletions(-)
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
index cfb9afb..fde1715 100644
--- a/tcg/arm/tcg-target.c
+++ b/tcg/arm/tcg-target.c
@@ -22,50 +22,34 @@
* THE SOFTWARE.
*/
-#if defined(__ARM_ARCH_7__) || \
- defined(__ARM_ARCH_7A__) || \
- defined(__ARM_ARCH_7EM__) || \
- defined(__ARM_ARCH_7M__) || \
- defined(__ARM_ARCH_7R__)
-#define USE_ARMV7_INSTRUCTIONS
+/* The __ARM_ARCH define is provided by gcc 4.8. Construct it otherwise. */
+#ifndef __ARM_ARCH
+# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
+ || defined(__ARM_ARCH_7EM__)
+# define __ARM_ARCH 7
+# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__)
+# define __ARM_ARCH 6
+# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5E__) \
+ || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) \
+ || defined(__ARM_ARCH_5TEJ__)
+# define __ARM_ARCH 5
+# else
+# define __ARM_ARCH 4
+# endif
#endif
-#if defined(USE_ARMV7_INSTRUCTIONS) || \
- defined(__ARM_ARCH_6J__) || \
- defined(__ARM_ARCH_6K__) || \
- defined(__ARM_ARCH_6T2__) || \
- defined(__ARM_ARCH_6Z__) || \
- defined(__ARM_ARCH_6ZK__)
-#define USE_ARMV6_INSTRUCTIONS
-#endif
-
-#if defined(USE_ARMV6_INSTRUCTIONS) || \
- defined(__ARM_ARCH_5T__) || \
- defined(__ARM_ARCH_5TE__) || \
- defined(__ARM_ARCH_5TEJ__)
-#define USE_ARMV5T_INSTRUCTIONS
-#endif
-
-#ifdef USE_ARMV5T_INSTRUCTIONS
-static const int use_armv5t_instructions = 1;
+#if defined(__ARM_ARCH_5T__) \
+ || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
+# define use_armv5t_instructions 1
#else
-static const int use_armv5t_instructions = 0;
+# define use_armv5t_instructions use_armv6_instructions
#endif
-#undef USE_ARMV5_INSTRUCTIONS
-#ifdef USE_ARMV6_INSTRUCTIONS
-static const int use_armv6_instructions = 1;
-#else
-static const int use_armv6_instructions = 0;
-#endif
-#undef USE_ARMV6_INSTRUCTIONS
-
-#ifdef USE_ARMV7_INSTRUCTIONS
-static const int use_armv7_instructions = 1;
-#else
-static const int use_armv7_instructions = 0;
-#endif
-#undef USE_ARMV7_INSTRUCTIONS
+#define use_armv6_instructions (__ARM_ARCH >= 6)
+#define use_armv7_instructions (__ARM_ARCH >= 7)
#ifndef use_idiv_instructions
bool use_idiv_instructions;
--
1.8.1.4
- [Qemu-devel] [PATCH v4 02/15] tcg: Split rem requirement from div requirement, (continued)
- [Qemu-devel] [PATCH v4 02/15] tcg: Split rem requirement from div requirement, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 04/15] tcg-ppc: Don't implement rem, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 05/15] tcg-ppc64: Don't implement rem, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 06/15] tcg: Allow non-constant control macros, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 07/15] tcg: Simplify logic using TCG_OPF_NOT_PRESENT, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 08/15] tcg-arm: Make use of conditional availability of opcodes for divide, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 09/15] tcg-arm: Rename use_armv5_instructions to use_armvt5_instructions, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 10/15] tcg-arm: Simplify logic in detecting the ARM ISA in use,
Richard Henderson <=
- [Qemu-devel] [PATCH v4 11/15] tcg-arm: Use AT_PLATFORM to detect the host ISA, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 12/15] tcg: Fix high_pc fields in .debug_info, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 14/15] tcg-i386: Use QEMU_BUILD_BUG_ON instead of assert for frame size, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 15/15] tcg-arm: Implement tcg_register_jit, Richard Henderson, 2013/07/04
- [Qemu-devel] [PATCH v4 13/15] tcg: Move the CIE and FDE header definitions to common code, Richard Henderson, 2013/07/04