From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 57F4C3858D1E for ; Mon, 3 Jul 2023 10:10:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 57F4C3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b69923a715so64455201fa.0 for ; Mon, 03 Jul 2023 03:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1688379050; x=1690971050; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IMBUxaunk5UaRQmTfY5+TiOjTjpDJFS7FIa3yJidJrQ=; b=nrPQPArPPeqPNBn4dstNZ3wQu4AXF5ioRFsxoqaxxYlGulehSdTYg4qA6cAhUJFh04 tMtmKHOvKvZ72z121LUwyP5CDKf25QmuzK1fNJUntXN/h9n5tCQsj50ZxfSlN0VrKFVr fniYSJksL56hiNg9USY3S9RNjAxq6CF0IYtPvIekrJwvAQSAqa+Y64i+OILtBrZGiFgR m6dS3/2zvbRuXCfJWGku4mf/+G64Qjuec7Wk7jGFj7rF99ETMxGZ8odzEVyX1FVIYwAQ ybuRZK7WRfMYzQ/B3t7Do2gRgjCh6R6RBFBoWYLk/sYkpXOD9Dh1NzGE5G83GL5CTbLc su1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688379050; x=1690971050; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IMBUxaunk5UaRQmTfY5+TiOjTjpDJFS7FIa3yJidJrQ=; b=JFt0X6J25oyebBdKVA19CzDQbL5xR2hUnGBRBDLYtsvfvw31OzNQl4c1TiP07miErQ j6+yEnbpEtPxxJVq9K9YOk/9NThbGd6w66C9Nfc51hNcpfo7neFVA/M/il/5RAiIjBG8 nZ+K7wOIW3KQ6yBNJXGhdRC8yiz+EASVTFChu+ax6AyiAkvFo3E+1vXhYX2lUfBtoeFj VUWsv9SFOR6k2eH4LQcHfzMMPfywI9zcOoZ6jj7tl4S2p0ZklbFRRnpYf26OoFemILb4 L3hYfY4TdUtgNPuQPTvMxaf3ERBLXN5qHsuTnFDSAHCDaS7RgH7SPTSeEAFcjKVzePe7 cNGg== X-Gm-Message-State: ABy/qLaBiPlleG3JE3GmBGWpji06Dhfr0rkbpT8sNgS+RVhZ087ysxy5 HdSchYjKOSZCtGuLZgXyHztDFk/Sx8nMIYHGiZM= X-Google-Smtp-Source: APBJJlFGGRkwAYeG24worRLe5Zk35nM82tl6s5aW5skaN9uB7Fl3hss+L3dgNi3n7to+Zuu0u70j9w== X-Received: by 2002:a2e:9b4e:0:b0:2b6:dbf2:11fd with SMTP id o14-20020a2e9b4e000000b002b6dbf211fdmr4113410ljj.24.1688379049726; Mon, 03 Jul 2023 03:10:49 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id i21-20020a05640200d500b0051bfc7763c2sm10357272edu.25.2023.07.03.03.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 03:10:49 -0700 (PDT) From: Christoph Muellner To: binutils@sourceware.org, Nathan Huckleberry , nhuck@pmull.org, Jeff Law , Nelson Chu , Andrew Waterman , Palmer Dabbelt , Jim Wilson , Philipp Tomsich Cc: =?UTF-8?q?Christoph=20M=C3=BCllner?= Subject: [PATCH] RISC-V: Zvkh[a,b]: Remove individual instruction class Date: Mon, 3 Jul 2023 12:10:47 +0200 Message-ID: <20230703101047.2589341-1-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_MANYTO,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Christoph Müllner Currently we have three instruction classes defined for Zvkh[a,b]: - INSN_CLASS_ZVKNHA - INSN_CLASS_ZVKNHB - INSN_CLASS_ZVKNHA_OR_ZVKNHB The encodings of all instructions in Zvknh[a,b] are identical. Therefore, we don't need the individual instruction classes and can remove them. This patch also adds the missing support of the combined instruction class in riscv_multi_subset_supports_ext(). Fixes: 62edb233ef5 ("RISC-V: Add support for the Zvknh[a,b] ISA extensions") Reported-By: Nelson Chu Signed-off-by: Christoph Müllner --- bfd/elfxx-riscv.c | 10 ++-------- include/opcode/riscv.h | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index d6c8e046e3e..bdfc0ef01f4 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -2479,10 +2479,6 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zvkg"); case INSN_CLASS_ZVKNED: return riscv_subset_supports (rps, "zvkned"); - case INSN_CLASS_ZVKNHA: - return riscv_subset_supports (rps, "zvknha"); - case INSN_CLASS_ZVKNHB: - return riscv_subset_supports (rps, "zvknhb"); case INSN_CLASS_ZVKNHA_OR_ZVKNHB: return (riscv_subset_supports (rps, "zvknha") || riscv_subset_supports (rps, "zvknhb")); @@ -2686,10 +2682,8 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return _("zvkg"); case INSN_CLASS_ZVKNED: return _("zvkned"); - case INSN_CLASS_ZVKNHA: - return _("zvknha"); - case INSN_CLASS_ZVKNHB: - return _("zvknhb"); + case INSN_CLASS_ZVKNHA_OR_ZVKNHB: + return _("zvknha' or `zvknhb"); case INSN_CLASS_ZVKSED: return _("zvksed"); case INSN_CLASS_ZVKSH: diff --git a/include/opcode/riscv.h b/include/opcode/riscv.h index d859f44fc92..739d6dafae9 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -418,8 +418,6 @@ enum riscv_insn_class INSN_CLASS_ZVBC, INSN_CLASS_ZVKG, INSN_CLASS_ZVKNED, - INSN_CLASS_ZVKNHA, - INSN_CLASS_ZVKNHB, INSN_CLASS_ZVKNHA_OR_ZVKNHB, INSN_CLASS_ZVKSED, INSN_CLASS_ZVKSH, -- 2.41.0