From da05b70e56866fd39288f4ff531ddfa6cb988514 Mon Sep 17 00:00:00 2001 From: jiawei Date: Wed, 17 Nov 2021 20:10:06 +0800 Subject: [PATCH] RISC-V: Add mininal support for z[fdq]inx Minimal support for zfinx, zdinx, zqinx. Like f/d/q, the zqinx imply zdinx and zdinx imply zfinx, where zfinx are not compatible with f/d/q. bfd/ChangeLog: * elfxx-riscv.c (riscv_implicit_subsets): Added implicit rules for z*inx extensions. (riscv_supported_std_z_ext): Added entries for z*inx. (riscv_parse_check_conflicts): Added conflict check for z*inx. Reviewed-by: Palmer Dabbelt --- bfd/elfxx-riscv.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 78b1517bd8a..d2ffaa941e5 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1100,6 +1100,8 @@ static struct riscv_implicit_subset riscv_implicit_subsets[] = {"zvl64b", "zvl32b", check_implicit_always}, {"d", "f", check_implicit_always}, {"f", "zicsr", check_implicit_always}, + {"zqinx", "zdinx", check_implicit_always}, + {"zdinx", "zfinx", check_implicit_always}, {"zk", "zkn", check_implicit_always}, {"zk", "zkr", check_implicit_always}, {"zk", "zkt", check_implicit_always}, @@ -1182,6 +1184,9 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0, 0 }, {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0, 0 }, {"zihintpause", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zfinx", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zdinx", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zqinx", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zbb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zba", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zbc", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, @@ -1897,6 +1902,13 @@ riscv_parse_check_conflicts (riscv_parse_subset_t *rps) (_("rv32e does not support the `f' extension")); no_conflict = false; } + if (riscv_lookup_subset (rps->subset_list, "zfinx", &subset) + && riscv_lookup_subset (rps->subset_list, "f", &subset)) + { + rps->error_handler + (_("`zfinx' is conflict with the `f/d/q' extension")); + no_conflict = false; + } bool support_zve = false; bool support_zvl = false; -- 2.30.2