diff options
| author | Mihail Ionescu <mihail.ionescu@arm.com> | 2019-10-31 11:22:58 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2019-10-31 11:22:58 +0000 |
| commit | e20f9590e78473b3b944d606c28a519094eedea0 (patch) | |
| tree | 8fea0061965fd8f3fd6f4f547e9a5f66a32e8606 /gas/config/tc-arm.c | |
| parent | c7e49b689b01e54020a945214e75d4d3f8b6a226 (diff) | |
| download | gdb-e20f9590e78473b3b944d606c28a519094eedea0.zip gdb-e20f9590e78473b3b944d606c28a519094eedea0.tar.gz gdb-e20f9590e78473b3b944d606c28a519094eedea0.tar.bz2 | |
Add support for context sensitive '.arch_extension' to the ARM assembler.
If the extension is not found in the context sensitive table, the legacy
tables are still checked as a fallback. This is particularly useful for
Armv8.1-M as it enables the use of '.arch_extension' with the 'mve' and
'mve.fp' extensions which are not part of the legacy table.
* config/tc-arm.c (selected_ctx_ext_table) New static variable.
(arm_parse_arch): Set context sensitive extension table based on the
chosen base architecture.
(s_arm_arch_extension): Change to lookup extensions in the new context
sensitive tables.
* gas/testsuite/gas/arm/mve-ext.s: New.
* gas/testsuite/gas/arm/mve-ext.d: New.
* gas/testsuite/gas/arm/mvefp-ext.s: New.
* gas/testsuite/gas/arm/mvefp-ext.d: New.
Diffstat (limited to 'gas/config/tc-arm.c')
| -rw-r--r-- | gas/config/tc-arm.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 1f46230..0a3e77a 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -355,6 +355,7 @@ static arm_feature_set selected_fpu = FPU_NONE; /* Feature bits selected by the last .object_arch directive. */ static arm_feature_set selected_object_arch = ARM_ARCH_NONE; /* Must be long enough to hold any of the names in arm_cpus. */ +static const struct arm_ext_table * selected_ctx_ext_table = NULL; static char selected_cpu_name[20]; extern FLONUM_TYPE generic_floating_point_number; @@ -31502,6 +31503,7 @@ arm_parse_arch (const char *str) march_ext_opt = XNEW (arm_feature_set); *march_ext_opt = arm_arch_none; march_fpu_opt = &opt->default_fpu; + selected_ctx_ext_table = opt->ext_table; strcpy (selected_cpu_name, opt->name); if (ext != NULL) @@ -32361,6 +32363,35 @@ s_arm_arch_extension (int ignored ATTRIBUTE_UNUSED) name += 2; } + /* Check the context specific extension table */ + if (selected_ctx_ext_table) + { + const struct arm_ext_table * ext_opt; + for (ext_opt = selected_ctx_ext_table; ext_opt->name != NULL; ext_opt++) + { + if (streq (ext_opt->name, name)) + { + if (adding_value) + { + if (ARM_FEATURE_ZERO (ext_opt->merge)) + /* TODO: Option not supported. When we remove the + legacy table this case should error out. */ + continue; + ARM_MERGE_FEATURE_SETS (selected_ext, selected_ext, + ext_opt->merge); + } + else + ARM_CLEAR_FEATURE (selected_ext, selected_ext, ext_opt->clear); + + ARM_MERGE_FEATURE_SETS (selected_cpu, selected_arch, selected_ext); + ARM_MERGE_FEATURE_SETS (cpu_variant, selected_cpu, selected_fpu); + *input_line_pointer = saved_char; + demand_empty_rest_of_line (); + return; + } + } + } + for (opt = arm_extensions; opt->name != NULL; opt++) if (streq (opt->name, name)) { |