From c9fb6e581486573e4eb9b73dd9036cc5e4c3e9f7 Mon Sep 17 00:00:00 2001 From: Yufeng Zhang Date: Mon, 18 Nov 2013 17:23:33 +0000 Subject: [PATCH] Add support for armv7ve to gas. gas/ * config/tc-arm.c (arm_archs): New armv7ve architecture option. (arm_cpus): Replace ARM_ARCH_V7A_IDIV_MP_SEC_VIRT with ARM_ARCH_V7VE for cortex-a7, cortex-a12 and cortex-a15. (cpu_arch_ver): Likewise. * doc/c-arm.texi: Document armv7ve. gas/testsuite/ * gas/arm/attr-march-armv7ve.d: New test case for armv7ve. include/opcode/ * arm.h (ARM_AEXT_V7VE): New define. (ARM_ARCH_V7VE): New define. (ARM_ARCH_V7A_IDIV_MP_SEC_VIRT): Removed. --- gas/ChangeLog | 8 ++++++++ gas/config/tc-arm.c | 12 +++++------- gas/doc/c-arm.texi | 1 + gas/testsuite/ChangeLog | 8 ++++++-- gas/testsuite/gas/arm/attr-march-armv7ve.d | 17 +++++++++++++++++ include/opcode/ChangeLog | 6 ++++++ include/opcode/arm.h | 8 +++----- 7 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 gas/testsuite/gas/arm/attr-march-armv7ve.d diff --git a/gas/ChangeLog b/gas/ChangeLog index da64a28..af9b771 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2013-11-18 Renlin Li + + * config/tc-arm.c (arm_archs): New armv7ve architecture option. + (arm_cpus): Replace ARM_ARCH_V7A_IDIV_MP_SEC_VIRT with + ARM_ARCH_V7VE for cortex-a7, cortex-a12 and cortex-a15. + (cpu_arch_ver): Likewise. + * doc/c-arm.texi: Document armv7ve. + 2013-11-18 Zhenqiang Chen * config/tc-aarch64.c (parse_sys_reg): Support diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index f97c307..08b5ea2 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -23997,8 +23997,7 @@ static const struct arm_cpu_option_table arm_cpus[] = ARM_CPU_OPT ("arm1176jzf-s", ARM_ARCH_V6ZK, FPU_ARCH_VFP_V2, NULL), ARM_CPU_OPT ("cortex-a5", ARM_ARCH_V7A_MP_SEC, FPU_NONE, "Cortex-A5"), - ARM_CPU_OPT ("cortex-a7", ARM_ARCH_V7A_IDIV_MP_SEC_VIRT, - FPU_ARCH_NEON_VFP_V4, + ARM_CPU_OPT ("cortex-a7", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4, "Cortex-A7"), ARM_CPU_OPT ("cortex-a8", ARM_ARCH_V7A_SEC, ARM_FEATURE (0, FPU_VFP_V3 @@ -24008,11 +24007,9 @@ static const struct arm_cpu_option_table arm_cpus[] = ARM_FEATURE (0, FPU_VFP_V3 | FPU_NEON_EXT_V1), "Cortex-A9"), - ARM_CPU_OPT ("cortex-a12", ARM_ARCH_V7A_IDIV_MP_SEC_VIRT, - FPU_ARCH_NEON_VFP_V4, + ARM_CPU_OPT ("cortex-a12", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4, "Cortex-A12"), - ARM_CPU_OPT ("cortex-a15", ARM_ARCH_V7A_IDIV_MP_SEC_VIRT, - FPU_ARCH_NEON_VFP_V4, + ARM_CPU_OPT ("cortex-a15", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4, "Cortex-A15"), ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, "Cortex-A53"), @@ -24093,6 +24090,7 @@ static const struct arm_arch_option_table arm_archs[] = /* The official spelling of the ARMv7 profile variants is the dashed form. Accept the non-dashed form for compatibility with old toolchains. */ ARM_ARCH_OPT ("armv7a", ARM_ARCH_V7A, FPU_ARCH_VFP), + ARM_ARCH_OPT ("armv7ve", ARM_ARCH_V7VE, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv7r", ARM_ARCH_V7R, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv7m", ARM_ARCH_V7M, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv7-a", ARM_ARCH_V7A, FPU_ARCH_VFP), @@ -24672,7 +24670,7 @@ static const cpu_arch_ver_table cpu_arch_ver[] = {11, ARM_ARCH_V6M}, {12, ARM_ARCH_V6SM}, {8, ARM_ARCH_V6T2}, - {10, ARM_ARCH_V7A_IDIV_MP_SEC_VIRT}, + {10, ARM_ARCH_V7VE}, {10, ARM_ARCH_V7R}, {10, ARM_ARCH_V7M}, {14, ARM_ARCH_V8A}, diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi index 37756a0..b4b2d95 100644 --- a/gas/doc/c-arm.texi +++ b/gas/doc/c-arm.texi @@ -200,6 +200,7 @@ names are recognized: @code{armv6s-m}, @code{armv7}, @code{armv7-a}, +@code{armv7ve}, @code{armv7-r}, @code{armv7-m}, @code{armv7e-m}, diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index f2912bb..174ca8e 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,7 +1,11 @@ +2013-11-18 Renlin Li + + * gas/arm/attr-march-armv7ve.d: New test case for armv7ve. + 2013-11-18 Zhenqiang Chen - * gas/testsuite/sysreg.s: Add test. - * gas/testsuite/sysreg.d: Update. + * gas/aarch64/sysreg.s: Add test. + * gas/aarch64/sysreg.d: Update. 2013-11-18 Yufeng Zhang diff --git a/gas/testsuite/gas/arm/attr-march-armv7ve.d b/gas/testsuite/gas/arm/attr-march-armv7ve.d new file mode 100644 index 0000000..604183f --- /dev/null +++ b/gas/testsuite/gas/arm/attr-march-armv7ve.d @@ -0,0 +1,17 @@ +# name: attributes for -march=armv7ve +# source: blank.s +# as: -march=armv7ve +# readelf: -A +# This test is only valid on EABI based ports. +# target: *-*-*eabi* *-*-nacl* + +Attribute Section: aeabi +File Attributes + Tag_CPU_name: "7VE" + Tag_CPU_arch: v7 + Tag_CPU_arch_profile: Application + Tag_ARM_ISA_use: Yes + Tag_THUMB_ISA_use: Thumb-2 + Tag_MPextension_use: Allowed + Tag_DIV_use: Allowed in v7-A with integer division extension + Tag_Virtualization_use: TrustZone and Virtualization Extensions diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 7e2b9ce..f4d1b06 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,9 @@ +2013-11-18 Renlin Li + + * arm.h (ARM_AEXT_V7VE): New define. + (ARM_ARCH_V7VE): New define. + (ARM_ARCH_V7A_IDIV_MP_SEC_VIRT): Removed. + 2013-11-18 Yufeng Zhang Revert diff --git a/include/opcode/arm.h b/include/opcode/arm.h index 851fd3c..b7e4cca 100644 --- a/include/opcode/arm.h +++ b/include/opcode/arm.h @@ -116,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 \ @@ -224,6 +226,7 @@ #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) @@ -241,11 +244,6 @@ #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. */ -- 2.7.4