Skip to content

R
riscv-gcc-1
Commit 050809ed by Richard Earnshaw Committed by Richard Earnshaw
Options

[arm] Split CPU, architecture and tuning data tables. 


The driver really needs to handle some canonicalization of the new
-mcpu and -march options in order to make multilib selection
tractable.  This will require moving much of the logic to parse the
new options into the common code file.  However, the tuning data
definitely does not want to be there as it is very specific to the
compiler passes.  To facilitate this we need to split up the generated
configuration data into architectural and tuning related tables.

This patch starts that process, but does not yet move any code out of
the compiler backend.  Since I'm reworking all that code I took the
opportunity to also separate out the CPU data tables from the
architecture data tables.  Although they are related, there is a lot
of redundancy in the CPU options that is best handled by simply
indirecting to the architecture entry.

	* config/arm/arm-protos.h (arm_build_target): Remove arch_core.
	(cpu_arch_extension): New structure.
	(cpu_arch_option, arch_option, cpu_option): New structures.
	* config/arm/parsecpu.awk (gen_headers): Build an enumeration of
	architecture types.
	(gen_data): Generate new format data tables.
	* config/arm/arm.c (cpu_tune): New structure.
	(cpu_option, processors): Delete.
	(arm_print_hint_for_core_or_arch): Delete.  Replace with ...
	(arm_print_hint_for_cpu_option): ... this and ...
	(arm_print_hint_for_arch_option): ... this.
	(arm_parse_arch_cpu_name): Delete.  Replace with ...
	(arm_parse_cpu_option_name): ... this and ...
	(arm_parse_arch_option_name): ... this.
	(arm_unrecognized_feature): Change type of target parameter to
	cpu_arch_option.
	(arm_parse_arch_cpu_features): Delete.  Replace with ...
	(arm_parse_option_features): ... this.
	(arm_configure_build_target): Rework to use new configuration data
	tables.
	(arm_print_tune_info): Rework for new configuration data tables.
	* config/arm/arm-cpu-data.h: Regenerated.
	* config/arm/arm-cpu.h: Regenerated.

