diff options
Diffstat (limited to 'gas')
29 files changed, 159 insertions, 141 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index a7bcfee..ba4aa15 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,4 +1,48 @@ -2018-12-03 Egeyar Bagcioglu <egeyar.bagcioglu@oracle.com> +2018-12-03 Kito Cheng <kito@andestech.com> + + * config/tc-riscv.c: Include elfxx-riscv.h. + (struct riscv_subset): Removed. + (riscv_subsets): Change type to riscv_subset_list_t. + (riscv_subset_supports): Removed argument: xlen_required and move + logic into libbfd. + (riscv_multi_subset_supports): Removed argument: xlen_required. + (riscv_clear_subsets): Removed. + (riscv_add_subset): Ditto. + (riscv_set_arch): Extract parsing logic into libbfd. + (riscv_ip): Update argument for riscv_multi_subset_supports and + riscv_subset_supports. Update riscv_subsets due to struct definition + changed. + (riscv_after_parse_args): Update riscv_subsets due to struct + definition changed, update and argument for riscv_subset_supports. + * testsuite/gas/riscv/empty.s: New. + * testsuite/gas/riscv/march-fail-rv32ef.d: Likewise. + * testsuite/gas/riscv/march-fail-rv32ef.l: Likewise. + * testsuite/gas/riscv/march-fail-rv32i.d: Likewise. + * testsuite/gas/riscv/march-fail-rv32i.l: Likewise. + * testsuite/gas/riscv/march-fail-rv32iam.d: Likewise. + * testsuite/gas/riscv/march-fail-rv32iam.l: Likewise. + * testsuite/gas/riscv/march-fail-rv32ic.d: Likewise. + * testsuite/gas/riscv/march-fail-rv32ic.l: Likewise. + * testsuite/gas/riscv/march-fail-rv32icx2p.d: Likewise. + * testsuite/gas/riscv/march-fail-rv32icx2p.l: Likewise. + * testsuite/gas/riscv/march-fail-rv32imc.d: Likewise. + * testsuite/gas/riscv/march-fail-rv32imc.l: Likewise. + * testsuite/gas/riscv/march-fail-rv64I.d: Likewise. + * testsuite/gas/riscv/march-fail-rv64I.l: Likewise. + * testsuite/gas/riscv/march-fail-rv64e.d: Likewise. + * testsuite/gas/riscv/march-fail-rv64e.l: Likewise. + * testsuite/gas/riscv/march-ok-g2.d: Likewise. + * testsuite/gas/riscv/march-ok-g2p0.d: Likewise. + * testsuite/gas/riscv/march-ok-i2p0.d: Likewise. + * testsuite/gas/riscv/march-ok-nse-with-version.: Likewise.d + * testsuite/gas/riscv/march-ok-s-with-version.d: Likewise. + * testsuite/gas/riscv/march-ok-s.d: Likewise. + * testsuite/gas/riscv/march-ok-sx.d: Likewise. + * testsuite/gas/riscv/march-ok-two-nse.d: Likewise. + * testsuite/gas/riscv/march-ok-g2_p1.d: Likewise. + * testsuite/gas/riscv/march-ok-i2p0m2_a2f2.d: Likewise. + +018-12-03 Egeyar Bagcioglu <egeyar.bagcioglu@oracle.com> PR 23193 PR 19721 diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 426343c..92ddf80 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -29,6 +29,7 @@ #include "dwarf2dbg.h" #include "dw2gencfi.h" +#include "bfd/elfxx-riscv.h" #include "elf/riscv.h" #include "opcode/riscv.h" @@ -102,160 +103,41 @@ riscv_set_rve (bfd_boolean rve_value) riscv_opts.rve = rve_value; } -struct riscv_subset -{ - const char *name; - - struct riscv_subset *next; -}; - -static struct riscv_subset *riscv_subsets; +static riscv_subset_list_t riscv_subsets; static bfd_boolean -riscv_subset_supports (unsigned xlen_required, const char *feature) +riscv_subset_supports (const char *feature) { - struct riscv_subset *s; - - if (xlen_required && xlen != xlen_required) - return FALSE; - - for (s = riscv_subsets; s != NULL; s = s->next) - if (strcasecmp (s->name, feature) == 0) - return TRUE; + if (riscv_opts.rvc && (strcasecmp (feature, "c") == 0)) + return TRUE; - return FALSE; + return riscv_lookup_subset (&riscv_subsets, feature) != NULL; } static bfd_boolean -riscv_multi_subset_supports (unsigned xlen_required, const char *features[]) +riscv_multi_subset_supports (const char *features[]) { unsigned i = 0; bfd_boolean supported = TRUE; for (;features[i]; ++i) - supported = supported && riscv_subset_supports (xlen_required, features[i]); + supported = supported && riscv_subset_supports (features[i]); return supported; } -static void -riscv_clear_subsets (void) -{ - while (riscv_subsets != NULL) - { - struct riscv_subset *next = riscv_subsets->next; - free ((void *) riscv_subsets->name); - free (riscv_subsets); - riscv_subsets = next; - } -} - -static void -riscv_add_subset (const char *subset) -{ - struct riscv_subset *s = xmalloc (sizeof *s); - - s->name = xstrdup (subset); - s->next = riscv_subsets; - riscv_subsets = s; -} - /* Set which ISA and extensions are available. */ static void riscv_set_arch (const char *s) { - const char *all_subsets = "imafdqc"; - char *extension = NULL; - const char *p = s; - - riscv_clear_subsets(); + riscv_parse_subset_t rps; + rps.subset_list = &riscv_subsets; + rps.error_handler = as_fatal; + rps.xlen = &xlen; - if (strncmp (p, "rv32", 4) == 0) - { - xlen = 32; - p += 4; - } - else if (strncmp (p, "rv64", 4) == 0) - { - xlen = 64; - p += 4; - } - else - as_fatal ("-march=%s: ISA string must begin with rv32 or rv64", s); - - switch (*p) - { - case 'i': - break; - - case 'e': - p++; - riscv_add_subset ("e"); - riscv_add_subset ("i"); - - if (xlen > 32) - as_fatal ("-march=%s: rv%de is not a valid base ISA", s, xlen); - - break; - - case 'g': - p++; - for ( ; *all_subsets != 'q'; all_subsets++) - { - const char subset[] = {*all_subsets, '\0'}; - riscv_add_subset (subset); - } - break; - - default: - as_fatal ("-march=%s: first ISA subset must be `e', `i' or `g'", s); - } - - while (*p) - { - if (*p == 'x') - { - char *subset = xstrdup (p); - char *q = subset; - - while (*++q != '\0' && *q != '_') - ; - *q = '\0'; - - if (extension) - as_fatal ("-march=%s: only one non-standard extension is supported" - " (found `%s' and `%s')", s, extension, subset); - extension = subset; - riscv_add_subset (subset); - p += strlen (subset); - } - else if (*p == '_') - p++; - else if ((all_subsets = strchr (all_subsets, *p)) != NULL) - { - const char subset[] = {*p, 0}; - riscv_add_subset (subset); - all_subsets++; - p++; - } - else - as_fatal ("-march=%s: unsupported ISA subset `%c'", s, *p); - } - - if (riscv_subset_supports (0, "e") && riscv_subset_supports (0, "f")) - as_fatal ("-march=%s: rv32e does not support the `f' extension", s); - - if (riscv_subset_supports (0, "d") && !riscv_subset_supports (0, "f")) - as_fatal ("-march=%s: `d' extension requires `f' extension", s); - - if (riscv_subset_supports (0, "q") && !riscv_subset_supports (0, "d")) - as_fatal ("-march=%s: `q' extension requires `d' extension", s); - - if (riscv_subset_supports (0, "q") && xlen < 64) - as_fatal ("-march=%s: rv32 does not support the `q' extension", s); - - free (extension); + riscv_release_subset_list (&riscv_subsets); + riscv_parse_subset (&rps, s); } /* Handle of the OPCODE hash table. */ @@ -1491,7 +1373,10 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr, argsStart = s; for ( ; insn && insn->name && strcmp (insn->name, str) == 0; insn++) { - if (!riscv_multi_subset_supports (insn->xlen_requirement, insn->subset)) + if ((insn->xlen_requirement != 0) && (xlen != insn->xlen_requirement)) + continue; + + if (!riscv_multi_subset_supports (insn->subset)) continue; create_insn (ip, insn); @@ -2332,19 +2217,17 @@ riscv_after_parse_args (void) as_bad ("unknown default architecture `%s'", default_arch); } - if (riscv_subsets == NULL) + if (riscv_subsets.head == NULL) riscv_set_arch (xlen == 64 ? "rv64g" : "rv32g"); /* Add the RVC extension, regardless of -march, to support .option rvc. */ riscv_set_rvc (FALSE); - if (riscv_subset_supports (0, "c")) + if (riscv_subset_supports ("c")) riscv_set_rvc (TRUE); - else - riscv_add_subset ("c"); /* Enable RVE if specified by the -march option. */ riscv_set_rve (FALSE); - if (riscv_subset_supports (0, "e")) + if (riscv_subset_supports ("e")) riscv_set_rve (TRUE); /* Infer ABI from ISA if not specified on command line. */ @@ -2357,12 +2240,12 @@ riscv_after_parse_args (void) if (float_abi == FLOAT_ABI_DEFAULT) { - struct riscv_subset *subset; + riscv_subset_t *subset; /* Assume soft-float unless D extension is present. */ float_abi = FLOAT_ABI_SOFT; - for (subset = riscv_subsets; subset != NULL; subset = subset->next) + for (subset = riscv_subsets.head; subset != NULL; subset = subset->next) { if (strcasecmp (subset->name, "D") == 0) float_abi = FLOAT_ABI_DOUBLE; diff --git a/gas/testsuite/gas/riscv/empty.s b/gas/testsuite/gas/riscv/empty.s new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/gas/testsuite/gas/riscv/empty.s @@ -0,0 +1 @@ + diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ef.d b/gas/testsuite/gas/riscv/march-fail-rv32ef.d new file mode 100644 index 0000000..d7b51c3 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32ef.d @@ -0,0 +1,3 @@ +#as: -march=rv32ef +#source: empty.s +#error_output: march-fail-rv32ef.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ef.l b/gas/testsuite/gas/riscv/march-fail-rv32ef.l new file mode 100644 index 0000000..15e56c8 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32ef.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv32ef: rv32e does not support the `f' extension diff --git a/gas/testsuite/gas/riscv/march-fail-rv32i.d b/gas/testsuite/gas/riscv/march-fail-rv32i.d new file mode 100644 index 0000000..1e6e9e0 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32i.d @@ -0,0 +1,3 @@ +#as: -march=rv32I +#source: empty.s +#error_output: march-fail-rv32i.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv32i.l b/gas/testsuite/gas/riscv/march-fail-rv32i.l new file mode 100644 index 0000000..1977aed --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32i.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv32I: first ISA subset must be `e', `i' or `g' diff --git a/gas/testsuite/gas/riscv/march-fail-rv32iam.d b/gas/testsuite/gas/riscv/march-fail-rv32iam.d new file mode 100644 index 0000000..054cf4d --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32iam.d @@ -0,0 +1,3 @@ +#as: -march=rv32iam +#source: empty.s +#error_output: march-fail-rv32iam.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv32iam.l b/gas/testsuite/gas/riscv/march-fail-rv32iam.l new file mode 100644 index 0000000..c7786f8 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32iam.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv32iam: ISA string is not in canonical order. `m' diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ic.d b/gas/testsuite/gas/riscv/march-fail-rv32ic.d new file mode 100644 index 0000000..b419a65 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32ic.d @@ -0,0 +1,3 @@ +#as: -march=rv32iC +#source: empty.s +#error_output: march-fail-rv32ic.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ic.l b/gas/testsuite/gas/riscv/march-fail-rv32ic.l new file mode 100644 index 0000000..d24ea2f --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32ic.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv32iC: unsupported ISA subset `C' diff --git a/gas/testsuite/gas/riscv/march-fail-rv32icx2p.d b/gas/testsuite/gas/riscv/march-fail-rv32icx2p.d new file mode 100644 index 0000000..5198090 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32icx2p.d @@ -0,0 +1,3 @@ +#as: -march=rv32icx2p +#source: empty.s +#error_output: march-fail-rv32icx2p.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv32icx2p.l b/gas/testsuite/gas/riscv/march-fail-rv32icx2p.l new file mode 100644 index 0000000..25627d4 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32icx2p.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv32icx2p: Expect number after `2p'. diff --git a/gas/testsuite/gas/riscv/march-fail-rv32imc.d b/gas/testsuite/gas/riscv/march-fail-rv32imc.d new file mode 100644 index 0000000..1cb4d9e --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32imc.d @@ -0,0 +1,3 @@ +#as: -march=rv32iamfd +#source: empty.s +#error_output: march-fail-rv32imc.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv32imc.l b/gas/testsuite/gas/riscv/march-fail-rv32imc.l new file mode 100644 index 0000000..d922e9d --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv32imc.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv32iamfd: ISA string is not in canonical order. `m' diff --git a/gas/testsuite/gas/riscv/march-fail-rv64I.d b/gas/testsuite/gas/riscv/march-fail-rv64I.d new file mode 100644 index 0000000..e00a6f8 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv64I.d @@ -0,0 +1,3 @@ +#as: -march=rv64I +#source: empty.s +#error_output: march-fail-rv64I.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv64I.l b/gas/testsuite/gas/riscv/march-fail-rv64I.l new file mode 100644 index 0000000..5b46e77 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv64I.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv64I: first ISA subset must be `e', `i' or `g' diff --git a/gas/testsuite/gas/riscv/march-fail-rv64e.d b/gas/testsuite/gas/riscv/march-fail-rv64e.d new file mode 100644 index 0000000..38d73db --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv64e.d @@ -0,0 +1,3 @@ +#as: -march=rv64e +#source: empty.s +#error_output: march-fail-rv64e.l diff --git a/gas/testsuite/gas/riscv/march-fail-rv64e.l b/gas/testsuite/gas/riscv/march-fail-rv64e.l new file mode 100644 index 0000000..85f7554 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-fail-rv64e.l @@ -0,0 +1,2 @@ +Assembler messages: +Fatal error: -march=rv64e: rv64e is not a valid base ISA diff --git a/gas/testsuite/gas/riscv/march-ok-g2.d b/gas/testsuite/gas/riscv/march-ok-g2.d new file mode 100644 index 0000000..38541ad --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-g2.d @@ -0,0 +1,5 @@ +#as: -march=rv32g2 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-g2_p1.d b/gas/testsuite/gas/riscv/march-ok-g2_p1.d new file mode 100644 index 0000000..cd9e127 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-g2_p1.d @@ -0,0 +1,5 @@ +#as: -march=rv32g2_p1 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-g2p0.d b/gas/testsuite/gas/riscv/march-ok-g2p0.d new file mode 100644 index 0000000..b439314 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-g2p0.d @@ -0,0 +1,5 @@ +#as: -march=rv32g2p0 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-i2p0.d b/gas/testsuite/gas/riscv/march-ok-i2p0.d new file mode 100644 index 0000000..eb8309c --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-i2p0.d @@ -0,0 +1,5 @@ +#as: -march=rv32i2p0 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-i2p0m2_a2f2.d b/gas/testsuite/gas/riscv/march-ok-i2p0m2_a2f2.d new file mode 100644 index 0000000..6658417 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-i2p0m2_a2f2.d @@ -0,0 +1,5 @@ +#as: -march=rv32i2p0m2_a2f2 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-nse-with-version.d b/gas/testsuite/gas/riscv/march-ok-nse-with-version.d new file mode 100644 index 0000000..bdca7fb --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-nse-with-version.d @@ -0,0 +1,5 @@ +#as: -march=rv32imafd_xargle2p0 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-s-with-version.d b/gas/testsuite/gas/riscv/march-ok-s-with-version.d new file mode 100644 index 0000000..6296a15 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-s-with-version.d @@ -0,0 +1,5 @@ +#as: -march=rv32isfoo3p4 +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-s.d b/gas/testsuite/gas/riscv/march-ok-s.d new file mode 100644 index 0000000..7daa0a1 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-s.d @@ -0,0 +1,5 @@ +#as: -march=rv32isfoo +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-sx.d b/gas/testsuite/gas/riscv/march-ok-sx.d new file mode 100644 index 0000000..e2172f2 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-sx.d @@ -0,0 +1,5 @@ +#as: -march=rv32isfoo_sxbar +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv diff --git a/gas/testsuite/gas/riscv/march-ok-two-nse.d b/gas/testsuite/gas/riscv/march-ok-two-nse.d new file mode 100644 index 0000000..0fe5037 --- /dev/null +++ b/gas/testsuite/gas/riscv/march-ok-two-nse.d @@ -0,0 +1,5 @@ +#as: -march=rv32imafd_xargle_xbargle +#objdump: -dr +#source: empty.s + +.*: file format elf32-littleriscv |