diff options
| author | Tsukasa OI <research_trasio@irq.a4lg.com> | 2022-06-24 11:59:04 +0900 |
|---|---|---|
| committer | Nelson Chu <nelson.chu@sifive.com> | 2022-07-07 12:05:56 +0800 |
| commit | 37cf60c6a6d36bbf5cf1523697906c4bdb4eb468 (patch) | |
| tree | d3a3651e6dfa3a6653dd85ef9099ebf428d88c09 /bfd/elfxx-riscv.c | |
| parent | 9b5ebf652b36502ffe79fb196e312bf9ea93f72f (diff) | |
RISC-V: Fix requirement handling on Zhinx+{D,Q}
This commit fixes how instructions are masked on Zhinx+Z{d,q}inx.
fcvt.h.d and fcvt.d.h require ((D&&Zfh)||(Zdinx&&Zhinx)) and
fcvt.h.q and fcvt.q.h require ((Q&&Zfh)||(Zqinx&&Zhinx)).
bfd/ChangeLog:
* elfxx-riscv.c (riscv_multi_subset_supports): Fix feature gate
on INSN_CLASS_{D,Q}_AND_ZFH_INX.
(riscv_multi_subset_supports_ext): Fix feature gate diagnostics
on INSN_CLASS_{D,Q}_AND_ZFH_INX.
gas/ChangeLog:
* testsuite/gas/riscv/fp-zhinx-insns.d: Add Zqinx to -march
for proper testing.
Diffstat (limited to 'bfd/elfxx-riscv.c')
| -rw-r--r-- | bfd/elfxx-riscv.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index c846d6baaa..7d0825404d 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -2340,15 +2340,17 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zfh"); case INSN_CLASS_ZFH_OR_ZHINX: return riscv_subset_supports (rps, "zfh") - || riscv_subset_supports (rps, "zhinx"); + || riscv_subset_supports (rps, "zhinx"); case INSN_CLASS_D_AND_ZFH_INX: return (riscv_subset_supports (rps, "d") && riscv_subset_supports (rps, "zfh")) - || riscv_subset_supports (rps, "zhinx"); + || (riscv_subset_supports (rps, "zdinx") + && riscv_subset_supports (rps, "zhinx")); case INSN_CLASS_Q_AND_ZFH_INX: return (riscv_subset_supports (rps, "q") && riscv_subset_supports (rps, "zfh")) - || riscv_subset_supports (rps, "zhinx"); + || (riscv_subset_supports (rps, "zqinx") + && riscv_subset_supports (rps, "zhinx")); case INSN_CLASS_ZBA: return riscv_subset_supports (rps, "zba"); case INSN_CLASS_ZBB: @@ -2495,9 +2497,27 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, case INSN_CLASS_ZFH_OR_ZHINX: return _("zfh' or 'zhinx"); case INSN_CLASS_D_AND_ZFH_INX: - return _("('d' and 'zfh') or 'zhinx"); + if (riscv_subset_supports (rps, "zfh")) + return "d"; + else if (riscv_subset_supports (rps, "d")) + return "zfh"; + else if (riscv_subset_supports (rps, "zhinx")) + return "zdinx"; + else if (riscv_subset_supports (rps, "zdinx")) + return "zhinx"; + else + return _("zfh' and `d', or `zhinx' and `zdinx"); case INSN_CLASS_Q_AND_ZFH_INX: - return _("('q' and 'zfh') or 'zhinx"); + if (riscv_subset_supports (rps, "zfh")) + return "q"; + else if (riscv_subset_supports (rps, "q")) + return "zfh"; + else if (riscv_subset_supports (rps, "zhinx")) + return "zqinx"; + else if (riscv_subset_supports (rps, "zqinx")) + return "zhinx"; + else + return _("zfh' and `q', or `zhinx' and `zqinx"); case INSN_CLASS_H: return _("h"); default: |