Index: include/opcode/arm.h |
diff --git a/include/opcode/arm.h b/include/opcode/arm.h |
index 86e3d67db130fd8465df5471cd840d28cc6b7f7f..b7e4cca237f9671da4c97a1f8d932047b633f967 100644 |
--- a/include/opcode/arm.h |
+++ b/include/opcode/arm.h |
@@ -34,6 +34,7 @@ |
#define ARM_EXT_V6 0x00001000 /* ARM V6. */ |
#define ARM_EXT_V6K 0x00002000 /* ARM V6K. */ |
/* 0x00004000 Was ARM V6Z. */ |
+#define ARM_EXT_V8 0x00004000 /* is now ARMv8. */ |
#define ARM_EXT_V6T2 0x00008000 /* Thumb-2. */ |
#define ARM_EXT_DIV 0x00010000 /* Integer division. */ |
/* The 'M' in Arm V7M stands for Microcontroller. |
@@ -77,6 +78,10 @@ |
#define FPU_VFP_EXT_FP16 0x00100000 /* Half-precision extensions. */ |
#define FPU_NEON_EXT_FMA 0x00080000 /* Neon fused multiply-add */ |
#define FPU_VFP_EXT_FMA 0x00040000 /* VFP fused multiply-add */ |
+#define FPU_VFP_EXT_ARMV8 0x00020000 /* FP for ARMv8. */ |
+#define FPU_NEON_EXT_ARMV8 0x00010000 /* Neon for ARMv8. */ |
+#define FPU_CRYPTO_EXT_ARMV8 0x00008000 /* Crypto for ARMv8. */ |
+#define CRC_EXT_ARMV8 0x00004000 /* CRC32 for ARMv8. */ |
/* Architectures are the sum of the base and extensions. The ARM ARM (rev E) |
defines the following: ARMv3, ARMv3M, ARMv4xM, ARMv4, ARMv4TxM, ARMv4T, |
@@ -111,6 +116,8 @@ |
#define ARM_AEXT_V6ZKT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K | ARM_EXT_SEC) |
#define ARM_AEXT_V7_ARM (ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER) |
#define ARM_AEXT_V7A (ARM_AEXT_V7_ARM | ARM_EXT_V7A) |
+#define ARM_AEXT_V7VE (ARM_AEXT_V7A | ARM_EXT_DIV | ARM_EXT_ADIV \ |
+ | ARM_EXT_VIRT | ARM_EXT_SEC | ARM_EXT_MP) |
#define ARM_AEXT_V7R (ARM_AEXT_V7_ARM | ARM_EXT_V7R | ARM_EXT_DIV) |
#define ARM_AEXT_NOTM \ |
(ARM_AEXT_V4 | ARM_EXT_V5ExP | ARM_EXT_V5J | ARM_EXT_V6_NOTM \ |
@@ -126,6 +133,9 @@ |
#define ARM_AEXT_V7 (ARM_AEXT_V7A & ARM_AEXT_V7R & ARM_AEXT_V7M) |
#define ARM_AEXT_V7EM \ |
(ARM_AEXT_V7M | ARM_EXT_V5ExP | ARM_EXT_V6_DSP) |
+#define ARM_AEXT_V8A \ |
+ (ARM_AEXT_V7A | ARM_EXT_MP | ARM_EXT_SEC | ARM_EXT_DIV | ARM_EXT_ADIV \ |
+ | ARM_EXT_VIRT | ARM_EXT_V8) |
/* Processors with specific extensions in the co-processor space. */ |
#define ARM_ARCH_XSCALE ARM_FEATURE (ARM_AEXT_V5TE, ARM_CEXT_XSCALE) |
@@ -143,6 +153,9 @@ |
#define FPU_VFP_V4D16 (FPU_VFP_V3D16 | FPU_VFP_EXT_FP16 | FPU_VFP_EXT_FMA) |
#define FPU_VFP_V4 (FPU_VFP_V3 | FPU_VFP_EXT_FP16 | FPU_VFP_EXT_FMA) |
#define FPU_VFP_V4_SP_D16 (FPU_VFP_V3xD | FPU_VFP_EXT_FP16 | FPU_VFP_EXT_FMA) |
+#define FPU_VFP_ARMV8 (FPU_VFP_V4 | FPU_VFP_EXT_ARMV8) |
+#define FPU_NEON_ARMV8 (FPU_NEON_EXT_V1 | FPU_NEON_EXT_FMA | FPU_NEON_EXT_ARMV8) |
+#define FPU_CRYPTO_ARMV8 (FPU_CRYPTO_EXT_ARMV8) |
#define FPU_VFP_HARD (FPU_VFP_EXT_V1xD | FPU_VFP_EXT_V1 | FPU_VFP_EXT_V2 \ |
| FPU_VFP_EXT_V3xD | FPU_VFP_EXT_FMA | FPU_NEON_EXT_FMA \ |
| FPU_VFP_EXT_V3 | FPU_NEON_EXT_V1 | FPU_VFP_EXT_D32) |
@@ -175,6 +188,11 @@ |
#define FPU_ARCH_VFP_V4_SP_D16 ARM_FEATURE(0, FPU_VFP_V4_SP_D16) |
#define FPU_ARCH_NEON_VFP_V4 \ |
ARM_FEATURE(0, FPU_VFP_V4 | FPU_NEON_EXT_V1 | FPU_NEON_EXT_FMA) |
+#define FPU_ARCH_VFP_ARMV8 ARM_FEATURE(0, FPU_VFP_ARMV8) |
+#define FPU_ARCH_NEON_VFP_ARMV8 ARM_FEATURE(0, FPU_NEON_ARMV8 | FPU_VFP_ARMV8) |
+#define FPU_ARCH_CRYPTO_NEON_VFP_ARMV8 \ |
+ ARM_FEATURE(0, FPU_CRYPTO_ARMV8 | FPU_NEON_ARMV8 | FPU_VFP_ARMV8) |
+#define ARCH_CRC_ARMV8 ARM_FEATURE(0, CRC_EXT_ARMV8) |
#define FPU_ARCH_ENDIAN_PURE ARM_FEATURE (0, FPU_ENDIAN_PURE) |
@@ -208,9 +226,11 @@ |
#define ARM_ARCH_V6SM ARM_FEATURE (ARM_AEXT_V6SM, 0) |
#define ARM_ARCH_V7 ARM_FEATURE (ARM_AEXT_V7, 0) |
#define ARM_ARCH_V7A ARM_FEATURE (ARM_AEXT_V7A, 0) |
+#define ARM_ARCH_V7VE ARM_FEATURE (ARM_AEXT_V7VE, 0) |
#define ARM_ARCH_V7R ARM_FEATURE (ARM_AEXT_V7R, 0) |
#define ARM_ARCH_V7M ARM_FEATURE (ARM_AEXT_V7M, 0) |
#define ARM_ARCH_V7EM ARM_FEATURE (ARM_AEXT_V7EM, 0) |
+#define ARM_ARCH_V8A ARM_FEATURE (ARM_AEXT_V8A, 0) |
/* Some useful combinations: */ |
#define ARM_ARCH_NONE ARM_FEATURE (0, 0) |
@@ -224,15 +244,18 @@ |
#define ARM_ARCH_V7A_MP_SEC \ |
ARM_FEATURE (ARM_AEXT_V7A | ARM_EXT_MP | ARM_EXT_SEC, \ |
0) |
-/* v7-a+idiv+mp+sec+virt. */ |
-#define ARM_ARCH_V7A_IDIV_MP_SEC_VIRT \ |
- ARM_FEATURE (ARM_AEXT_V7A | ARM_EXT_MP | ARM_EXT_SEC \ |
- | ARM_EXT_DIV | ARM_EXT_ADIV \ |
- | ARM_EXT_VIRT, 0) |
/* v7-r+idiv. */ |
#define ARM_ARCH_V7R_IDIV ARM_FEATURE (ARM_AEXT_V7R | ARM_EXT_ADIV, 0) |
/* Features that are present in v6M and v6S-M but not other v6 cores. */ |
#define ARM_ARCH_V6M_ONLY ARM_FEATURE (ARM_AEXT_V6M_ONLY, 0) |
+/* v8-a+fp. */ |
+#define ARM_ARCH_V8A_FP ARM_FEATURE (ARM_AEXT_V8A, FPU_ARCH_VFP_ARMV8) |
+/* v8-a+simd (implies fp). */ |
+#define ARM_ARCH_V8A_SIMD ARM_FEATURE (ARM_AEXT_V8A, \ |
+ FPU_ARCH_NEON_VFP_ARMV8) |
+/* v8-a+crypto (implies simd+fp). */ |
+#define ARM_ARCH_V8A_CRYPTOV1 ARM_FEATURE (ARM_AEXT_V8A, \ |
+ FPU_ARCH_CRYPTO_NEON_VFP_ARMV8) |
/* There are too many feature bits to fit in a single word, so use a |
structure. For simplicity we put all core features in one word and |
@@ -246,6 +269,9 @@ typedef struct |
#define ARM_CPU_HAS_FEATURE(CPU,FEAT) \ |
(((CPU).core & (FEAT).core) != 0 || ((CPU).coproc & (FEAT).coproc) != 0) |
+#define ARM_CPU_IS_ANY(CPU) \ |
+ ((CPU).core == ((arm_feature_set)ARM_ANY).core) |
+ |
#define ARM_MERGE_FEATURE_SETS(TARG,F1,F2) \ |
do { \ |
(TARG).core = (F1).core | (F2).core; \ |