diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-riscv.c | 27 |
2 files changed, 26 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 85c80f5..f22727c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2019-09-17 Maxim Blinov <maxim.blinov@embecosm.com> + + * config/tc-riscv.c (riscv_multi_subset_supports): Handle + insn_class enum rather than subset char string. + (riscv_ip): Update call to riscv_multi_subset_supports. + 2019-09-16 Phil Blundell <pb@pbcl.net> * Makefile.in, configure, doc/Makefile.in: Regenerated. diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 12047d7..e505051 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -121,15 +121,28 @@ riscv_subset_supports (const char *feature) } static bfd_boolean -riscv_multi_subset_supports (const char *features[]) +riscv_multi_subset_supports (enum riscv_insn_class insn_class) { - unsigned i = 0; - bfd_boolean supported = TRUE; + switch (insn_class) + { + case INSN_CLASS_I: return riscv_subset_supports ("i"); + case INSN_CLASS_C: return riscv_subset_supports ("c"); + case INSN_CLASS_A: return riscv_subset_supports ("a"); + case INSN_CLASS_M: return riscv_subset_supports ("m"); + case INSN_CLASS_F: return riscv_subset_supports ("f"); + case INSN_CLASS_D: return riscv_subset_supports ("d"); + case INSN_CLASS_D_AND_C: + return riscv_subset_supports ("d") && riscv_subset_supports ("c"); + + case INSN_CLASS_F_AND_C: + return riscv_subset_supports ("f") && riscv_subset_supports ("c"); - for (;features[i]; ++i) - supported = supported && riscv_subset_supports (features[i]); + case INSN_CLASS_Q: return riscv_subset_supports ("q"); - return supported; + default: + as_fatal ("Unreachable"); + return FALSE; + } } /* Set which ISA and extensions are available. */ @@ -1427,7 +1440,7 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr, if ((insn->xlen_requirement != 0) && (xlen != insn->xlen_requirement)) continue; - if (!riscv_multi_subset_supports (insn->subset)) + if (!riscv_multi_subset_supports (insn->insn_class)) continue; create_insn (ip, insn); |