From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F9AFC5AD7B for ; Sun, 9 Aug 2026 22:42:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtC85-00016G-4e; Sun, 09 Aug 2026 18:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtC82-00012h-Gk for qemu-riscv@nongnu.org; Sun, 09 Aug 2026 18:36:26 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wtC80-0007SI-Iw for qemu-riscv@nongnu.org; Sun, 09 Aug 2026 18:36:26 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-8453427d3f4so1185951b3a.3 for ; Sun, 09 Aug 2026 15:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1786314983; x=1786919783; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Wel1hASlWCOzbBEuzpslBrUlE+P7EagjaJSpRxfpogk=; b=aX3c8SjX2fbQsEX5ylTp2O30P+qyAB9mGQJ42MIGMlrsUtl4fRLfo+DJpSpxBgD/8r 3j5DQt/vvWOabMkrRQGrFDN4N0XlNV4iBfrvPBgsSiQofl+FsR1S3LYbBKDyD45C2CrI pFXo5krM8I1N814rI2uCTpA1/++7K0g0QS5ZWbsOXUbCaBGCAVbQ9mQZgeq0Xm0dPhVy tAjzJPlGkOyMDx13pFU1snvfpaGr5pWevRcgvo5chCQfm7c40fRy5DSRePCQRZerg1bc /z/r+E+6gaLDUpYDiZmQzTRzRCf1X2ybq3ki5B2SK+fBSbuwjPfpDSYZN3o4OzfOrhhl EwAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786314983; x=1786919783; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Wel1hASlWCOzbBEuzpslBrUlE+P7EagjaJSpRxfpogk=; b=Fa+yFT+fk+lMw7VptCCjBJXQ83juHp4wVOiUWPcNfwyHiWXN48OawnXQNZunRwcR23 5UcBVQ8DNe6CpzJ+Lrbg85YUYDHeZXTF8wxxkUV17X0o7lz6mlEfZDYsicUpNa8rLaSZ EiGa5e8Ck/jPLkVAoA8dQ6Wtloa9uhOCpn5Dafr9+Tsf0jkloZhoKrG5H+QKTMBQO9F3 oyl3xpOjFBIGIch5xUdX39jsYsFkjGTR4YRvAOES3IXdneGKuo4kiF3BCSkhWY6UnYwz 5lHIkwWm67DeO3pDy+cfA58f7I6cpO1V8BEqcy6OJ4MQ917QziBfikPzJ1YYJBxc0mEd DeZQ== X-Gm-Message-State: AOJu0Ywhgq1/0SPy7kqFTMGRht0TjdU+a1/SJWtyM4RuH+VFdQ7CvRdK A/1Cqsv5l4KAfCr2Z++NcCRA8VRr5EHXX/yeMTIW+yHodX5NiZUQ0KEnXuVsedwsuXo= X-Gm-Gg: AR+sD11tEFA/FoSbFmFc+Evw6KE0qSViOtQYQeilHeJVIvi2dyXUcNRwjj5zHMkj/dg AOT6xPgN75iJCUGX7fG2cFfb5nZEO5wJlRdkcdyX7ZDrOTPpx9Njy6P6uusgKdtZSbYneZNUpWR dxhwi/dVBvkNCCEgkIuUJA+/BgtsRWhRWaylENLPE80tD0D89LhCxrphY2IKYWLbUISpMHI8oal lOyNThVYxt+herZUsj2stW5LH4pEdPd4j8OtJ/xbF8i75AorHYD7gHG6Bs+m5JL60EBRGqERjnc yf3wwjYhC62ly2gnGNzrcdwFaLHleUQ6GctL+x6wqqhFt9MiulriMlQKOJnIvkWh9osqerQLSEG g1X5WOWLlXFwiZpbq7OhLFdciK8MtEIuKdzqbK8c7iF+ok9cyRlWJVQTGI2MUpf33UAFMRq/OZJ iPzkOm3aqx7b8GAHnvydtjgDS5TJ9VSoTeFBUnILjbVV1ele8uICjyj+atAP3jiCdTJqB2SboQ/ Wn4J4yKWMAyXM7PJU9R X-Received: by 2002:a05:6a00:4394:b0:837:f79d:909 with SMTP id d2e1a72fcca58-84f2e0cc739mr45247502b3a.39.1786314983084; Sun, 09 Aug 2026 15:36:23 -0700 (PDT) Received: from stoup.. (174-21-93-59.tukw.qwest.net. [174.21.93.59]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbe8f19ace6sm2998102a12.2.2026.08.09.15.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 15:36:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org Subject: [PATCH 29/56] disas/riscv: Handle aliases of csrrwi during decode Date: Sun, 9 Aug 2026 15:35:18 -0700 Message-ID: <20260809223545.730664-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260809223545.730664-1-richard.henderson@linaro.org> References: <20260809223545.730664-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Signed-off-by: Richard Henderson --- disas/riscv.h | 2 -- disas/riscv.c | 28 ++++++++-------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/disas/riscv.h b/disas/riscv.h index d8c5acd969..3bbcbf10fb 100644 --- a/disas/riscv.h +++ b/disas/riscv.h @@ -84,8 +84,6 @@ typedef enum { rvc_imm_eq_zero, rvc_imm_eq_n1, rvc_imm_eq_p1, - rvc_csr_eq_0x001, - rvc_csr_eq_0x002, } rvc_constraint; typedef enum { diff --git a/disas/riscv.c b/disas/riscv.c index 9ec79baf4d..d3cbfb86ac 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -1063,8 +1063,6 @@ static const rvc_constraint rvcc_ret[] = { rvc_rd_eq_x0, rvc_rs1_eq_ra, rvc_end }; static const rvc_constraint rvcc_jr[] = { rvc_rd_eq_x0, rvc_imm_eq_zero, rvc_end }; -static const rvc_constraint rvcc_fsrmi[] = { rvc_csr_eq_0x002, rvc_end }; -static const rvc_constraint rvcc_fsflagsi[] = { rvc_csr_eq_0x001, rvc_end }; /* pseudo-instruction metadata */ @@ -1145,12 +1143,6 @@ static const rv_comp_data rvcp_subw[] = { { rv_op_illegal, NULL } }; -static const rv_comp_data rvcp_csrrwi[] = { - { rv_op_fsrmi, rvcc_fsrmi }, - { rv_op_fsflagsi, rvcc_fsflagsi }, - { rv_op_illegal, NULL } -}; - static const rv_comp_data rvcp_fsgnj_s[] = { { rv_op_fmv_s, rvcc_fmv_s }, { rv_op_illegal, NULL } @@ -1722,7 +1714,7 @@ static const rv_opcode_data rvi_opcode_data[] = { { "csrrw", rv_codec_i_csr, rv_fmt_rd_csr_rs1 }, { "csrrs", rv_codec_i_csr, rv_fmt_rd_csr_rs1 }, { "csrrc", rv_codec_i_csr, rv_fmt_rd_csr_rs1 }, - { "csrrwi", rv_codec_i_csr, rv_fmt_rd_csr_zimm, rvcp_csrrwi }, + { "csrrwi", rv_codec_i_csr, rv_fmt_rd_csr_zimm }, { "csrrsi", rv_codec_i_csr, rv_fmt_rd_csr_zimm }, { "csrrci", rv_codec_i_csr, rv_fmt_rd_csr_zimm }, { "flw", rv_codec_i, rv_fmt_frd_offset_rs1 }, @@ -4469,7 +4461,13 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa) } } break; - case 5: op = rv_op_csrrwi; break; + case 5: + switch (operand_csr12(inst)) { + case 1: op = rv_op_fsflagsi; break; + case 2: op = rv_op_fsrmi; break; + default: op = rv_op_csrrwi; break; + } + break; case 6: op = rv_op_csrrsi; break; case 7: op = rv_op_csrrci; break; } @@ -4991,16 +4989,6 @@ static bool check_constraints(rv_decode *dec, const rvc_constraint *c) return false; } break; - case rvc_csr_eq_0x001: - if (!(imm == 0x001)) { - return false; - } - break; - case rvc_csr_eq_0x002: - if (!(imm == 0x002)) { - return false; - } - break; default: break; } c++; -- 2.43.0