yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RISC-V: Fix requirement handling on Zhinx+{D,Q}

Browse Source 
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.
This commit is contained in:
Tsukasa OI 2022-06-24 11:59:04 +09:00 committed by Nelson Chu
parent 9b5ebf652b
commit 37cf60c6a6
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bfd/elfxx-riscv.c
View File

@ -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:

2
gas/testsuite/gas/riscv/fp-zhinx-insns.d
View File

@ -1,4 +1,4 @@
#as: -march=rv64ima_zhinx
#as: -march=rv64ima_zqinx_zhinx
#source: fp-zhinx-insns.s
#objdump: -dr