From-SVN: r249286
parent 9ef88abe
Showing with 1496 additions and 917 deletions
gcc/ChangeLog
2017-06-16 Richard Earnshaw <rearnsha@arm.com> 2017-06-16 Richard Earnshaw <rearnsha@arm.com>
* config/arm/arm-protos.h (arm_build_target): Remove arch_core.
(cpu_arch_extension): New structure.
(cpu_arch_option, arch_option, cpu_option): New structures.
* config/arm/parsecpu.awk (gen_headers): Build an enumeration of
architecture types.
(gen_data): Generate new format data tables.
* config/arm/arm.c (cpu_tune): New structure.
(cpu_option, processors): Delete.
(arm_print_hint_for_core_or_arch): Delete. Replace with ...
(arm_print_hint_for_cpu_option): ... this and ...
(arm_print_hint_for_arch_option): ... this.
(arm_parse_arch_cpu_name): Delete. Replace with ...
(arm_parse_cpu_option_name): ... this and ...
(arm_parse_arch_option_name): ... this.
(arm_unrecognized_feature): Change type of target parameter to
cpu_arch_option.
(arm_parse_arch_cpu_features): Delete. Replace with ...
(arm_parse_option_features): ... this.
(arm_configure_build_target): Rework to use new configuration data
tables.
(arm_print_tune_info): Rework for new configuration data tables.
* config/arm/arm-cpu-data.h: Regenerated.
* config/arm/arm-cpu.h: Regenerated.
2017-06-16 Richard Earnshaw <rearnsha@arm.com>
* Makefile.in (OBJS): Move sbitmap.o from here ... * Makefile.in (OBJS): Move sbitmap.o from here ...
(OBJS-libcommon): ... to here. (OBJS-libcommon): ... to here.
......
gcc/config/arm/arm-cpu-data.h
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
License along with GCC; see the file COPYING3. If not see License along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
static const struct cpu_option cpu_opttab_arm9e[] = { static const cpu_arch_extension cpu_opttab_arm9e[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -28,7 +28,7 @@ static const struct cpu_option cpu_opttab_arm9e[] = { ...@@ -28,7 +28,7 @@ static const struct cpu_option cpu_opttab_arm9e[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm946es[] = { static const cpu_arch_extension cpu_opttab_arm946es[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -36,7 +36,7 @@ static const struct cpu_option cpu_opttab_arm946es[] = { ...@@ -36,7 +36,7 @@ static const struct cpu_option cpu_opttab_arm946es[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm966es[] = { static const cpu_arch_extension cpu_opttab_arm966es[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -44,7 +44,7 @@ static const struct cpu_option cpu_opttab_arm966es[] = { ...@@ -44,7 +44,7 @@ static const struct cpu_option cpu_opttab_arm966es[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm968es[] = { static const cpu_arch_extension cpu_opttab_arm968es[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -52,7 +52,7 @@ static const struct cpu_option cpu_opttab_arm968es[] = { ...@@ -52,7 +52,7 @@ static const struct cpu_option cpu_opttab_arm968es[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm10e[] = { static const cpu_arch_extension cpu_opttab_arm10e[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -60,7 +60,7 @@ static const struct cpu_option cpu_opttab_arm10e[] = { ...@@ -60,7 +60,7 @@ static const struct cpu_option cpu_opttab_arm10e[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm1020e[] = { static const cpu_arch_extension cpu_opttab_arm1020e[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -68,7 +68,7 @@ static const struct cpu_option cpu_opttab_arm1020e[] = { ...@@ -68,7 +68,7 @@ static const struct cpu_option cpu_opttab_arm1020e[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm1022e[] = { static const cpu_arch_extension cpu_opttab_arm1022e[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -76,7 +76,7 @@ static const struct cpu_option cpu_opttab_arm1022e[] = { ...@@ -76,7 +76,7 @@ static const struct cpu_option cpu_opttab_arm1022e[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm926ejs[] = { static const cpu_arch_extension cpu_opttab_arm926ejs[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -84,7 +84,7 @@ static const struct cpu_option cpu_opttab_arm926ejs[] = { ...@@ -84,7 +84,7 @@ static const struct cpu_option cpu_opttab_arm926ejs[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_arm1026ejs[] = { static const cpu_arch_extension cpu_opttab_arm1026ejs[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -92,7 +92,7 @@ static const struct cpu_option cpu_opttab_arm1026ejs[] = { ...@@ -92,7 +92,7 @@ static const struct cpu_option cpu_opttab_arm1026ejs[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_genericv7a[] = { static const cpu_arch_extension cpu_opttab_genericv7a[] = {
{ {
"simd", false, "simd", false,
{ ISA_VFPv3,ISA_NEON, isa_nobit } { ISA_VFPv3,ISA_NEON, isa_nobit }
...@@ -148,7 +148,7 @@ static const struct cpu_option cpu_opttab_genericv7a[] = { ...@@ -148,7 +148,7 @@ static const struct cpu_option cpu_opttab_genericv7a[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa5[] = { static const cpu_arch_extension cpu_opttab_cortexa5[] = {
{ {
"nosimd", true, "nosimd", true,
{ ISA_ALL_SIMD, isa_nobit } { ISA_ALL_SIMD, isa_nobit }
...@@ -160,7 +160,7 @@ static const struct cpu_option cpu_opttab_cortexa5[] = { ...@@ -160,7 +160,7 @@ static const struct cpu_option cpu_opttab_cortexa5[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa7[] = { static const cpu_arch_extension cpu_opttab_cortexa7[] = {
{ {
"nosimd", true, "nosimd", true,
{ ISA_ALL_SIMD, isa_nobit } { ISA_ALL_SIMD, isa_nobit }
...@@ -172,7 +172,7 @@ static const struct cpu_option cpu_opttab_cortexa7[] = { ...@@ -172,7 +172,7 @@ static const struct cpu_option cpu_opttab_cortexa7[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa8[] = { static const cpu_arch_extension cpu_opttab_cortexa8[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -180,7 +180,7 @@ static const struct cpu_option cpu_opttab_cortexa8[] = { ...@@ -180,7 +180,7 @@ static const struct cpu_option cpu_opttab_cortexa8[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa9[] = { static const cpu_arch_extension cpu_opttab_cortexa9[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -192,7 +192,7 @@ static const struct cpu_option cpu_opttab_cortexa9[] = { ...@@ -192,7 +192,7 @@ static const struct cpu_option cpu_opttab_cortexa9[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa12[] = { static const cpu_arch_extension cpu_opttab_cortexa12[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -200,7 +200,7 @@ static const struct cpu_option cpu_opttab_cortexa12[] = { ...@@ -200,7 +200,7 @@ static const struct cpu_option cpu_opttab_cortexa12[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa15[] = { static const cpu_arch_extension cpu_opttab_cortexa15[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -208,7 +208,7 @@ static const struct cpu_option cpu_opttab_cortexa15[] = { ...@@ -208,7 +208,7 @@ static const struct cpu_option cpu_opttab_cortexa15[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa17[] = { static const cpu_arch_extension cpu_opttab_cortexa17[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -216,7 +216,7 @@ static const struct cpu_option cpu_opttab_cortexa17[] = { ...@@ -216,7 +216,7 @@ static const struct cpu_option cpu_opttab_cortexa17[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexr5[] = { static const cpu_arch_extension cpu_opttab_cortexr5[] = {
{ {
"nofp.dp", true, "nofp.dp", true,
{ ISA_FP_DBL, isa_nobit } { ISA_FP_DBL, isa_nobit }
...@@ -228,7 +228,7 @@ static const struct cpu_option cpu_opttab_cortexr5[] = { ...@@ -228,7 +228,7 @@ static const struct cpu_option cpu_opttab_cortexr5[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexr7[] = { static const cpu_arch_extension cpu_opttab_cortexr7[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -236,7 +236,7 @@ static const struct cpu_option cpu_opttab_cortexr7[] = { ...@@ -236,7 +236,7 @@ static const struct cpu_option cpu_opttab_cortexr7[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexr8[] = { static const cpu_arch_extension cpu_opttab_cortexr8[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -244,7 +244,7 @@ static const struct cpu_option cpu_opttab_cortexr8[] = { ...@@ -244,7 +244,7 @@ static const struct cpu_option cpu_opttab_cortexr8[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexm7[] = { static const cpu_arch_extension cpu_opttab_cortexm7[] = {
{ {
"nofp.dp", true, "nofp.dp", true,
{ ISA_FP_DBL, isa_nobit } { ISA_FP_DBL, isa_nobit }
...@@ -256,7 +256,7 @@ static const struct cpu_option cpu_opttab_cortexm7[] = { ...@@ -256,7 +256,7 @@ static const struct cpu_option cpu_opttab_cortexm7[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexm4[] = { static const cpu_arch_extension cpu_opttab_cortexm4[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -264,7 +264,7 @@ static const struct cpu_option cpu_opttab_cortexm4[] = { ...@@ -264,7 +264,7 @@ static const struct cpu_option cpu_opttab_cortexm4[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa15cortexa7[] = { static const cpu_arch_extension cpu_opttab_cortexa15cortexa7[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -272,7 +272,7 @@ static const struct cpu_option cpu_opttab_cortexa15cortexa7[] = { ...@@ -272,7 +272,7 @@ static const struct cpu_option cpu_opttab_cortexa15cortexa7[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa17cortexa7[] = { static const cpu_arch_extension cpu_opttab_cortexa17cortexa7[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -280,7 +280,7 @@ static const struct cpu_option cpu_opttab_cortexa17cortexa7[] = { ...@@ -280,7 +280,7 @@ static const struct cpu_option cpu_opttab_cortexa17cortexa7[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa32[] = { static const cpu_arch_extension cpu_opttab_cortexa32[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -292,7 +292,7 @@ static const struct cpu_option cpu_opttab_cortexa32[] = { ...@@ -292,7 +292,7 @@ static const struct cpu_option cpu_opttab_cortexa32[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa35[] = { static const cpu_arch_extension cpu_opttab_cortexa35[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -304,7 +304,7 @@ static const struct cpu_option cpu_opttab_cortexa35[] = { ...@@ -304,7 +304,7 @@ static const struct cpu_option cpu_opttab_cortexa35[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa53[] = { static const cpu_arch_extension cpu_opttab_cortexa53[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -316,7 +316,7 @@ static const struct cpu_option cpu_opttab_cortexa53[] = { ...@@ -316,7 +316,7 @@ static const struct cpu_option cpu_opttab_cortexa53[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa57[] = { static const cpu_arch_extension cpu_opttab_cortexa57[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -324,7 +324,7 @@ static const struct cpu_option cpu_opttab_cortexa57[] = { ...@@ -324,7 +324,7 @@ static const struct cpu_option cpu_opttab_cortexa57[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa72[] = { static const cpu_arch_extension cpu_opttab_cortexa72[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -332,7 +332,7 @@ static const struct cpu_option cpu_opttab_cortexa72[] = { ...@@ -332,7 +332,7 @@ static const struct cpu_option cpu_opttab_cortexa72[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa73[] = { static const cpu_arch_extension cpu_opttab_cortexa73[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -340,7 +340,7 @@ static const struct cpu_option cpu_opttab_cortexa73[] = { ...@@ -340,7 +340,7 @@ static const struct cpu_option cpu_opttab_cortexa73[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_exynosm1[] = { static const cpu_arch_extension cpu_opttab_exynosm1[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -348,7 +348,7 @@ static const struct cpu_option cpu_opttab_exynosm1[] = { ...@@ -348,7 +348,7 @@ static const struct cpu_option cpu_opttab_exynosm1[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_xgene1[] = { static const cpu_arch_extension cpu_opttab_xgene1[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -356,7 +356,7 @@ static const struct cpu_option cpu_opttab_xgene1[] = { ...@@ -356,7 +356,7 @@ static const struct cpu_option cpu_opttab_xgene1[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa57cortexa53[] = { static const cpu_arch_extension cpu_opttab_cortexa57cortexa53[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -364,7 +364,7 @@ static const struct cpu_option cpu_opttab_cortexa57cortexa53[] = { ...@@ -364,7 +364,7 @@ static const struct cpu_option cpu_opttab_cortexa57cortexa53[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa72cortexa53[] = { static const cpu_arch_extension cpu_opttab_cortexa72cortexa53[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -372,7 +372,7 @@ static const struct cpu_option cpu_opttab_cortexa72cortexa53[] = { ...@@ -372,7 +372,7 @@ static const struct cpu_option cpu_opttab_cortexa72cortexa53[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa73cortexa35[] = { static const cpu_arch_extension cpu_opttab_cortexa73cortexa35[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -380,7 +380,7 @@ static const struct cpu_option cpu_opttab_cortexa73cortexa35[] = { ...@@ -380,7 +380,7 @@ static const struct cpu_option cpu_opttab_cortexa73cortexa35[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexa73cortexa53[] = { static const cpu_arch_extension cpu_opttab_cortexa73cortexa53[] = {
{ {
"crypto", false, "crypto", false,
{ ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit } { ISA_FP_ARMv8,ISA_CRYPTO, isa_nobit }
...@@ -388,7 +388,7 @@ static const struct cpu_option cpu_opttab_cortexa73cortexa53[] = { ...@@ -388,7 +388,7 @@ static const struct cpu_option cpu_opttab_cortexa73cortexa53[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option cpu_opttab_cortexm33[] = { static const cpu_arch_extension cpu_opttab_cortexm33[] = {
{ {
"nofp", true, "nofp", true,
{ ISA_ALL_FP, isa_nobit } { ISA_ALL_FP, isa_nobit }
...@@ -396,1368 +396,1803 @@ static const struct cpu_option cpu_opttab_cortexm33[] = { ...@@ -396,1368 +396,1803 @@ static const struct cpu_option cpu_opttab_cortexm33[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct processors all_cores[] = static const cpu_option all_cores[] =
{ {
{ {
{
"arm2", "arm2",
TARGET_CPU_arm2, NULL,
(TF_CO_PROC | TF_NO_MODE32),
"2", BASE_ARCH_2,
{ {
ISA_ARMv2,isa_bit_mode26, ISA_ARMv2,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv2
&arm_slowmul_tune
}, },
{ {
{
"arm250", "arm250",
TARGET_CPU_arm250, NULL,
(TF_CO_PROC | TF_NO_MODE32),
"2", BASE_ARCH_2,
{ {
ISA_ARMv2,isa_bit_mode26, ISA_ARMv2,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv2
&arm_slowmul_tune
}, },
{ {
{
"arm3", "arm3",
TARGET_CPU_arm3, NULL,
(TF_CO_PROC | TF_NO_MODE32),
"2", BASE_ARCH_2,
{ {
ISA_ARMv2,isa_bit_mode26, ISA_ARMv2,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv2
&arm_slowmul_tune
}, },
{ {
{
"arm6", "arm6",
TARGET_CPU_arm6, NULL,
(TF_CO_PROC),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm60", "arm60",
TARGET_CPU_arm60, NULL,
(TF_CO_PROC),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm600", "arm600",
TARGET_CPU_arm600, NULL,
(TF_CO_PROC | TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm610", "arm610",
TARGET_CPU_arm610, NULL,
(TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm620", "arm620",
TARGET_CPU_arm620, NULL,
(TF_CO_PROC | TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7", "arm7",
TARGET_CPU_arm7, NULL,
(TF_CO_PROC),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7d", "arm7d",
TARGET_CPU_arm7d, NULL,
(TF_CO_PROC),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7di", "arm7di",
TARGET_CPU_arm7di, NULL,
(TF_CO_PROC),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm70", "arm70",
TARGET_CPU_arm70, NULL,
(TF_CO_PROC),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm700", "arm700",
TARGET_CPU_arm700, NULL,
(TF_CO_PROC | TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm700i", "arm700i",
TARGET_CPU_arm700i, NULL,
(TF_CO_PROC | TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm710", "arm710",
TARGET_CPU_arm710, NULL,
(TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm720", "arm720",
TARGET_CPU_arm720, NULL,
(TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm710c", "arm710c",
TARGET_CPU_arm710c, NULL,
(TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7100", "arm7100",
TARGET_CPU_arm7100, NULL,
(TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7500", "arm7500",
TARGET_CPU_arm7500, NULL,
(TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7500fe", "arm7500fe",
TARGET_CPU_arm7500fe, NULL,
(TF_CO_PROC | TF_WBUF),
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3
&arm_slowmul_tune
}, },
{ {
{
"arm7m", "arm7m",
TARGET_CPU_arm7m, NULL,
(TF_CO_PROC),
"3M", BASE_ARCH_3M,
{ {
ISA_ARMv3m,isa_bit_mode26, ISA_ARMv3m,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3m
&arm_fastmul_tune
}, },
{ {
{
"arm7dm", "arm7dm",
TARGET_CPU_arm7dm, NULL,
(TF_CO_PROC),
"3M", BASE_ARCH_3M,
{ {
ISA_ARMv3m,isa_bit_mode26, ISA_ARMv3m,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3m
&arm_fastmul_tune
}, },
{ {
{
"arm7dmi", "arm7dmi",
TARGET_CPU_arm7dmi, NULL,
(TF_CO_PROC),
"3M", BASE_ARCH_3M,
{ {
ISA_ARMv3m,isa_bit_mode26, ISA_ARMv3m,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv3m
&arm_fastmul_tune
}, },
{ {
{
"arm8", "arm8",
TARGET_CPU_arm8, NULL,
(TF_LDSCHED),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_fastmul_tune
}, },
{ {
{
"arm810", "arm810",
TARGET_CPU_arm810, NULL,
(TF_LDSCHED),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_fastmul_tune
}, },
{ {
{
"strongarm", "strongarm",
TARGET_CPU_strongarm, NULL,
(TF_LDSCHED | TF_STRONG),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_strongarm_tune
}, },
{ {
{
"strongarm110", "strongarm110",
TARGET_CPU_strongarm110, NULL,
(TF_LDSCHED | TF_STRONG),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_strongarm_tune
}, },
{ {
{
"strongarm1100", "strongarm1100",
TARGET_CPU_strongarm1100, NULL,
(TF_LDSCHED | TF_STRONG),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_strongarm_tune
}, },
{ {
{
"strongarm1110", "strongarm1110",
TARGET_CPU_strongarm1110, NULL,
(TF_LDSCHED | TF_STRONG),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_strongarm_tune
}, },
{ {
{
"fa526", "fa526",
TARGET_CPU_fa526, NULL,
(TF_LDSCHED),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_fastmul_tune
}, },
{ {
{
"fa626", "fa626",
TARGET_CPU_fa626, NULL,
(TF_LDSCHED),
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4
&arm_fastmul_tune
}, },
{ {
{
"arm7tdmi", "arm7tdmi",
TARGET_CPU_arm7tdmi, NULL,
(TF_CO_PROC),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm7tdmi-s", "arm7tdmi-s",
TARGET_CPU_arm7tdmis, NULL,
(TF_CO_PROC),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm710t", "arm710t",
TARGET_CPU_arm710t, NULL,
(TF_WBUF),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm720t", "arm720t",
TARGET_CPU_arm720t, NULL,
(TF_WBUF),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm740t", "arm740t",
TARGET_CPU_arm740t, NULL,
(TF_WBUF),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm9", "arm9",
TARGET_CPU_arm9, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm9tdmi", "arm9tdmi",
TARGET_CPU_arm9tdmi, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm920", "arm920",
TARGET_CPU_arm920, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm920t", "arm920t",
TARGET_CPU_arm920t, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm922t", "arm922t",
TARGET_CPU_arm922t, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm940t", "arm940t",
TARGET_CPU_arm940t, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"ep9312", "ep9312",
TARGET_CPU_ep9312, NULL,
(TF_LDSCHED),
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv4t
&arm_fastmul_tune
}, },
{ {
{
"arm10tdmi", "arm10tdmi",
TARGET_CPU_arm10tdmi, NULL,
(TF_LDSCHED),
"5T", BASE_ARCH_5T,
{ {
ISA_ARMv5t, ISA_ARMv5t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5t
&arm_fastmul_tune
}, },
{ {
{
"arm1020t", "arm1020t",
TARGET_CPU_arm1020t, NULL,
(TF_LDSCHED),
"5T", BASE_ARCH_5T,
{ {
ISA_ARMv5t, ISA_ARMv5t,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5t
&arm_fastmul_tune
}, },
{ {
{
"arm9e", "arm9e",
TARGET_CPU_arm9e, cpu_opttab_arm9e,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm9e, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"arm946e-s", "arm946e-s",
TARGET_CPU_arm946es, cpu_opttab_arm946es,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm946es, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"arm966e-s", "arm966e-s",
TARGET_CPU_arm966es, cpu_opttab_arm966es,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm966es, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"arm968e-s", "arm968e-s",
TARGET_CPU_arm968es, cpu_opttab_arm968es,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm968es, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"arm10e", "arm10e",
TARGET_CPU_arm10e, cpu_opttab_arm10e,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm10e, TARGET_ARCH_armv5te
&arm_fastmul_tune
}, },
{ {
{
"arm1020e", "arm1020e",
TARGET_CPU_arm1020e, cpu_opttab_arm1020e,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm1020e, TARGET_ARCH_armv5te
&arm_fastmul_tune
}, },
{ {
{
"arm1022e", "arm1022e",
TARGET_CPU_arm1022e, cpu_opttab_arm1022e,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm1022e, TARGET_ARCH_armv5te
&arm_fastmul_tune
}, },
{ {
{
"xscale", "xscale",
TARGET_CPU_xscale, NULL,
(TF_LDSCHED | TF_XSCALE),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
isa_bit_xscale, isa_bit_xscale,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5te
&arm_xscale_tune
}, },
{ {
{
"iwmmxt", "iwmmxt",
TARGET_CPU_iwmmxt, NULL,
(TF_LDSCHED | TF_XSCALE),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt, ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_iwmmxt
&arm_xscale_tune
}, },
{ {
{
"iwmmxt2", "iwmmxt2",
TARGET_CPU_iwmmxt2, NULL,
(TF_LDSCHED | TF_XSCALE),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt,isa_bit_iwmmxt2, ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt,isa_bit_iwmmxt2,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_iwmmxt2
&arm_xscale_tune
}, },
{ {
{
"fa606te", "fa606te",
TARGET_CPU_fa606te, NULL,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"fa626te", "fa626te",
TARGET_CPU_fa626te, NULL,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"fmp626", "fmp626",
TARGET_CPU_fmp626, NULL,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5te
&arm_9e_tune
}, },
{ {
{
"fa726te", "fa726te",
TARGET_CPU_fa726te, NULL,
(TF_LDSCHED),
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv5te
&arm_fa726te_tune
}, },
{ {
{
"arm926ej-s", "arm926ej-s",
TARGET_CPU_arm926ejs, cpu_opttab_arm926ejs,
(TF_LDSCHED),
"5TEJ", BASE_ARCH_5TEJ,
{ {
ISA_ARMv5tej, ISA_ARMv5tej,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm926ejs, TARGET_ARCH_armv5tej
&arm_9e_tune
}, },
{ {
{
"arm1026ej-s", "arm1026ej-s",
TARGET_CPU_arm1026ejs, cpu_opttab_arm1026ejs,
(TF_LDSCHED),
"5TEJ", BASE_ARCH_5TEJ,
{ {
ISA_ARMv5tej, ISA_ARMv5tej,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_arm1026ejs, TARGET_ARCH_armv5tej
&arm_9e_tune
}, },
{ {
{
"arm1136j-s", "arm1136j-s",
TARGET_CPU_arm1136js, NULL,
(TF_LDSCHED),
"6J", BASE_ARCH_6J,
{ {
ISA_ARMv6j, ISA_ARMv6j,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6j
&arm_9e_tune
}, },
{ {
{
"arm1136jf-s", "arm1136jf-s",
TARGET_CPU_arm1136jfs, NULL,
(TF_LDSCHED),
"6J", BASE_ARCH_6J,
{ {
ISA_ARMv6j, ISA_ARMv6j,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6j
&arm_9e_tune
}, },
{ {
{
"arm1176jz-s", "arm1176jz-s",
TARGET_CPU_arm1176jzs, NULL,
(TF_LDSCHED),
"6KZ", BASE_ARCH_6KZ,
{ {
ISA_ARMv6kz, ISA_ARMv6kz,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6kz
&arm_9e_tune
}, },
{ {
{
"arm1176jzf-s", "arm1176jzf-s",
TARGET_CPU_arm1176jzfs, NULL,
(TF_LDSCHED),
"6KZ", BASE_ARCH_6KZ,
{ {
ISA_ARMv6kz, ISA_ARMv6kz,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6kz
&arm_9e_tune
}, },
{ {
{
"mpcorenovfp", "mpcorenovfp",
TARGET_CPU_mpcorenovfp, NULL,
(TF_LDSCHED),
"6K", BASE_ARCH_6K,
{ {
ISA_ARMv6k, ISA_ARMv6k,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6k
&arm_9e_tune
}, },
{ {
{
"mpcore", "mpcore",
TARGET_CPU_mpcore, NULL,
(TF_LDSCHED),
"6K", BASE_ARCH_6K,
{ {
ISA_ARMv6k, ISA_ARMv6k,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6k
&arm_9e_tune
}, },
{ {
{
"arm1156t2-s", "arm1156t2-s",
TARGET_CPU_arm1156t2s, NULL,
(TF_LDSCHED),
"6T2", BASE_ARCH_6T2,
{ {
ISA_ARMv6t2, ISA_ARMv6t2,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6t2
&arm_v6t2_tune
}, },
{ {
{
"arm1156t2f-s", "arm1156t2f-s",
TARGET_CPU_arm1156t2fs, NULL,
(TF_LDSCHED),
"6T2", BASE_ARCH_6T2,
{ {
ISA_ARMv6t2, ISA_ARMv6t2,
ISA_VFPv2,ISA_FP_DBL, ISA_VFPv2,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6t2
&arm_v6t2_tune
}, },
{ {
{
"cortex-m1", "cortex-m1",
TARGET_CPU_cortexm1, NULL,
(TF_LDSCHED),
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6_m
&arm_v6m_tune
}, },
{ {
{
"cortex-m0", "cortex-m0",
TARGET_CPU_cortexm0, NULL,
(TF_LDSCHED),
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6_m
&arm_v6m_tune
}, },
{ {
{
"cortex-m0plus", "cortex-m0plus",
TARGET_CPU_cortexm0plus, NULL,
(TF_LDSCHED),
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6_m
&arm_v6m_tune
}, },
{ {
{
"cortex-m1.small-multiply", "cortex-m1.small-multiply",
TARGET_CPU_cortexm1, NULL,
(TF_LDSCHED | TF_SMALLMUL),
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6_m
&arm_v6m_tune
}, },
{ {
{
"cortex-m0.small-multiply", "cortex-m0.small-multiply",
TARGET_CPU_cortexm0, NULL,
(TF_LDSCHED | TF_SMALLMUL),
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6_m
&arm_v6m_tune
}, },
{ {
{
"cortex-m0plus.small-multiply", "cortex-m0plus.small-multiply",
TARGET_CPU_cortexm0plus, NULL,
(TF_LDSCHED | TF_SMALLMUL),
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv6_m
&arm_v6m_tune
}, },
{ {
{
"generic-armv7-a", "generic-armv7-a",
TARGET_CPU_genericv7a, cpu_opttab_genericv7a,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7a, ISA_ARMv7a,
ISA_VFPv3,ISA_FP_DBL, ISA_VFPv3,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_genericv7a, TARGET_ARCH_armv7_a
&arm_cortex_tune
}, },
{ {
{
"cortex-a5", "cortex-a5",
TARGET_CPU_cortexa5, cpu_opttab_cortexa5,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7a, ISA_ARMv7a,
ISA_VFPv3,ISA_NEON,isa_bit_fp16conv, ISA_VFPv3,ISA_NEON,isa_bit_fp16conv,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa5, TARGET_ARCH_armv7_a
&arm_cortex_a5_tune
}, },
{ {
{
"cortex-a7", "cortex-a7",
TARGET_CPU_cortexa7, cpu_opttab_cortexa7,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
ISA_VFPv4,ISA_NEON, ISA_VFPv4,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa7, TARGET_ARCH_armv7ve
&arm_cortex_a7_tune
}, },
{ {
{
"cortex-a8", "cortex-a8",
TARGET_CPU_cortexa8, cpu_opttab_cortexa8,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7a, ISA_ARMv7a,
ISA_VFPv3,ISA_NEON, ISA_VFPv3,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa8, TARGET_ARCH_armv7_a
&arm_cortex_a8_tune
}, },
{ {
{
"cortex-a9", "cortex-a9",
TARGET_CPU_cortexa9, cpu_opttab_cortexa9,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7a, ISA_ARMv7a,
ISA_VFPv3,ISA_NEON,isa_bit_fp16conv, ISA_VFPv3,ISA_NEON,isa_bit_fp16conv,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa9, TARGET_ARCH_armv7_a
&arm_cortex_a9_tune
}, },
{ {
{
"cortex-a12", "cortex-a12",
TARGET_CPU_cortexa17, cpu_opttab_cortexa12,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
ISA_VFPv4,ISA_NEON, ISA_VFPv4,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa12, TARGET_ARCH_armv7ve
&arm_cortex_a12_tune
}, },
{ {
{
"cortex-a15", "cortex-a15",
TARGET_CPU_cortexa15, cpu_opttab_cortexa15,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
ISA_VFPv4,ISA_NEON, ISA_VFPv4,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa15, TARGET_ARCH_armv7ve
&arm_cortex_a15_tune
}, },
{ {
{
"cortex-a17", "cortex-a17",
TARGET_CPU_cortexa17, cpu_opttab_cortexa17,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
ISA_VFPv4,ISA_NEON, ISA_VFPv4,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa17, TARGET_ARCH_armv7ve
&arm_cortex_a12_tune
}, },
{ {
{
"cortex-r4", "cortex-r4",
TARGET_CPU_cortexr4, NULL,
(TF_LDSCHED),
"7R", BASE_ARCH_7R,
{ {
ISA_ARMv7r, ISA_ARMv7r,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv7_r
&arm_cortex_tune
}, },
{ {
{
"cortex-r4f", "cortex-r4f",
TARGET_CPU_cortexr4f, NULL,
(TF_LDSCHED),
"7R", BASE_ARCH_7R,
{ {
ISA_ARMv7r, ISA_ARMv7r,
ISA_VFPv3,ISA_FP_DBL, ISA_VFPv3,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv7_r
&arm_cortex_tune
}, },
{ {
{
"cortex-r5", "cortex-r5",
TARGET_CPU_cortexr5, cpu_opttab_cortexr5,
(TF_LDSCHED),
"7R", BASE_ARCH_7R,
{ {
ISA_ARMv7r, ISA_ARMv7r,
isa_bit_adiv, isa_bit_adiv,
ISA_VFPv3,ISA_FP_DBL, ISA_VFPv3,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexr5, TARGET_ARCH_armv7_r
&arm_cortex_tune
}, },
{ {
{
"cortex-r7", "cortex-r7",
TARGET_CPU_cortexr7, cpu_opttab_cortexr7,
(TF_LDSCHED),
"7R", BASE_ARCH_7R,
{ {
ISA_ARMv7r, ISA_ARMv7r,
isa_bit_adiv, isa_bit_adiv,
ISA_VFPv3,ISA_FP_DBL, ISA_VFPv3,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexr7, TARGET_ARCH_armv7_r
&arm_cortex_tune
}, },
{ {
{
"cortex-r8", "cortex-r8",
TARGET_CPU_cortexr7, cpu_opttab_cortexr8,
(TF_LDSCHED),
"7R", BASE_ARCH_7R,
{ {
ISA_ARMv7r, ISA_ARMv7r,
isa_bit_adiv, isa_bit_adiv,
ISA_VFPv3,ISA_FP_DBL, ISA_VFPv3,ISA_FP_DBL,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexr8, TARGET_ARCH_armv7_r
&arm_cortex_tune
}, },
{ {
{
"cortex-m7", "cortex-m7",
TARGET_CPU_cortexm7, cpu_opttab_cortexm7,
(TF_LDSCHED),
"7EM", BASE_ARCH_7EM,
{ {
ISA_ARMv7em, ISA_ARMv7em,
ISA_FPv5,ISA_FP_DBL, ISA_FPv5,ISA_FP_DBL,
isa_quirk_no_volatile_ce, isa_quirk_no_volatile_ce,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexm7, TARGET_ARCH_armv7e_m
&arm_cortex_m7_tune
}, },
{ {
{
"cortex-m4", "cortex-m4",
TARGET_CPU_cortexm4, cpu_opttab_cortexm4,
(TF_LDSCHED),
"7EM", BASE_ARCH_7EM,
{ {
ISA_ARMv7em, ISA_ARMv7em,
ISA_VFPv4, ISA_VFPv4,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexm4, TARGET_ARCH_armv7e_m
&arm_v7m_tune
}, },
{ {
{
"cortex-m3", "cortex-m3",
TARGET_CPU_cortexm3, NULL,
(TF_LDSCHED),
"7M", BASE_ARCH_7M,
{ {
ISA_ARMv7m, ISA_ARMv7m,
isa_quirk_cm3_ldrd, isa_quirk_cm3_ldrd,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv7_m
&arm_v7m_tune
}, },
{ {
{
"marvell-pj4", "marvell-pj4",
TARGET_CPU_marvell_pj4, NULL,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7a, ISA_ARMv7a,
isa_nobit isa_nobit
}
}, },
NULL, TARGET_ARCH_armv7_a
&arm_marvell_pj4_tune
}, },
{ {
{
"cortex-a15.cortex-a7", "cortex-a15.cortex-a7",
TARGET_CPU_cortexa7, cpu_opttab_cortexa15cortexa7,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
ISA_VFPv4,ISA_NEON, ISA_VFPv4,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa15cortexa7, TARGET_ARCH_armv7ve
&arm_cortex_a15_tune
}, },
{ {
{
"cortex-a17.cortex-a7", "cortex-a17.cortex-a7",
TARGET_CPU_cortexa7, cpu_opttab_cortexa17cortexa7,
(TF_LDSCHED),
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
ISA_VFPv4,ISA_NEON, ISA_VFPv4,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa17cortexa7, TARGET_ARCH_armv7ve
&arm_cortex_a12_tune
}, },
{ {
{
"cortex-a32", "cortex-a32",
TARGET_CPU_cortexa53, cpu_opttab_cortexa32,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa32, TARGET_ARCH_armv8_a
&arm_cortex_a35_tune
}, },
{ {
{
"cortex-a35", "cortex-a35",
TARGET_CPU_cortexa53, cpu_opttab_cortexa35,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa35, TARGET_ARCH_armv8_a
&arm_cortex_a35_tune
}, },
{ {
{
"cortex-a53", "cortex-a53",
TARGET_CPU_cortexa53, cpu_opttab_cortexa53,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa53, TARGET_ARCH_armv8_a
&arm_cortex_a53_tune
}, },
{ {
{
"cortex-a57", "cortex-a57",
TARGET_CPU_cortexa57, cpu_opttab_cortexa57,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa57, TARGET_ARCH_armv8_a
&arm_cortex_a57_tune
}, },
{ {
{
"cortex-a72", "cortex-a72",
TARGET_CPU_cortexa57, cpu_opttab_cortexa72,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa72, TARGET_ARCH_armv8_a
&arm_cortex_a57_tune
}, },
{ {
{
"cortex-a73", "cortex-a73",
TARGET_CPU_cortexa57, cpu_opttab_cortexa73,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_cortexa73, TARGET_ARCH_armv8_a
&arm_cortex_a73_tune
}, },
{ {
{
"exynos-m1", "exynos-m1",
TARGET_CPU_exynosm1, cpu_opttab_exynosm1,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_bit_crc32, isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_exynosm1, TARGET_ARCH_armv8_a
&arm_exynosm1_tune
}, },
{ {
{
"xgene1", "xgene1",
TARGET_CPU_xgene1, cpu_opttab_xgene1,
(TF_LDSCHED),
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
ISA_FP_ARMv8,ISA_NEON, ISA_FP_ARMv8,ISA_NEON,
isa_nobit isa_nobit
}
}, },
cpu_opttab_xgene1, TARGET_ARCH_armv8_a
},
{
{
"cortex-a57.cortex-a53",
cpu_opttab_cortexa57cortexa53,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
}
},
TARGET_ARCH_armv8_a
},
{
{
"cortex-a72.cortex-a53",
cpu_opttab_cortexa72cortexa53,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
}
},
TARGET_ARCH_armv8_a
},
{
{
"cortex-a73.cortex-a35",
cpu_opttab_cortexa73cortexa35,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
}
},
TARGET_ARCH_armv8_a
},
{
{
"cortex-a73.cortex-a53",
cpu_opttab_cortexa73cortexa53,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
}
},
TARGET_ARCH_armv8_a
},
{
{
"cortex-m23",
NULL,
{
ISA_ARMv8m_base,
isa_nobit
}
},
TARGET_ARCH_armv8_m_base
},
{
{
"cortex-m33",
cpu_opttab_cortexm33,
{
ISA_ARMv8m_main,
isa_bit_ARMv7em,
ISA_FPv5,
isa_nobit
}
},
TARGET_ARCH_armv8_m_main
},
{{NULL, NULL, {isa_nobit}}, TARGET_ARCH_arm_none}
};
static const cpu_tune all_tunes[] =
{
{ /* arm2. */
TARGET_CPU_arm2,
(TF_CO_PROC | TF_NO_MODE32),
&arm_slowmul_tune
},
{ /* arm250. */
TARGET_CPU_arm250,
(TF_CO_PROC | TF_NO_MODE32),
&arm_slowmul_tune
},
{ /* arm3. */
TARGET_CPU_arm3,
(TF_CO_PROC | TF_NO_MODE32),
&arm_slowmul_tune
},
{ /* arm6. */
TARGET_CPU_arm6,
(TF_CO_PROC),
&arm_slowmul_tune
},
{ /* arm60. */
TARGET_CPU_arm60,
(TF_CO_PROC),
&arm_slowmul_tune
},
{ /* arm600. */
TARGET_CPU_arm600,
(TF_CO_PROC | TF_WBUF),
&arm_slowmul_tune
},
{ /* arm610. */
TARGET_CPU_arm610,
(TF_WBUF),
&arm_slowmul_tune
},
{ /* arm620. */
TARGET_CPU_arm620,
(TF_CO_PROC | TF_WBUF),
&arm_slowmul_tune
},
{ /* arm7. */
TARGET_CPU_arm7,
(TF_CO_PROC),
&arm_slowmul_tune
},
{ /* arm7d. */
TARGET_CPU_arm7d,
(TF_CO_PROC),
&arm_slowmul_tune
},
{ /* arm7di. */
TARGET_CPU_arm7di,
(TF_CO_PROC),
&arm_slowmul_tune
},
{ /* arm70. */
TARGET_CPU_arm70,
(TF_CO_PROC),
&arm_slowmul_tune
},
{ /* arm700. */
TARGET_CPU_arm700,
(TF_CO_PROC | TF_WBUF),
&arm_slowmul_tune
},
{ /* arm700i. */
TARGET_CPU_arm700i,
(TF_CO_PROC | TF_WBUF),
&arm_slowmul_tune
},
{ /* arm710. */
TARGET_CPU_arm710,
(TF_WBUF),
&arm_slowmul_tune
},
{ /* arm720. */
TARGET_CPU_arm720,
(TF_WBUF),
&arm_slowmul_tune
},
{ /* arm710c. */
TARGET_CPU_arm710c,
(TF_WBUF),
&arm_slowmul_tune
},
{ /* arm7100. */
TARGET_CPU_arm7100,
(TF_WBUF),
&arm_slowmul_tune
},
{ /* arm7500. */
TARGET_CPU_arm7500,
(TF_WBUF),
&arm_slowmul_tune
},
{ /* arm7500fe. */
TARGET_CPU_arm7500fe,
(TF_CO_PROC | TF_WBUF),
&arm_slowmul_tune
},
{ /* arm7m. */
TARGET_CPU_arm7m,
(TF_CO_PROC),
&arm_fastmul_tune
},
{ /* arm7dm. */
TARGET_CPU_arm7dm,
(TF_CO_PROC),
&arm_fastmul_tune
},
{ /* arm7dmi. */
TARGET_CPU_arm7dmi,
(TF_CO_PROC),
&arm_fastmul_tune
},
{ /* arm8. */
TARGET_CPU_arm8,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm810. */
TARGET_CPU_arm810,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* strongarm. */
TARGET_CPU_strongarm,
(TF_LDSCHED | TF_STRONG),
&arm_strongarm_tune
},
{ /* strongarm110. */
TARGET_CPU_strongarm110,
(TF_LDSCHED | TF_STRONG),
&arm_strongarm_tune
},
{ /* strongarm1100. */
TARGET_CPU_strongarm1100,
(TF_LDSCHED | TF_STRONG),
&arm_strongarm_tune
},
{ /* strongarm1110. */
TARGET_CPU_strongarm1110,
(TF_LDSCHED | TF_STRONG),
&arm_strongarm_tune
},
{ /* fa526. */
TARGET_CPU_fa526,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* fa626. */
TARGET_CPU_fa626,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm7tdmi. */
TARGET_CPU_arm7tdmi,
(TF_CO_PROC),
&arm_fastmul_tune
},
{ /* arm7tdmi-s. */
TARGET_CPU_arm7tdmis,
(TF_CO_PROC),
&arm_fastmul_tune
},
{ /* arm710t. */
TARGET_CPU_arm710t,
(TF_WBUF),
&arm_fastmul_tune
},
{ /* arm720t. */
TARGET_CPU_arm720t,
(TF_WBUF),
&arm_fastmul_tune
},
{ /* arm740t. */
TARGET_CPU_arm740t,
(TF_WBUF),
&arm_fastmul_tune
},
{ /* arm9. */
TARGET_CPU_arm9,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm9tdmi. */
TARGET_CPU_arm9tdmi,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm920. */
TARGET_CPU_arm920,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm920t. */
TARGET_CPU_arm920t,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm922t. */
TARGET_CPU_arm922t,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm940t. */
TARGET_CPU_arm940t,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* ep9312. */
TARGET_CPU_ep9312,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm10tdmi. */
TARGET_CPU_arm10tdmi,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm1020t. */
TARGET_CPU_arm1020t,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm9e. */
TARGET_CPU_arm9e,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm946e-s. */
TARGET_CPU_arm946es,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm966e-s. */
TARGET_CPU_arm966es,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm968e-s. */
TARGET_CPU_arm968es,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm10e. */
TARGET_CPU_arm10e,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm1020e. */
TARGET_CPU_arm1020e,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* arm1022e. */
TARGET_CPU_arm1022e,
(TF_LDSCHED),
&arm_fastmul_tune
},
{ /* xscale. */
TARGET_CPU_xscale,
(TF_LDSCHED | TF_XSCALE),
&arm_xscale_tune
},
{ /* iwmmxt. */
TARGET_CPU_iwmmxt,
(TF_LDSCHED | TF_XSCALE),
&arm_xscale_tune
},
{ /* iwmmxt2. */
TARGET_CPU_iwmmxt2,
(TF_LDSCHED | TF_XSCALE),
&arm_xscale_tune
},
{ /* fa606te. */
TARGET_CPU_fa606te,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* fa626te. */
TARGET_CPU_fa626te,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* fmp626. */
TARGET_CPU_fmp626,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* fa726te. */
TARGET_CPU_fa726te,
(TF_LDSCHED),
&arm_fa726te_tune
},
{ /* arm926ej-s. */
TARGET_CPU_arm926ejs,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm1026ej-s. */
TARGET_CPU_arm1026ejs,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm1136j-s. */
TARGET_CPU_arm1136js,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm1136jf-s. */
TARGET_CPU_arm1136jfs,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm1176jz-s. */
TARGET_CPU_arm1176jzs,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm1176jzf-s. */
TARGET_CPU_arm1176jzfs,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* mpcorenovfp. */
TARGET_CPU_mpcorenovfp,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* mpcore. */
TARGET_CPU_mpcore,
(TF_LDSCHED),
&arm_9e_tune
},
{ /* arm1156t2-s. */
TARGET_CPU_arm1156t2s,
(TF_LDSCHED),
&arm_v6t2_tune
},
{ /* arm1156t2f-s. */
TARGET_CPU_arm1156t2fs,
(TF_LDSCHED),
&arm_v6t2_tune
},
{ /* cortex-m1. */
TARGET_CPU_cortexm1,
(TF_LDSCHED),
&arm_v6m_tune
},
{ /* cortex-m0. */
TARGET_CPU_cortexm0,
(TF_LDSCHED),
&arm_v6m_tune
},
{ /* cortex-m0plus. */
TARGET_CPU_cortexm0plus,
(TF_LDSCHED),
&arm_v6m_tune
},
{ /* cortex-m1.small-multiply. */
TARGET_CPU_cortexm1,
(TF_LDSCHED | TF_SMALLMUL),
&arm_v6m_tune
},
{ /* cortex-m0.small-multiply. */
TARGET_CPU_cortexm0,
(TF_LDSCHED | TF_SMALLMUL),
&arm_v6m_tune
},
{ /* cortex-m0plus.small-multiply. */
TARGET_CPU_cortexm0plus,
(TF_LDSCHED | TF_SMALLMUL),
&arm_v6m_tune
},
{ /* generic-armv7-a. */
TARGET_CPU_genericv7a,
(TF_LDSCHED),
&arm_cortex_tune
},
{ /* cortex-a5. */
TARGET_CPU_cortexa5,
(TF_LDSCHED),
&arm_cortex_a5_tune
},
{ /* cortex-a7. */
TARGET_CPU_cortexa7,
(TF_LDSCHED),
&arm_cortex_a7_tune
},
{ /* cortex-a8. */
TARGET_CPU_cortexa8,
(TF_LDSCHED),
&arm_cortex_a8_tune
},
{ /* cortex-a9. */
TARGET_CPU_cortexa9,
(TF_LDSCHED),
&arm_cortex_a9_tune
},
{ /* cortex-a12. */
TARGET_CPU_cortexa17,
(TF_LDSCHED),
&arm_cortex_a12_tune
},
{ /* cortex-a15. */
TARGET_CPU_cortexa15,
(TF_LDSCHED),
&arm_cortex_a15_tune
},
{ /* cortex-a17. */
TARGET_CPU_cortexa17,
(TF_LDSCHED),
&arm_cortex_a12_tune
},
{ /* cortex-r4. */
TARGET_CPU_cortexr4,
(TF_LDSCHED),
&arm_cortex_tune
},
{ /* cortex-r4f. */
TARGET_CPU_cortexr4f,
(TF_LDSCHED),
&arm_cortex_tune
},
{ /* cortex-r5. */
TARGET_CPU_cortexr5,
(TF_LDSCHED),
&arm_cortex_tune
},
{ /* cortex-r7. */
TARGET_CPU_cortexr7,
(TF_LDSCHED),
&arm_cortex_tune
},
{ /* cortex-r8. */
TARGET_CPU_cortexr7,
(TF_LDSCHED),
&arm_cortex_tune
},
{ /* cortex-m7. */
TARGET_CPU_cortexm7,
(TF_LDSCHED),
&arm_cortex_m7_tune
},
{ /* cortex-m4. */
TARGET_CPU_cortexm4,
(TF_LDSCHED),
&arm_v7m_tune
},
{ /* cortex-m3. */
TARGET_CPU_cortexm3,
(TF_LDSCHED),
&arm_v7m_tune
},
{ /* marvell-pj4. */
TARGET_CPU_marvell_pj4,
(TF_LDSCHED),
&arm_marvell_pj4_tune
},
{ /* cortex-a15.cortex-a7. */
TARGET_CPU_cortexa7,
(TF_LDSCHED),
&arm_cortex_a15_tune
},
{ /* cortex-a17.cortex-a7. */
TARGET_CPU_cortexa7,
(TF_LDSCHED),
&arm_cortex_a12_tune
},
{ /* cortex-a32. */
TARGET_CPU_cortexa53,
(TF_LDSCHED),
&arm_cortex_a35_tune
},
{ /* cortex-a35. */
TARGET_CPU_cortexa53,
(TF_LDSCHED),
&arm_cortex_a35_tune
},
{ /* cortex-a53. */
TARGET_CPU_cortexa53,
(TF_LDSCHED),
&arm_cortex_a53_tune
},
{ /* cortex-a57. */
TARGET_CPU_cortexa57,
(TF_LDSCHED),
&arm_cortex_a57_tune
},
{ /* cortex-a72. */
TARGET_CPU_cortexa57,
(TF_LDSCHED),
&arm_cortex_a57_tune
},
{ /* cortex-a73. */
TARGET_CPU_cortexa57,
(TF_LDSCHED),
&arm_cortex_a73_tune
},
{ /* exynos-m1. */
TARGET_CPU_exynosm1,
(TF_LDSCHED),
&arm_exynosm1_tune
},
{ /* xgene1. */
TARGET_CPU_xgene1,
(TF_LDSCHED),
&arm_xgene1_tune &arm_xgene1_tune
}, },
{ { /* cortex-a57.cortex-a53. */
"cortex-a57.cortex-a53",
TARGET_CPU_cortexa53, TARGET_CPU_cortexa53,
(TF_LDSCHED), (TF_LDSCHED),
"8A", BASE_ARCH_8A,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
},
cpu_opttab_cortexa57cortexa53,
&arm_cortex_a57_tune &arm_cortex_a57_tune
}, },
{ { /* cortex-a72.cortex-a53. */
"cortex-a72.cortex-a53",
TARGET_CPU_cortexa53, TARGET_CPU_cortexa53,
(TF_LDSCHED), (TF_LDSCHED),
"8A", BASE_ARCH_8A,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
},
cpu_opttab_cortexa72cortexa53,
&arm_cortex_a57_tune &arm_cortex_a57_tune
}, },
{ { /* cortex-a73.cortex-a35. */
"cortex-a73.cortex-a35",
TARGET_CPU_cortexa53, TARGET_CPU_cortexa53,
(TF_LDSCHED), (TF_LDSCHED),
"8A", BASE_ARCH_8A,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
},
cpu_opttab_cortexa73cortexa35,
&arm_cortex_a73_tune &arm_cortex_a73_tune
}, },
{ { /* cortex-a73.cortex-a53. */
"cortex-a73.cortex-a53",
TARGET_CPU_cortexa53, TARGET_CPU_cortexa53,
(TF_LDSCHED), (TF_LDSCHED),
"8A", BASE_ARCH_8A,
{
ISA_ARMv8a,
isa_bit_crc32,
ISA_FP_ARMv8,ISA_NEON,
isa_nobit
},
cpu_opttab_cortexa73cortexa53,
&arm_cortex_a73_tune &arm_cortex_a73_tune
}, },
{ { /* cortex-m23. */
"cortex-m23",
TARGET_CPU_cortexm23, TARGET_CPU_cortexm23,
(TF_LDSCHED), (TF_LDSCHED),
"8M_BASE", BASE_ARCH_8M_BASE,
{
ISA_ARMv8m_base,
isa_nobit
},
NULL,
&arm_v6m_tune &arm_v6m_tune
}, },
{ { /* cortex-m33. */
"cortex-m33",
TARGET_CPU_cortexm33, TARGET_CPU_cortexm33,
(TF_LDSCHED), (TF_LDSCHED),
"8M_MAIN", BASE_ARCH_8M_MAIN,
{
ISA_ARMv8m_main,
isa_bit_ARMv7em,
ISA_FPv5,
isa_nobit
},
cpu_opttab_cortexm33,
&arm_v7m_tune &arm_v7m_tune
}, },
{NULL, TARGET_CPU_arm_none, 0, NULL, BASE_ARCH_0, {isa_nobit}, NULL, NULL} {TARGET_CPU_arm_none, 0, NULL}
}; };
static const struct cpu_arch_extension arch_opttab_armv5e[] = {
static const struct cpu_option arch_opttab_armv5e[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1773,7 +2208,7 @@ static const struct cpu_option arch_opttab_armv5e[] = { ...@@ -1773,7 +2208,7 @@ static const struct cpu_option arch_opttab_armv5e[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv5te[] = { static const struct cpu_arch_extension arch_opttab_armv5te[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1789,7 +2224,7 @@ static const struct cpu_option arch_opttab_armv5te[] = { ...@@ -1789,7 +2224,7 @@ static const struct cpu_option arch_opttab_armv5te[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv5tej[] = { static const struct cpu_arch_extension arch_opttab_armv5tej[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1805,7 +2240,7 @@ static const struct cpu_option arch_opttab_armv5tej[] = { ...@@ -1805,7 +2240,7 @@ static const struct cpu_option arch_opttab_armv5tej[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6[] = { static const struct cpu_arch_extension arch_opttab_armv6[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1821,7 +2256,7 @@ static const struct cpu_option arch_opttab_armv6[] = { ...@@ -1821,7 +2256,7 @@ static const struct cpu_option arch_opttab_armv6[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6j[] = { static const struct cpu_arch_extension arch_opttab_armv6j[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1837,7 +2272,7 @@ static const struct cpu_option arch_opttab_armv6j[] = { ...@@ -1837,7 +2272,7 @@ static const struct cpu_option arch_opttab_armv6j[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6k[] = { static const struct cpu_arch_extension arch_opttab_armv6k[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1853,7 +2288,7 @@ static const struct cpu_option arch_opttab_armv6k[] = { ...@@ -1853,7 +2288,7 @@ static const struct cpu_option arch_opttab_armv6k[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6z[] = { static const struct cpu_arch_extension arch_opttab_armv6z[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1869,7 +2304,7 @@ static const struct cpu_option arch_opttab_armv6z[] = { ...@@ -1869,7 +2304,7 @@ static const struct cpu_option arch_opttab_armv6z[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6kz[] = { static const struct cpu_arch_extension arch_opttab_armv6kz[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1885,7 +2320,7 @@ static const struct cpu_option arch_opttab_armv6kz[] = { ...@@ -1885,7 +2320,7 @@ static const struct cpu_option arch_opttab_armv6kz[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6zk[] = { static const struct cpu_arch_extension arch_opttab_armv6zk[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1901,7 +2336,7 @@ static const struct cpu_option arch_opttab_armv6zk[] = { ...@@ -1901,7 +2336,7 @@ static const struct cpu_option arch_opttab_armv6zk[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv6t2[] = { static const struct cpu_arch_extension arch_opttab_armv6t2[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv2,ISA_FP_DBL, isa_nobit } { ISA_VFPv2,ISA_FP_DBL, isa_nobit }
...@@ -1917,7 +2352,7 @@ static const struct cpu_option arch_opttab_armv6t2[] = { ...@@ -1917,7 +2352,7 @@ static const struct cpu_option arch_opttab_armv6t2[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv7[] = { static const struct cpu_arch_extension arch_opttab_armv7[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv3,ISA_FP_DBL, isa_nobit } { ISA_VFPv3,ISA_FP_DBL, isa_nobit }
...@@ -1929,7 +2364,7 @@ static const struct cpu_option arch_opttab_armv7[] = { ...@@ -1929,7 +2364,7 @@ static const struct cpu_option arch_opttab_armv7[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv7_a[] = { static const struct cpu_arch_extension arch_opttab_armv7_a[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv3,ISA_FP_DBL, isa_nobit } { ISA_VFPv3,ISA_FP_DBL, isa_nobit }
...@@ -1989,7 +2424,7 @@ static const struct cpu_option arch_opttab_armv7_a[] = { ...@@ -1989,7 +2424,7 @@ static const struct cpu_option arch_opttab_armv7_a[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv7ve[] = { static const struct cpu_arch_extension arch_opttab_armv7ve[] = {
{ {
"vfpv3-d16", false, "vfpv3-d16", false,
{ ISA_VFPv3,ISA_FP_DBL, isa_nobit } { ISA_VFPv3,ISA_FP_DBL, isa_nobit }
...@@ -2049,7 +2484,7 @@ static const struct cpu_option arch_opttab_armv7ve[] = { ...@@ -2049,7 +2484,7 @@ static const struct cpu_option arch_opttab_armv7ve[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv7_r[] = { static const struct cpu_arch_extension arch_opttab_armv7_r[] = {
{ {
"fp.sp", false, "fp.sp", false,
{ ISA_VFPv3, isa_nobit } { ISA_VFPv3, isa_nobit }
...@@ -2073,7 +2508,7 @@ static const struct cpu_option arch_opttab_armv7_r[] = { ...@@ -2073,7 +2508,7 @@ static const struct cpu_option arch_opttab_armv7_r[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv7e_m[] = { static const struct cpu_arch_extension arch_opttab_armv7e_m[] = {
{ {
"fp", false, "fp", false,
{ ISA_VFPv4, isa_nobit } { ISA_VFPv4, isa_nobit }
...@@ -2093,7 +2528,7 @@ static const struct cpu_option arch_opttab_armv7e_m[] = { ...@@ -2093,7 +2528,7 @@ static const struct cpu_option arch_opttab_armv7e_m[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv8_a[] = { static const struct cpu_arch_extension arch_opttab_armv8_a[] = {
{ {
"crc", false, "crc", false,
{ isa_bit_crc32, isa_nobit } { isa_bit_crc32, isa_nobit }
...@@ -2117,7 +2552,7 @@ static const struct cpu_option arch_opttab_armv8_a[] = { ...@@ -2117,7 +2552,7 @@ static const struct cpu_option arch_opttab_armv8_a[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv8_1_a[] = { static const struct cpu_arch_extension arch_opttab_armv8_1_a[] = {
{ {
"simd", false, "simd", false,
{ ISA_FP_ARMv8,ISA_NEON, isa_nobit } { ISA_FP_ARMv8,ISA_NEON, isa_nobit }
...@@ -2137,7 +2572,7 @@ static const struct cpu_option arch_opttab_armv8_1_a[] = { ...@@ -2137,7 +2572,7 @@ static const struct cpu_option arch_opttab_armv8_1_a[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv8_2_a[] = { static const struct cpu_arch_extension arch_opttab_armv8_2_a[] = {
{ {
"simd", false, "simd", false,
{ ISA_FP_ARMv8,ISA_NEON, isa_nobit } { ISA_FP_ARMv8,ISA_NEON, isa_nobit }
...@@ -2161,7 +2596,7 @@ static const struct cpu_option arch_opttab_armv8_2_a[] = { ...@@ -2161,7 +2596,7 @@ static const struct cpu_option arch_opttab_armv8_2_a[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct cpu_option arch_opttab_armv8_m_main[] = { static const struct cpu_arch_extension arch_opttab_armv8_m_main[] = {
{ {
"dsp", false, "dsp", false,
{ isa_bit_ARMv7em, isa_nobit } { isa_bit_ARMv7em, isa_nobit }
...@@ -2181,372 +2616,340 @@ static const struct cpu_option arch_opttab_armv8_m_main[] = { ...@@ -2181,372 +2616,340 @@ static const struct cpu_option arch_opttab_armv8_m_main[] = {
{ NULL, false, {isa_nobit}} { NULL, false, {isa_nobit}}
}; };
static const struct processors all_architectures[] = static const struct arch_option all_architectures[] =
{ {
{ {
"armv2", TARGET_CPU_arm2, "armv2",
(TF_CO_PROC | TF_NO_MODE32), NULL,
"2", BASE_ARCH_2,
{ {
ISA_ARMv2,isa_bit_mode26, ISA_ARMv2,isa_bit_mode26,
isa_nobit isa_nobit
}, },
NULL, "2", BASE_ARCH_2,
NULL TARGET_CPU_arm2,
}, },
{ {
"armv2a", TARGET_CPU_arm2, "armv2a",
(TF_CO_PROC | TF_NO_MODE32), NULL,
"2", BASE_ARCH_2,
{ {
ISA_ARMv2,isa_bit_mode26, ISA_ARMv2,isa_bit_mode26,
isa_nobit isa_nobit
}, },
NULL, "2", BASE_ARCH_2,
NULL TARGET_CPU_arm2,
}, },
{ {
"armv3", TARGET_CPU_arm6, "armv3",
(TF_CO_PROC), NULL,
"3", BASE_ARCH_3,
{ {
ISA_ARMv3,isa_bit_mode26, ISA_ARMv3,isa_bit_mode26,
isa_nobit isa_nobit
}, },
NULL, "3", BASE_ARCH_3,
NULL TARGET_CPU_arm6,
}, },
{ {
"armv3m", TARGET_CPU_arm7m, "armv3m",
(TF_CO_PROC), NULL,
"3M", BASE_ARCH_3M,
{ {
ISA_ARMv3m,isa_bit_mode26, ISA_ARMv3m,isa_bit_mode26,
isa_nobit isa_nobit
}, },
NULL, "3M", BASE_ARCH_3M,
NULL TARGET_CPU_arm7m,
}, },
{ {
"armv4", TARGET_CPU_arm7tdmi, "armv4",
(TF_CO_PROC), NULL,
"4", BASE_ARCH_4,
{ {
ISA_ARMv4,isa_bit_mode26, ISA_ARMv4,isa_bit_mode26,
isa_nobit isa_nobit
}, },
NULL, "4", BASE_ARCH_4,
NULL TARGET_CPU_arm7tdmi,
}, },
{ {
"armv4t", TARGET_CPU_arm7tdmi, "armv4t",
(TF_CO_PROC), NULL,
"4T", BASE_ARCH_4T,
{ {
ISA_ARMv4t, ISA_ARMv4t,
isa_nobit isa_nobit
}, },
NULL, "4T", BASE_ARCH_4T,
NULL TARGET_CPU_arm7tdmi,
}, },
{ {
"armv5", TARGET_CPU_arm10tdmi, "armv5",
(TF_CO_PROC), NULL,
"5", BASE_ARCH_5,
{ {
ISA_ARMv5, ISA_ARMv5,
isa_nobit isa_nobit
}, },
NULL, "5", BASE_ARCH_5,
NULL TARGET_CPU_arm10tdmi,
}, },
{ {
"armv5t", TARGET_CPU_arm10tdmi, "armv5t",
(TF_CO_PROC), NULL,
"5T", BASE_ARCH_5T,
{ {
ISA_ARMv5t, ISA_ARMv5t,
isa_nobit isa_nobit
}, },
NULL, "5T", BASE_ARCH_5T,
NULL TARGET_CPU_arm10tdmi,
}, },
{ {
"armv5e", TARGET_CPU_arm1026ejs, "armv5e",
(TF_CO_PROC), arch_opttab_armv5e,
"5E", BASE_ARCH_5E,
{ {
ISA_ARMv5e, ISA_ARMv5e,
isa_nobit isa_nobit
}, },
arch_opttab_armv5e, "5E", BASE_ARCH_5E,
NULL TARGET_CPU_arm1026ejs,
}, },
{ {
"armv5te", TARGET_CPU_arm1026ejs, "armv5te",
(TF_CO_PROC), arch_opttab_armv5te,
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te, ISA_ARMv5te,
isa_nobit isa_nobit
}, },
arch_opttab_armv5te, "5TE", BASE_ARCH_5TE,
NULL TARGET_CPU_arm1026ejs,
}, },
{ {
"armv5tej", TARGET_CPU_arm1026ejs, "armv5tej",
(TF_CO_PROC), arch_opttab_armv5tej,
"5TEJ", BASE_ARCH_5TEJ,
{ {
ISA_ARMv5tej, ISA_ARMv5tej,
isa_nobit isa_nobit
}, },
arch_opttab_armv5tej, "5TEJ", BASE_ARCH_5TEJ,
NULL TARGET_CPU_arm1026ejs,
}, },
{ {
"armv6", TARGET_CPU_arm1136js, "armv6",
(TF_CO_PROC), arch_opttab_armv6,
"6", BASE_ARCH_6,
{ {
ISA_ARMv6, ISA_ARMv6,
isa_nobit isa_nobit
}, },
arch_opttab_armv6, "6", BASE_ARCH_6,
NULL TARGET_CPU_arm1136js,
}, },
{ {
"armv6j", TARGET_CPU_arm1136js, "armv6j",
(TF_CO_PROC), arch_opttab_armv6j,
"6J", BASE_ARCH_6J,
{ {
ISA_ARMv6j, ISA_ARMv6j,
isa_nobit isa_nobit
}, },
arch_opttab_armv6j, "6J", BASE_ARCH_6J,
NULL TARGET_CPU_arm1136js,
}, },
{ {
"armv6k", TARGET_CPU_mpcore, "armv6k",
(TF_CO_PROC), arch_opttab_armv6k,
"6K", BASE_ARCH_6K,
{ {
ISA_ARMv6k, ISA_ARMv6k,
isa_nobit isa_nobit
}, },
arch_opttab_armv6k, "6K", BASE_ARCH_6K,
NULL TARGET_CPU_mpcore,
}, },
{ {
"armv6z", TARGET_CPU_arm1176jzs, "armv6z",
(TF_CO_PROC), arch_opttab_armv6z,
"6Z", BASE_ARCH_6Z,
{ {
ISA_ARMv6z, ISA_ARMv6z,
isa_nobit isa_nobit
}, },
arch_opttab_armv6z, "6Z", BASE_ARCH_6Z,
NULL TARGET_CPU_arm1176jzs,
}, },
{ {
"armv6kz", TARGET_CPU_arm1176jzs, "armv6kz",
(TF_CO_PROC), arch_opttab_armv6kz,
"6KZ", BASE_ARCH_6KZ,
{ {
ISA_ARMv6kz, ISA_ARMv6kz,
isa_nobit isa_nobit
}, },
arch_opttab_armv6kz, "6KZ", BASE_ARCH_6KZ,
NULL TARGET_CPU_arm1176jzs,
}, },
{ {
"armv6zk", TARGET_CPU_arm1176jzs, "armv6zk",
(TF_CO_PROC), arch_opttab_armv6zk,
"6KZ", BASE_ARCH_6KZ,
{ {
ISA_ARMv6kz, ISA_ARMv6kz,
isa_nobit isa_nobit
}, },
arch_opttab_armv6zk, "6KZ", BASE_ARCH_6KZ,
NULL TARGET_CPU_arm1176jzs,
}, },
{ {
"armv6t2", TARGET_CPU_arm1156t2s, "armv6t2",
(TF_CO_PROC), arch_opttab_armv6t2,
"6T2", BASE_ARCH_6T2,
{ {
ISA_ARMv6t2, ISA_ARMv6t2,
isa_nobit isa_nobit
}, },
arch_opttab_armv6t2, "6T2", BASE_ARCH_6T2,
NULL TARGET_CPU_arm1156t2s,
}, },
{ {
"armv6-m", TARGET_CPU_cortexm1, "armv6-m",
0, NULL,
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}, },
NULL, "6M", BASE_ARCH_6M,
NULL TARGET_CPU_cortexm1,
}, },
{ {
"armv6s-m", TARGET_CPU_cortexm1, "armv6s-m",
0, NULL,
"6M", BASE_ARCH_6M,
{ {
ISA_ARMv6m, ISA_ARMv6m,
isa_nobit isa_nobit
}, },
NULL, "6M", BASE_ARCH_6M,
NULL TARGET_CPU_cortexm1,
}, },
{ {
"armv7", TARGET_CPU_cortexa8, "armv7",
(TF_CO_PROC), arch_opttab_armv7,
"7", BASE_ARCH_7,
{ {
ISA_ARMv7, ISA_ARMv7,
isa_nobit isa_nobit
}, },
arch_opttab_armv7, "7", BASE_ARCH_7,
NULL TARGET_CPU_cortexa8,
}, },
{ {
"armv7-a", TARGET_CPU_cortexa8, "armv7-a",
(TF_CO_PROC), arch_opttab_armv7_a,
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7a, ISA_ARMv7a,
isa_nobit isa_nobit
}, },
arch_opttab_armv7_a, "7A", BASE_ARCH_7A,
NULL TARGET_CPU_cortexa8,
}, },
{ {
"armv7ve", TARGET_CPU_cortexa8, "armv7ve",
(TF_CO_PROC), arch_opttab_armv7ve,
"7A", BASE_ARCH_7A,
{ {
ISA_ARMv7ve, ISA_ARMv7ve,
isa_nobit isa_nobit
}, },
arch_opttab_armv7ve, "7A", BASE_ARCH_7A,
NULL TARGET_CPU_cortexa8,
}, },
{ {
"armv7-r", TARGET_CPU_cortexr4, "armv7-r",
(TF_CO_PROC), arch_opttab_armv7_r,
"7R", BASE_ARCH_7R,
{ {
ISA_ARMv7r, ISA_ARMv7r,
isa_nobit isa_nobit
}, },
arch_opttab_armv7_r, "7R", BASE_ARCH_7R,
NULL TARGET_CPU_cortexr4,
}, },
{ {
"armv7-m", TARGET_CPU_cortexm3, "armv7-m",
(TF_CO_PROC), NULL,
"7M", BASE_ARCH_7M,
{ {
ISA_ARMv7m, ISA_ARMv7m,
isa_nobit isa_nobit
}, },
NULL, "7M", BASE_ARCH_7M,
NULL TARGET_CPU_cortexm3,
}, },
{ {
"armv7e-m", TARGET_CPU_cortexm4, "armv7e-m",
(TF_CO_PROC), arch_opttab_armv7e_m,
"7EM", BASE_ARCH_7EM,
{ {
ISA_ARMv7em, ISA_ARMv7em,
isa_nobit isa_nobit
}, },
arch_opttab_armv7e_m, "7EM", BASE_ARCH_7EM,
NULL TARGET_CPU_cortexm4,
}, },
{ {
"armv8-a", TARGET_CPU_cortexa53, "armv8-a",
(TF_CO_PROC), arch_opttab_armv8_a,
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8a, ISA_ARMv8a,
isa_nobit isa_nobit
}, },
arch_opttab_armv8_a, "8A", BASE_ARCH_8A,
NULL TARGET_CPU_cortexa53,
}, },
{ {
"armv8.1-a", TARGET_CPU_cortexa53, "armv8.1-a",
(TF_CO_PROC), arch_opttab_armv8_1_a,
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8_1a, ISA_ARMv8_1a,
isa_nobit isa_nobit
}, },
arch_opttab_armv8_1_a, "8A", BASE_ARCH_8A,
NULL TARGET_CPU_cortexa53,
}, },
{ {
"armv8.2-a", TARGET_CPU_cortexa53, "armv8.2-a",
(TF_CO_PROC), arch_opttab_armv8_2_a,
"8A", BASE_ARCH_8A,
{ {
ISA_ARMv8_2a, ISA_ARMv8_2a,
isa_nobit isa_nobit
}, },
arch_opttab_armv8_2_a, "8A", BASE_ARCH_8A,
NULL TARGET_CPU_cortexa53,
}, },
{ {
"armv8-m.base", TARGET_CPU_cortexm23, "armv8-m.base",
0, NULL,
"8M_BASE", BASE_ARCH_8M_BASE,
{ {
ISA_ARMv8m_base, ISA_ARMv8m_base,
isa_nobit isa_nobit
}, },
NULL, "8M_BASE", BASE_ARCH_8M_BASE,
NULL TARGET_CPU_cortexm23,
}, },
{ {
"armv8-m.main", TARGET_CPU_cortexm7, "armv8-m.main",
(TF_CO_PROC), arch_opttab_armv8_m_main,
"8M_MAIN", BASE_ARCH_8M_MAIN,
{ {
ISA_ARMv8m_main, ISA_ARMv8m_main,
isa_nobit isa_nobit
}, },
arch_opttab_armv8_m_main, "8M_MAIN", BASE_ARCH_8M_MAIN,
NULL TARGET_CPU_cortexm7,
}, },
{ {
"iwmmxt", TARGET_CPU_iwmmxt, "iwmmxt",
(TF_LDSCHED | TF_STRONG | TF_XSCALE), NULL,
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt, ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt,
isa_nobit isa_nobit
}, },
NULL, "5TE", BASE_ARCH_5TE,
NULL TARGET_CPU_iwmmxt,
}, },
{ {
"iwmmxt2", TARGET_CPU_iwmmxt2, "iwmmxt2",
(TF_LDSCHED | TF_STRONG | TF_XSCALE), NULL,
"5TE", BASE_ARCH_5TE,
{ {
ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt,isa_bit_iwmmxt2, ISA_ARMv5te,isa_bit_xscale,isa_bit_iwmmxt,isa_bit_iwmmxt2,
isa_nobit isa_nobit
}, },
NULL, "5TE", BASE_ARCH_5TE,
NULL TARGET_CPU_iwmmxt2,
}, },
{NULL, TARGET_CPU_arm_none, 0, NULL, BASE_ARCH_0, {isa_nobit}, NULL, NULL} {{NULL, NULL, {isa_nobit}},
NULL, BASE_ARCH_0, TARGET_CPU_arm_none}
}; };
const struct arm_fpu_desc all_fpus[] = const struct arm_fpu_desc all_fpus[] =
......
gcc/config/arm/arm-cpu.h
...@@ -133,6 +133,44 @@ enum processor_type ...@@ -133,6 +133,44 @@ enum processor_type
TARGET_CPU_arm_none TARGET_CPU_arm_none
}; };
enum arch_type
{
TARGET_ARCH_armv2,
TARGET_ARCH_armv2a,
TARGET_ARCH_armv3,
TARGET_ARCH_armv3m,
TARGET_ARCH_armv4,
TARGET_ARCH_armv4t,
TARGET_ARCH_armv5,
TARGET_ARCH_armv5t,
TARGET_ARCH_armv5e,
TARGET_ARCH_armv5te,
TARGET_ARCH_armv5tej,
TARGET_ARCH_armv6,
TARGET_ARCH_armv6j,
TARGET_ARCH_armv6k,
TARGET_ARCH_armv6z,
TARGET_ARCH_armv6kz,
TARGET_ARCH_armv6zk,
TARGET_ARCH_armv6t2,
TARGET_ARCH_armv6_m,
TARGET_ARCH_armv6s_m,
TARGET_ARCH_armv7,
TARGET_ARCH_armv7_a,
TARGET_ARCH_armv7ve,
TARGET_ARCH_armv7_r,
TARGET_ARCH_armv7_m,
TARGET_ARCH_armv7e_m,
TARGET_ARCH_armv8_a,
TARGET_ARCH_armv8_1_a,
TARGET_ARCH_armv8_2_a,
TARGET_ARCH_armv8_m_base,
TARGET_ARCH_armv8_m_main,
TARGET_ARCH_iwmmxt,
TARGET_ARCH_iwmmxt2,
TARGET_ARCH_arm_none
};
enum fpu_type enum fpu_type
{ {
TARGET_FPU_vfp, TARGET_FPU_vfp,
......
gcc/config/arm/arm-protos.h
...@@ -462,8 +462,6 @@ struct arm_build_target ...@@ -462,8 +462,6 @@ struct arm_build_target
const char *arch_name; const char *arch_name;
/* Preprocessor substring (never NULL). */ /* Preprocessor substring (never NULL). */
const char *arch_pp_name; const char *arch_pp_name;
/* CPU identifier for the core we're compiling for (architecturally). */
enum processor_type arch_core;
/* The base architecture value. */ /* The base architecture value. */
enum base_architecture base_arch; enum base_architecture base_arch;
/* Bitmap encapsulating the isa_bits for the target environment. */ /* Bitmap encapsulating the isa_bits for the target environment. */
...@@ -478,5 +476,41 @@ struct arm_build_target ...@@ -478,5 +476,41 @@ struct arm_build_target
extern struct arm_build_target arm_active_target; extern struct arm_build_target arm_active_target;
struct cpu_arch_extension
{
const char *const name;
bool remove;
const enum isa_feature isa_bits[isa_num_bits];
};
struct cpu_arch_option
{
/* Name for this option. */
const char *name;
/* List of feature extensions permitted. */
const struct cpu_arch_extension *extensions;
/* Standard feature bits. */
enum isa_feature isa_bits[isa_num_bits];
};
struct arch_option
{
/* Common option fields. */
cpu_arch_option common;
/* Short string for this architecture. */
const char *arch;
/* Base architecture, from which this specific architecture is derived. */
enum base_architecture base_arch;
/* Default tune target (in the absence of any more specific data). */
enum processor_type tune_id;
};
struct cpu_option
{
/* Common option fields. */
cpu_arch_option common;
/* Architecture upon which this CPU is based. */
enum arch_type arch;
};
#endif /* ! GCC_ARM_PROTOS_H */ #endif /* ! GCC_ARM_PROTOS_H */
gcc/config/arm/arm.c
...@@ -975,26 +975,13 @@ int arm_regs_in_sequence[] = ...@@ -975,26 +975,13 @@ int arm_regs_in_sequence[] =
/* Initialization code. */ /* Initialization code. */
struct cpu_option struct cpu_tune
{ {
const char *const name; enum processor_type scheduler;
bool remove;
const enum isa_feature isa_bits[isa_num_bits];
};
struct processors
{
const char *const name;
enum processor_type core;
unsigned int tune_flags; unsigned int tune_flags;
const char *arch; const struct tune_params *tune;
enum base_architecture base_arch;
const enum isa_feature isa_bits[isa_num_bits];
const struct cpu_option* const opttab;
const struct tune_params *const tune;
}; };
#define ARM_PREFETCH_NOT_BENEFICIAL { 0, -1, -1 } #define ARM_PREFETCH_NOT_BENEFICIAL { 0, -1, -1 }
#define ARM_PREFETCH_BENEFICIAL(num_slots,l1_size,l1_line_size) \ #define ARM_PREFETCH_BENEFICIAL(num_slots,l1_size,l1_line_size) \
{ \ { \
...@@ -3047,15 +3034,59 @@ arm_initialize_isa (sbitmap isa, const enum isa_feature *isa_bits) ...@@ -3047,15 +3034,59 @@ arm_initialize_isa (sbitmap isa, const enum isa_feature *isa_bits)
bitmap_set_bit (isa, *(isa_bits++)); bitmap_set_bit (isa, *(isa_bits++));
} }
/* List the permitted CPU or architecture names. If TARGET is a near /* List the permitted CPU option names. If TARGET is a near miss for an
entry, print out the suggested alternative. */
static void
arm_print_hint_for_cpu_option (const char *target,
const cpu_option *list)
{
auto_vec<const char*> candidates;
for (; list->common.name != NULL; list++)
candidates.safe_push (list->common.name);
char *s;
const char *hint = candidates_list_and_hint (target, s, candidates);
if (hint)
inform (input_location, "valid arguments are: %s; did you mean %qs?",
s, hint);
else
inform (input_location, "valid arguments are: %s", s);
XDELETEVEC (s);
}
/* Parse the base component of a CPU selection in LIST. Return a
pointer to the entry in the architecture table. OPTNAME is the
name of the option we are parsing and can be used if a diagnostic
is needed. */
static const cpu_option *
arm_parse_cpu_option_name (const cpu_option *list, const char *optname,
const char *target)
{
const cpu_option *entry;
const char *end = strchr (target, '+');
size_t len = end ? end - target : strlen (target);
for (entry = list; entry->common.name != NULL; entry++)
{
if (strncmp (entry->common.name, target, len) == 0
&& entry->common.name[len] == '\0')
return entry;
}
error_at (input_location, "unrecognized %s target: %s", optname, target);
arm_print_hint_for_cpu_option (target, list);
return NULL;
}
/* List the permitted architecture option names. If TARGET is a near
miss for an entry, print out the suggested alternative. */ miss for an entry, print out the suggested alternative. */
static void static void
arm_print_hint_for_core_or_arch (const char *target, arm_print_hint_for_arch_option (const char *target,
const struct processors *list) const arch_option *list)
{ {
auto_vec<const char*> candidates; auto_vec<const char*> candidates;
for (; list->name != NULL; list++) for (; list->common.name != NULL; list++)
candidates.safe_push (list->name); candidates.safe_push (list->common.name);
char *s; char *s;
const char *hint = candidates_list_and_hint (target, s, candidates); const char *hint = candidates_list_and_hint (target, s, candidates);
if (hint) if (hint)
...@@ -3071,23 +3102,23 @@ arm_print_hint_for_core_or_arch (const char *target, ...@@ -3071,23 +3102,23 @@ arm_print_hint_for_core_or_arch (const char *target,
LIST. Return a pointer to the entry in the architecture table. LIST. Return a pointer to the entry in the architecture table.
OPTNAME is the name of the option we are parsing and can be used if OPTNAME is the name of the option we are parsing and can be used if
a diagnostic is needed. */ a diagnostic is needed. */
static const struct processors * static const arch_option *
arm_parse_arch_cpu_name (const struct processors *list, const char *optname, arm_parse_arch_option_name (const arch_option *list, const char *optname,
const char *target) const char *target)
{ {
const struct processors *entry; const arch_option *entry;
const char *end = strchr (target, '+'); const char *end = strchr (target, '+');
size_t len = end ? end - target : strlen (target); size_t len = end ? end - target : strlen (target);
for (entry = list; entry->name != NULL; entry++) for (entry = list; entry->common.name != NULL; entry++)
{ {
if (strncmp (entry->name, target, len) == 0 if (strncmp (entry->common.name, target, len) == 0
&& entry->name[len] == '\0') && entry->common.name[len] == '\0')
return entry; return entry;
} }
error_at (input_location, "unrecognized %s target: %s", optname, target); error_at (input_location, "unrecognized %s target: %s", optname, target);
arm_print_hint_for_core_or_arch (target, list); arm_print_hint_for_arch_option (target, list);
return NULL; return NULL;
} }
...@@ -3096,7 +3127,7 @@ arm_parse_arch_cpu_name (const struct processors *list, const char *optname, ...@@ -3096,7 +3127,7 @@ arm_parse_arch_cpu_name (const struct processors *list, const char *optname,
values. */ values. */
static void static void
arm_unrecognized_feature (const char *opt, size_t len, arm_unrecognized_feature (const char *opt, size_t len,
const struct processors *target) const cpu_arch_option *target)
{ {
char *this_opt = XALLOCAVEC (char, len+1); char *this_opt = XALLOCAVEC (char, len+1);
auto_vec<const char*> candidates; auto_vec<const char*> candidates;
...@@ -3106,7 +3137,9 @@ arm_unrecognized_feature (const char *opt, size_t len, ...@@ -3106,7 +3137,9 @@ arm_unrecognized_feature (const char *opt, size_t len,
error_at (input_location, "%qs does not support feature %qs", target->name, error_at (input_location, "%qs does not support feature %qs", target->name,
this_opt); this_opt);
for (const cpu_option *list = target->opttab; list->name != NULL; list++) for (const cpu_arch_extension *list = target->extensions;
list->name != NULL;
list++)
candidates.safe_push (list->name); candidates.safe_push (list->name);
char *s; char *s;
...@@ -3124,7 +3157,7 @@ arm_unrecognized_feature (const char *opt, size_t len, ...@@ -3124,7 +3157,7 @@ arm_unrecognized_feature (const char *opt, size_t len,
/* Parse any feature extensions to add to (or remove from) the /* Parse any feature extensions to add to (or remove from) the
permitted ISA selection. */ permitted ISA selection. */
static void static void
arm_parse_arch_cpu_features (sbitmap isa, const struct processors *target, arm_parse_option_features (sbitmap isa, const cpu_arch_option *target,
const char *opts_in) const char *opts_in)
{ {
const char *opts = opts_in; const char *opts = opts_in;
...@@ -3132,7 +3165,7 @@ arm_parse_arch_cpu_features (sbitmap isa, const struct processors *target, ...@@ -3132,7 +3165,7 @@ arm_parse_arch_cpu_features (sbitmap isa, const struct processors *target,
if (!opts) if (!opts)
return; return;
if (!target->opttab) if (!target->extensions)
{ {
error_at (input_location, "%s does not take any feature options", error_at (input_location, "%s does not take any feature options",
target->name); target->name);
...@@ -3142,12 +3175,14 @@ arm_parse_arch_cpu_features (sbitmap isa, const struct processors *target, ...@@ -3142,12 +3175,14 @@ arm_parse_arch_cpu_features (sbitmap isa, const struct processors *target,
while (opts) while (opts)
{ {
gcc_assert (*opts == '+'); gcc_assert (*opts == '+');
const struct cpu_option *entry; const struct cpu_arch_extension *entry;
const char *end = strchr (++opts, '+'); const char *end = strchr (++opts, '+');
size_t len = end ? end - opts : strlen (opts); size_t len = end ? end - opts : strlen (opts);
bool matched = false; bool matched = false;
for (entry = target->opttab; !matched && entry->name != NULL; entry++) for (entry = target->extensions;
!matched && entry->name != NULL;
entry++)
{ {
if (strncmp (entry->name, opts, len) == 0 if (strncmp (entry->name, opts, len) == 0
&& entry->name[len] == '\0') && entry->name[len] == '\0')
...@@ -3189,10 +3224,10 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3189,10 +3224,10 @@ arm_configure_build_target (struct arm_build_target *target,
struct gcc_options *opts_set, struct gcc_options *opts_set,
bool warn_compatible) bool warn_compatible)
{ {
const struct processors *arm_selected_tune = NULL; const cpu_option *arm_selected_tune = NULL;
const struct processors *arm_selected_arch = NULL; const arch_option *arm_selected_arch = NULL;
const struct processors *arm_selected_cpu = NULL; const cpu_option *arm_selected_cpu = NULL;
const struct arm_fpu_desc *arm_selected_fpu = NULL; const arm_fpu_desc *arm_selected_fpu = NULL;
const char *tune_opts = NULL; const char *tune_opts = NULL;
const char *arch_opts = NULL; const char *arch_opts = NULL;
const char *cpu_opts = NULL; const char *cpu_opts = NULL;
...@@ -3203,7 +3238,7 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3203,7 +3238,7 @@ arm_configure_build_target (struct arm_build_target *target,
if (opts_set->x_arm_arch_string) if (opts_set->x_arm_arch_string)
{ {
arm_selected_arch = arm_parse_arch_cpu_name (all_architectures, arm_selected_arch = arm_parse_arch_option_name (all_architectures,
"-march", "-march",
opts->x_arm_arch_string); opts->x_arm_arch_string);
arch_opts = strchr (opts->x_arm_arch_string, '+'); arch_opts = strchr (opts->x_arm_arch_string, '+');
...@@ -3211,7 +3246,7 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3211,7 +3246,7 @@ arm_configure_build_target (struct arm_build_target *target,
if (opts_set->x_arm_cpu_string) if (opts_set->x_arm_cpu_string)
{ {
arm_selected_cpu = arm_parse_arch_cpu_name (all_cores, "-mcpu", arm_selected_cpu = arm_parse_cpu_option_name (all_cores, "-mcpu",
opts->x_arm_cpu_string); opts->x_arm_cpu_string);
cpu_opts = strchr (opts->x_arm_cpu_string, '+'); cpu_opts = strchr (opts->x_arm_cpu_string, '+');
arm_selected_tune = arm_selected_cpu; arm_selected_tune = arm_selected_cpu;
...@@ -3221,73 +3256,83 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3221,73 +3256,83 @@ arm_configure_build_target (struct arm_build_target *target,
if (opts_set->x_arm_tune_string) if (opts_set->x_arm_tune_string)
{ {
arm_selected_tune = arm_parse_arch_cpu_name (all_cores, "-mtune", arm_selected_tune = arm_parse_cpu_option_name (all_cores, "-mtune",
opts->x_arm_tune_string); opts->x_arm_tune_string);
tune_opts = strchr (opts->x_arm_tune_string, '+'); tune_opts = strchr (opts->x_arm_tune_string, '+');
} }
if (arm_selected_arch) if (arm_selected_arch)
{ {
arm_initialize_isa (target->isa, arm_selected_arch->isa_bits); arm_initialize_isa (target->isa, arm_selected_arch->common.isa_bits);
arm_parse_arch_cpu_features (target->isa, arm_selected_arch, arch_opts); arm_parse_option_features (target->isa, &arm_selected_arch->common,
arch_opts);
if (arm_selected_cpu) if (arm_selected_cpu)
{ {
auto_sbitmap cpu_isa (isa_num_bits); auto_sbitmap cpu_isa (isa_num_bits);
auto_sbitmap isa_delta (isa_num_bits);
arm_initialize_isa (cpu_isa, arm_selected_cpu->isa_bits); arm_initialize_isa (cpu_isa, arm_selected_cpu->common.isa_bits);
arm_parse_arch_cpu_features (cpu_isa, arm_selected_cpu, cpu_opts); arm_parse_option_features (cpu_isa, &arm_selected_cpu->common,
bitmap_xor (cpu_isa, cpu_isa, target->isa); cpu_opts);
bitmap_xor (isa_delta, cpu_isa, target->isa);
/* Ignore any bits that are quirk bits. */ /* Ignore any bits that are quirk bits. */
bitmap_and_compl (cpu_isa, cpu_isa, isa_quirkbits); bitmap_and_compl (isa_delta, isa_delta, isa_quirkbits);
/* Ignore (for now) any bits that might be set by -mfpu. */ /* Ignore (for now) any bits that might be set by -mfpu. */
bitmap_and_compl (cpu_isa, cpu_isa, isa_all_fpubits); bitmap_and_compl (isa_delta, isa_delta, isa_all_fpubits);
if (!bitmap_empty_p (cpu_isa)) if (!bitmap_empty_p (isa_delta))
{ {
if (warn_compatible) if (warn_compatible)
warning (0, "switch -mcpu=%s conflicts with -march=%s switch", warning (0, "switch -mcpu=%s conflicts with -march=%s switch",
arm_selected_cpu->name, arm_selected_arch->name); arm_selected_cpu->common.name,
arm_selected_arch->common.name);
/* -march wins for code generation. /* -march wins for code generation.
-mcpu wins for default tuning. */ -mcpu wins for default tuning. */
if (!arm_selected_tune) if (!arm_selected_tune)
arm_selected_tune = arm_selected_cpu; arm_selected_tune = arm_selected_cpu;
arm_selected_cpu = arm_selected_arch; arm_selected_cpu = all_cores + arm_selected_arch->tune_id;
target->arch_name = arm_selected_arch->name; target->arch_name = arm_selected_arch->common.name;
} }
else else
{ {
/* Architecture and CPU are essentially the same. /* Architecture and CPU are essentially the same.
Prefer the CPU setting. */ Prefer the CPU setting. */
arm_selected_arch = NULL; arm_selected_arch = all_architectures + arm_selected_cpu->arch;
target->core_name = arm_selected_cpu->name; target->core_name = arm_selected_cpu->common.name;
/* Copy the CPU's capabilities, so that we inherit the
appropriate extensions and quirks. */
bitmap_copy (target->isa, cpu_isa);
} }
} }
else else
{ {
/* Pick a CPU based on the architecture. */ /* Pick a CPU based on the architecture. */
arm_selected_cpu = arm_selected_arch; arm_selected_cpu = all_cores + arm_selected_arch->tune_id;
target->arch_name = arm_selected_arch->name; target->arch_name = arm_selected_arch->common.name;
/* Note: target->core_name is left unset in this path. */ /* Note: target->core_name is left unset in this path. */
} }
} }
else if (arm_selected_cpu) else if (arm_selected_cpu)
{ {
target->core_name = arm_selected_cpu->name; target->core_name = arm_selected_cpu->common.name;
arm_initialize_isa (target->isa, arm_selected_cpu->isa_bits); arm_initialize_isa (target->isa, arm_selected_cpu->common.isa_bits);
arm_parse_arch_cpu_features (target->isa, arm_selected_cpu, cpu_opts); arm_parse_option_features (target->isa, &arm_selected_cpu->common,
cpu_opts);
arm_selected_arch = all_architectures + arm_selected_cpu->arch;
} }
/* If the user did not specify a processor, choose one for them. */ /* If the user did not specify a processor or architecture, choose
one for them. */
else else
{ {
const struct processors * sel; const cpu_option *sel;
auto_sbitmap sought_isa (isa_num_bits); auto_sbitmap sought_isa (isa_num_bits);
bitmap_clear (sought_isa); bitmap_clear (sought_isa);
auto_sbitmap default_isa (isa_num_bits); auto_sbitmap default_isa (isa_num_bits);
arm_selected_cpu = &all_cores[TARGET_CPU_DEFAULT]; arm_selected_cpu = &all_cores[TARGET_CPU_DEFAULT];
gcc_assert (arm_selected_cpu->name); gcc_assert (arm_selected_cpu->common.name);
/* RWE: All of the selection logic below (to the end of this /* RWE: All of the selection logic below (to the end of this
'if' clause) looks somewhat suspect. It appears to be mostly 'if' clause) looks somewhat suspect. It appears to be mostly
...@@ -3296,7 +3341,7 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3296,7 +3341,7 @@ arm_configure_build_target (struct arm_build_target *target,
user might be expecting). I think it should be removed once user might be expecting). I think it should be removed once
support for the pre-thumb era cores is removed. */ support for the pre-thumb era cores is removed. */
sel = arm_selected_cpu; sel = arm_selected_cpu;
arm_initialize_isa (default_isa, sel->isa_bits); arm_initialize_isa (default_isa, sel->common.isa_bits);
/* Now check to see if the user has specified any command line /* Now check to see if the user has specified any command line
switches that require certain abilities from the cpu. */ switches that require certain abilities from the cpu. */
...@@ -3329,18 +3374,18 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3329,18 +3374,18 @@ arm_configure_build_target (struct arm_build_target *target,
/* Try to locate a CPU type that supports all of the abilities /* Try to locate a CPU type that supports all of the abilities
of the default CPU, plus the extra abilities requested by of the default CPU, plus the extra abilities requested by
the user. */ the user. */
for (sel = all_cores; sel->name != NULL; sel++) for (sel = all_cores; sel->common.name != NULL; sel++)
{ {
arm_initialize_isa (candidate_isa, sel->isa_bits); arm_initialize_isa (candidate_isa, sel->common.isa_bits);
/* An exact match? */ /* An exact match? */
if (bitmap_equal_p (default_isa, candidate_isa)) if (bitmap_equal_p (default_isa, candidate_isa))
break; break;
} }
if (sel->name == NULL) if (sel->common.name == NULL)
{ {
unsigned current_bit_count = isa_num_bits; unsigned current_bit_count = isa_num_bits;
const struct processors * best_fit = NULL; const cpu_option *best_fit = NULL;
/* Ideally we would like to issue an error message here /* Ideally we would like to issue an error message here
saying that it was not possible to find a CPU compatible saying that it was not possible to find a CPU compatible
...@@ -3354,9 +3399,9 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3354,9 +3399,9 @@ arm_configure_build_target (struct arm_build_target *target,
command line options we scan the array again looking command line options we scan the array again looking
for a best match. The best match must have at least for a best match. The best match must have at least
the capabilities of the perfect match. */ the capabilities of the perfect match. */
for (sel = all_cores; sel->name != NULL; sel++) for (sel = all_cores; sel->common.name != NULL; sel++)
{ {
arm_initialize_isa (candidate_isa, sel->isa_bits); arm_initialize_isa (candidate_isa, sel->common.isa_bits);
if (bitmap_subset_p (default_isa, candidate_isa)) if (bitmap_subset_p (default_isa, candidate_isa))
{ {
...@@ -3382,11 +3427,13 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3382,11 +3427,13 @@ arm_configure_build_target (struct arm_build_target *target,
/* Now we know the CPU, we can finally initialize the target /* Now we know the CPU, we can finally initialize the target
structure. */ structure. */
target->core_name = arm_selected_cpu->name; target->core_name = arm_selected_cpu->common.name;
arm_initialize_isa (target->isa, arm_selected_cpu->isa_bits); arm_initialize_isa (target->isa, arm_selected_cpu->common.isa_bits);
arm_selected_arch = all_architectures + arm_selected_cpu->arch;
} }
gcc_assert (arm_selected_cpu); gcc_assert (arm_selected_cpu);
gcc_assert (arm_selected_arch);
if (opts->x_arm_fpu_index != TARGET_FPU_auto) if (opts->x_arm_fpu_index != TARGET_FPU_auto)
{ {
...@@ -3398,20 +3445,20 @@ arm_configure_build_target (struct arm_build_target *target, ...@@ -3398,20 +3445,20 @@ arm_configure_build_target (struct arm_build_target *target,
bitmap_ior (target->isa, target->isa, fpu_bits); bitmap_ior (target->isa, target->isa, fpu_bits);
} }
/* The selected cpu may be an architecture, so lookup tuning by core ID. */
if (!arm_selected_tune) if (!arm_selected_tune)
arm_selected_tune = &all_cores[arm_selected_cpu->core]; arm_selected_tune = arm_selected_cpu;
else /* Validate the features passed to -mtune. */ else /* Validate the features passed to -mtune. */
arm_parse_arch_cpu_features (NULL, arm_selected_tune, tune_opts); arm_parse_option_features (NULL, &arm_selected_tune->common, tune_opts);
const cpu_tune *tune_data = &all_tunes[arm_selected_tune - all_cores];
/* Finish initializing the target structure. */ /* Finish initializing the target structure. */
target->arch_pp_name = arm_selected_cpu->arch; target->arch_pp_name = arm_selected_arch->arch;
target->base_arch = arm_selected_cpu->base_arch; target->base_arch = arm_selected_arch->base_arch;
target->arch_core = arm_selected_cpu->core;
target->tune_flags = arm_selected_tune->tune_flags; target->tune_flags = tune_data->tune_flags;
target->tune = arm_selected_tune->tune; target->tune = tune_data->tune;
target->tune_core = arm_selected_tune->core; target->tune_core = tune_data->scheduler;
} }
/* Fix up any incompatible options that the user has specified. */ /* Fix up any incompatible options that the user has specified. */
...@@ -26283,18 +26330,20 @@ arm_print_tune_info (void) ...@@ -26283,18 +26330,20 @@ arm_print_tune_info (void)
static void static void
arm_print_asm_arch_directives () arm_print_asm_arch_directives ()
{ {
const struct processors *arch const arch_option *arch
= arm_parse_arch_cpu_name (all_architectures, "-march", = arm_parse_arch_option_name (all_architectures, "-march",
arm_active_target.arch_name); arm_active_target.arch_name);
auto_sbitmap opt_bits (isa_num_bits); auto_sbitmap opt_bits (isa_num_bits);
gcc_assert (arch); gcc_assert (arch);
asm_fprintf (asm_out_file, "\t.arch %s\n", arm_active_target.arch_name); asm_fprintf (asm_out_file, "\t.arch %s\n", arm_active_target.arch_name);
if (!arch->opttab) if (!arch->common.extensions)
return; return;
for (const struct cpu_option *opt = arch->opttab; opt->name != NULL; opt++) for (const struct cpu_arch_extension *opt = arch->common.extensions;
opt->name != NULL;
opt++)
{ {
if (!opt->remove) if (!opt->remove)
{ {
......
gcc/config/arm/parsecpu.awk
...@@ -102,6 +102,17 @@ function gen_headers () { ...@@ -102,6 +102,17 @@ function gen_headers () {
print " TARGET_CPU_arm_none" print " TARGET_CPU_arm_none"
print "};\n" print "};\n"
print "enum arch_type"
print "{"
narchs = split (arch_list, archs)
for (n = 1; n <= narchs; n++) {
print " TARGET_ARCH_"arch_cnames[archs[n]]","
}
print " TARGET_ARCH_arm_none"
print "};\n"
print "enum fpu_type" print "enum fpu_type"
print "{" print "{"
...@@ -121,7 +132,7 @@ function gen_data () { ...@@ -121,7 +132,7 @@ function gen_data () {
for (n = 1; n <= ncpus; n++) { for (n = 1; n <= ncpus; n++) {
if (cpus[n] in cpu_opts) { if (cpus[n] in cpu_opts) {
print "static const struct cpu_option cpu_opttab_" \ print "static const cpu_arch_extension cpu_opttab_" \
cpu_cnames[cpus[n]] "[] = {" cpu_cnames[cpus[n]] "[] = {"
nopts = split (cpu_opts[cpus[n]], opts) nopts = split (cpu_opts[cpus[n]], opts)
for (opt = 1; opt <= nopts; opt++) { for (opt = 1; opt <= nopts; opt++) {
...@@ -136,30 +147,23 @@ function gen_data () { ...@@ -136,30 +147,23 @@ function gen_data () {
} }
} }
print "static const struct processors all_cores[] =" print "static const cpu_option all_cores[] ="
print "{" print "{"
for (n = 1; n <= ncpus; n++) { for (n = 1; n <= ncpus; n++) {
print " {" print " {"
print " {"
# common.name
print " \"" cpus[n] "\"," print " \"" cpus[n] "\","
if (cpus[n] in cpu_tune_for) { # common.extensions
if (! (cpu_tune_for[cpus[n]] in cpu_cnames)) { if (cpus[n] in cpu_opts) {
fatal("unknown \"tune for\" target " cpu_tune_for[cpus[n]] \ print " cpu_opttab_" cpu_cnames[cpus[n]] ","
" for CPU " cpus[n]) } else print " NULL,"
} # common.isa_bits
print " TARGET_CPU_" cpu_cnames[cpu_tune_for[cpus[n]]] ","
} else {
print " TARGET_CPU_" cpu_cnames[cpus[n]] ","
}
if (cpus[n] in cpu_tune_flags) {
print " (" cpu_tune_flags[cpus[n]] "),"
} else print " 0,"
nfeats = split (cpu_arch[cpus[n]], feats, "+") nfeats = split (cpu_arch[cpus[n]], feats, "+")
if (! (feats[1] in arch_isa)) { if (! (feats[1] in arch_isa)) {
fatal("unknown arch " feats[1] " for cpu " cpus[n]) fatal("unknown arch " feats[1] " for cpu " cpus[n])
} }
print " \"" arch_base[feats[1]] "\", BASE_ARCH_" \
arch_base[feats[1]] ","
print " {" print " {"
print " " arch_isa[feats[1]] "," print " " arch_isa[feats[1]] ","
for (m = 2; m <= nfeats; m++) { for (m = 2; m <= nfeats; m++) {
...@@ -174,23 +178,47 @@ function gen_data () { ...@@ -174,23 +178,47 @@ function gen_data () {
if (cpus[n] in cpu_fpu) print " " fpu_isa[cpu_fpu[cpus[n]]] "," if (cpus[n] in cpu_fpu) print " " fpu_isa[cpu_fpu[cpus[n]]] ","
if (cpus[n] in cpu_isa) print " " cpu_isa[cpus[n]] "," if (cpus[n] in cpu_isa) print " " cpu_isa[cpus[n]] ","
print " isa_nobit" print " isa_nobit"
print " }"
print " }," print " },"
if (cpus[n] in cpu_opts) { # arch
print " cpu_opttab_" cpu_cnames[cpus[n]] "," print " TARGET_ARCH_" arch_cnames[feats[1]]
} else print " NULL,"
print " &arm_" cpu_cost[cpus[n]] "_tune"
print " }," print " },"
} }
print " {NULL, TARGET_CPU_arm_none, 0, NULL, BASE_ARCH_0," \ print " {{NULL, NULL, {isa_nobit}}, TARGET_ARCH_arm_none}"
" {isa_nobit}, NULL, NULL}" print "};"
print "};\n"
print "static const cpu_tune all_tunes[] ="
print "{"
for (n = 1; n <= ncpus; n++) {
print " { /* " cpus[n] ". */"
# scheduler
if (cpus[n] in cpu_tune_for) {
if (! (cpu_tune_for[cpus[n]] in cpu_cnames)) {
fatal("unknown \"tune for\" target " cpu_tune_for[cpus[n]] \
" for CPU " cpus[n])
}
print " TARGET_CPU_" cpu_cnames[cpu_tune_for[cpus[n]]] ","
} else {
print " TARGET_CPU_" cpu_cnames[cpus[n]] ","
}
# tune_flags
if (cpus[n] in cpu_tune_flags) {
print " (" cpu_tune_flags[cpus[n]] "),"
} else print " 0,"
# tune
print " &arm_" cpu_cost[cpus[n]] "_tune"
print " },"
}
print " {TARGET_CPU_arm_none, 0, NULL}"
print "};"
narchs = split (arch_list, archs) narchs = split (arch_list, archs)
for (n = 1; n <= narchs; n++) { for (n = 1; n <= narchs; n++) {
if (archs[n] in arch_opts) { if (archs[n] in arch_opts) {
print "static const struct cpu_option arch_opttab_" \ print "static const struct cpu_arch_extension arch_opttab_" \
arch_cnames[archs[n]] "[] = {" arch_cnames[archs[n]] "[] = {"
nopts = split (arch_opts[archs[n]], opts) nopts = split (arch_opts[archs[n]], opts)
for (opt = 1; opt <= nopts; opt++) { for (opt = 1; opt <= nopts; opt++) {
...@@ -205,7 +233,7 @@ function gen_data () { ...@@ -205,7 +233,7 @@ function gen_data () {
} }
} }
print "static const struct processors all_architectures[] =" print "static const struct arch_option all_architectures[] ="
print "{" print "{"
for (n = 1; n <= narchs; n++) { for (n = 1; n <= narchs; n++) {
...@@ -214,26 +242,27 @@ function gen_data () { ...@@ -214,26 +242,27 @@ function gen_data () {
fatal("unknown \"tune for\" target " arch_tune_for[archs[n]] \ fatal("unknown \"tune for\" target " arch_tune_for[archs[n]] \
" for architecture " archs[n]) " for architecture " archs[n])
} }
print " \"" archs[n] \ # common.name
"\", TARGET_CPU_" cpu_cnames[arch_tune_for[archs[n]]] "," print " \"" archs[n] "\","
if (archs[n] in arch_tune_flags) { # common.extensions
print " (" arch_tune_flags[archs[n]] ")," if (archs[n] in arch_opts) {
} else print " 0," print " arch_opttab_" arch_cnames[archs[n]] ","
print " \"" arch_base[archs[n]] "\", BASE_ARCH_" \ } else print " NULL,"
arch_base[archs[n]] "," # common.isa_bits
print " {" print " {"
print " " arch_isa[archs[n]] "," print " " arch_isa[archs[n]] ","
print " isa_nobit" print " isa_nobit"
print " }," print " },"
if (archs[n] in arch_opts) { # arch, base_arch
print " arch_opttab_" arch_cnames[archs[n]] "," print " \"" arch_base[archs[n]] "\", BASE_ARCH_" \
} else print " NULL," arch_base[archs[n]] ","
print " NULL" # tune_id
print " TARGET_CPU_" cpu_cnames[arch_tune_for[archs[n]]] ","
print " }," print " },"
} }
print " {NULL, TARGET_CPU_arm_none, 0, NULL, BASE_ARCH_0," \ print " {{NULL, NULL, {isa_nobit}},"
" {isa_nobit}, NULL, NULL}" print " NULL, BASE_ARCH_0, TARGET_CPU_arm_none}"
print "};\n" print "};\n"
print "const struct arm_fpu_desc all_fpus[] =" print "const struct arm_fpu_desc all_fpus[] ="
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment