darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

aarch64: allow adding/removing just feature flags via .arch_extension

Browse source 
Rather than requiring to always also set/change the base architecture,
allow just en-/disabling of architecture extensions, matching what ARM
has.
This commit is contained in:
Jan Beulich 2014-11-18 14:08:28 +01:00 committed by Jan Beulich
parent 0a9ce86daf
commit ae527cd876
7 changed files with 111 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gas/ChangeLog
View file

@ -1,3 +1,12 @@
2014-11-18 Jan Beulich <jbeulich@suse.com>
* config/tc-aarch64.c (s_aarch64_arch_extension): New.
(md_pseudo_table): Add arch_extension.
(aarch64_parse_features): New parameter "ext_only". Handle it.
(aarch64_parse_cpu, aarch64_parse_arch, s_aarch64_cpu,
s_aarch64_arch): Pass FALSE as new third argument of
aarch64_parse_features().
2014-11-17 Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* config/tc-aarch64.c (aarch64_cpus): Add "xgene2".

51
gas/config/tc-aarch64.c
View file

@ -1917,6 +1917,7 @@ s_tlsdesccall (int ignored ATTRIBUTE_UNUSED)
static void s_aarch64_arch (int);
static void s_aarch64_cpu (int);
static void s_aarch64_arch_extension (int);
/* This table describes all the machine specific pseudo-ops the assembler
has to support. The fields are:
@ -1934,6 +1935,7 @@ const pseudo_typeS md_pseudo_table[] = {
{"pool", s_ltorg, 0},
{"cpu", s_aarch64_cpu, 0},
{"arch", s_aarch64_arch, 0},
{"arch_extension", s_aarch64_arch_extension, 0},
{"inst", s_aarch64_inst, 0},
#ifdef OBJ_ELF
{"tlsdesccall", s_tlsdesccall, 0},
@ -7238,7 +7240,8 @@ struct aarch64_long_option_table
};
static int
aarch64_parse_features (char *str, const aarch64_feature_set **opt_p)
aarch64_parse_features (char *str, const aarch64_feature_set **opt_p,
bfd_boolean ext_only)
{
/* We insist on extensions being added before being removed. We achieve
this by using the ADDING_VALUE variable to indicate whether we are
@ -7254,17 +7257,19 @@ aarch64_parse_features (char *str, const aarch64_feature_set **opt_p)
while (str != NULL && *str != 0)
{
const struct aarch64_option_cpu_value_table *opt;
char *ext;
char *ext = NULL;
int optlen;
if (*str != '+')
if (!ext_only)
{
as_bad (_("invalid architectural extension"));
return 0;
}
if (*str != '+')
{
as_bad (_("invalid architectural extension"));
return 0;
}
str++;
ext = strchr (str, '+');
ext = strchr (++str, '+');
}
if (ext != NULL)
optlen = ext - str;
@ -7344,7 +7349,7 @@ aarch64_parse_cpu (char *str)
{
mcpu_cpu_opt = &opt->value;
if (ext != NULL)
return aarch64_parse_features (ext, &mcpu_cpu_opt);
return aarch64_parse_features (ext, &mcpu_cpu_opt, FALSE);
return 1;
}
@ -7376,7 +7381,7 @@ aarch64_parse_arch (char *str)
{
march_cpu_opt = &opt->value;
if (ext != NULL)
return aarch64_parse_features (ext, &march_cpu_opt);
return aarch64_parse_features (ext, &march_cpu_opt, FALSE);
return 1;
}
@ -7559,7 +7564,7 @@ s_aarch64_cpu (int ignored ATTRIBUTE_UNUSED)
{
mcpu_cpu_opt = &opt->value;
if (ext != NULL)
if (!aarch64_parse_features (ext, &mcpu_cpu_opt))
if (!aarch64_parse_features (ext, &mcpu_cpu_opt, FALSE))
return;
cpu_variant = *mcpu_cpu_opt;
@ -7605,7 +7610,7 @@ s_aarch64_arch (int ignored ATTRIBUTE_UNUSED)
{
mcpu_cpu_opt = &opt->value;
if (ext != NULL)
if (!aarch64_parse_features (ext, &mcpu_cpu_opt))
if (!aarch64_parse_features (ext, &mcpu_cpu_opt, FALSE))
return;
cpu_variant = *mcpu_cpu_opt;
@ -7620,6 +7625,28 @@ s_aarch64_arch (int ignored ATTRIBUTE_UNUSED)
ignore_rest_of_line ();
}
/* Parse a .arch_extension directive. */
static void
s_aarch64_arch_extension (int ignored ATTRIBUTE_UNUSED)
{
char saved_char;
char *ext = input_line_pointer;;
while (*input_line_pointer && !ISSPACE (*input_line_pointer))
input_line_pointer++;
saved_char = *input_line_pointer;
*input_line_pointer = 0;
if (!aarch64_parse_features (ext, &mcpu_cpu_opt, TRUE))
return;
cpu_variant = *mcpu_cpu_opt;
*input_line_pointer = saved_char;
demand_empty_rest_of_line ();
}
/* Copy symbol information. */
void

7
gas/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2014-11-18 Jan Beulich <jbeulich@suse.com>
* gas/aarch64/crc32-directive.d: New.
* gas/aarch64/crypto-directive.d: New.
* gas/aarch64/crc32.s: Adjust to allow for directive use.
* gas/aarch64/crypto.s: Likewise.
2014-11-17 Ilya Tocar <ilya.tocar@intel.com>
* gas/i386/i386.exp: Run new tests.

17
gas/testsuite/gas/aarch64/crc32-directive.d Normal file
View file

@ -0,0 +1,17 @@
#objdump: -dr
#as: --defsym DIRECTIVE=1
#source: crc32.s
.*: file format .*
Disassembly of section \.text:
0000000000000000 <.*>:
0: 1acf40e3 crc32b w3, w7, w15
4: 1ac345e7 crc32h w7, w15, w3
8: 1ac7486f crc32w w15, w3, w7
c: 9acf4ce3 crc32x w3, w7, x15
10: 1acf50e3 crc32cb w3, w7, w15
14: 1ac355e7 crc32ch w7, w15, w3
18: 1ac7586f crc32cw w15, w3, w7
1c: 9acf5ce3 crc32cx w3, w7, x15

6
gas/testsuite/gas/aarch64/crc32.s
View file

@ -21,6 +21,10 @@
.text
.ifdef DIRECTIVE
.arch_extension crc
.endif
crc32b w3, w7, w15
crc32h w7, w15, w3
crc32w w15, w3, w7
@ -29,3 +33,5 @@
crc32ch w7, w15, w3
crc32cw w15, w3, w7
crc32cx w3, w7, x15
.arch_extension nocrc

27
gas/testsuite/gas/aarch64/crypto-directive.d Normal file
View file

@ -0,0 +1,27 @@
#objdump: -dr
#as: --defsym DIRECTIVE=1
#source: crypto.s
.*: file format .*
Disassembly of section \.text:
0000000000000000 <.*>:
0: 4e284be7 aese v7.16b, v31.16b
4: 4e285be7 aesd v7.16b, v31.16b
8: 4e286be7 aesmc v7.16b, v31.16b
c: 4e287be7 aesimc v7.16b, v31.16b
10: 5e280be7 sha1h s7, s31
14: 5e281be7 sha1su1 v7.4s, v31.4s
18: 5e282be7 sha256su0 v7.4s, v31.4s
1c: 5e1f01e7 sha1c q7, s15, v31.4s
20: 5e1f11e7 sha1p q7, s15, v31.4s
24: 5e1f21e7 sha1m q7, s15, v31.4s
28: 5e1f31e7 sha1su0 v7.4s, v15.4s, v31.4s
2c: 5e1f41e7 sha256h q7, q15, v31.4s
30: 5e1f51e7 sha256h2 q7, q15, v31.4s
34: 5e1f61e7 sha256su1 v7.4s, v15.4s, v31.4s
38: 0e3fe1e7 pmull v7.8h, v15.8b, v31.8b
3c: 0effe1e7 pmull v7.1q, v15.1d, v31.1d
40: 4e3fe1e7 pmull2 v7.8h, v15.16b, v31.16b
44: 4effe1e7 pmull2 v7.1q, v15.2d, v31.2d

6
gas/testsuite/gas/aarch64/crypto.s
View file

@ -20,6 +20,10 @@
.text
.ifdef DIRECTIVE
.arch_extension crypto
.endif
aese v7.16b, v31.16b
aesd v7.16b, v31.16b
aesmc v7.16b, v31.16b
@ -42,3 +46,5 @@
pmull v7.1q, v15.1d, v31.1d
pmull2 v7.8h, v15.16b, v31.16b
pmull2 v7.1q, v15.2d, v31.2d
.arch_extension nocrypto