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 227DFC5AD7B for ; Sun, 9 Aug 2026 22:43:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtC83-000149-Bt; Sun, 09 Aug 2026 18:36:27 -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 1wtC81-00010n-6T for qemu-devel@nongnu.org; Sun, 09 Aug 2026 18:36:25 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wtC7y-0007Rg-SS for qemu-devel@nongnu.org; Sun, 09 Aug 2026 18:36:24 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-cb5b8572b70so1314703a12.2 for ; Sun, 09 Aug 2026 15:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1786314981; x=1786919781; 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=4bPEmz7kH/3j+nOpoForQfn3ij2ZSMJYOoJ99jLXeIQ=; b=NSxVARykI649jSHmaeFglD0sooTXMm9SXnOw1CcLzuno4b27YlamgN9K2woIlCgt44 OPZMEUilA9naM6gcKswR0OfTtnlAC2v2ERn6TPufKgbOAdYIC84varElIFrFxInGBrll FnZV7pNd5tNUtZ37an1JyTbrS6JbYRUKRFtppbEiFA34SnoW1z/qNsAgq4p06R3HAa5E b7x2P17/KDOPy8kJyJKu3iilV6vvmQLLXUJlZez9CIezrS9YvvB4QLw/Ej0bBG4p44G7 bGoXuXVD7L3SnPa9Cy8+SOFdJy5Um2IcOa8pdCQyKQVXpSKf8GrNrnUmMpfnZtpXneLO SSVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786314981; x=1786919781; 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=4bPEmz7kH/3j+nOpoForQfn3ij2ZSMJYOoJ99jLXeIQ=; b=aPeohuFZNcjsIQUOadmpvWtYiStIqKYUrrh0jNpmWmbTNW/iAO8eO/A3iZNO+dl8v/ NZcm2B6V/0FJ5yesEz15ah9dTG2NpzL4CEOFvwTmyY+/OQysHu/efS3NC4TFoonVq9ub Vdyp/T2ZoLGQ9/hBEUwBSv+3vWvXfTgYVMKfHBV+lpCS8WGxyhBQEQiRk8I+4BFzBt36 iTNjy6ih5b2pdMr0ad6Wj0hwCUFXN/PJ77o5x6zxkehFxYT/tgco4f7YbFnfegMg4pbi tKyNwBXZrMV9KbYoiQvTHksjMpJmd4TBnSoIZmRKm8bI5iajJglKmh5JwXQgjUByy6zL WsDQ== X-Gm-Message-State: AOJu0YxZPIj004nFwHle58Y0nINS5FgDWXe5Tc2mpfClt8RQUFZyQoe1 XFDAUXIS0qrtKoIKEsmzjtX83ysv1ws4gHdFDTpQwA7ViX0XY7WySAh3ZdTxNK/sC/z8D4HR0q0 Wuvcr X-Gm-Gg: AR+sD12gLOpUO8kRv/5VycO3kVJiVzWhRQTVSCBtoeViNE+8My9TPhmmPdski8JAe2U zVTlDOI188zMBVqYiPPrAvGK0hV+Dt8g54np/7Kuyo0N2MQEquFLr/UHQeF8AK+abTmroYKr97t dlqy+rdfCQDPsNJ/L7WhM8/BiqF4Ah7Hi20y8IGXplzS+yygkagMPAOXhLTb8DTzw/fWB8EWxMv xIaRXNUQXo07QZA0BQECfhQI9issIOqQ8l/gcfngyPL1jCnXLP2ydJFTlpp2IuE9iIXwGA5akbV V08ifP6PhT1YIuO2o5noweZBdVva7AtHr8+chPdIeCCtA2egh28+cmWTGZJApea86P7FXQGXVGl ehtkxBpYLdxT0KfAucrNihI9UieohEWB3gRSjUsrxKOeExArnTuHKddKO1iBx36fg/PmZAeSmxB dRugPILW8Bgjgd6vwzAaY28Larl8vF24Z2utp41RHcssA3mgk+ElOFvvvS2etphYQoaMgbCc4K5 M0Zb3OkRC0uGtEMilyS X-Received: by 2002:a05:6a00:1daa:b0:846:8b21:6304 with SMTP id d2e1a72fcca58-84f2dfd2c03mr41735046b3a.14.1786314981279; Sun, 09 Aug 2026 15:36:21 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 15:36:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org Subject: [PATCH 27/56] disas/riscv: Handle aliases of csrrw during decode Date: Sun, 9 Aug 2026 15:35:16 -0700 Message-ID: <20260809223545.730664-28-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::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Richard Henderson --- disas/riscv.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index bde1cc6e62..e464b8b075 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -1081,9 +1081,6 @@ static const rvc_constraint rvcc_frrm[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x002, rvc_end }; static const rvc_constraint rvcc_frflags[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x001, rvc_end }; -static const rvc_constraint rvcc_fscsr[] = { rvc_csr_eq_0x003, rvc_end }; -static const rvc_constraint rvcc_fsrm[] = { rvc_csr_eq_0x002, rvc_end }; -static const rvc_constraint rvcc_fsflags[] = { rvc_csr_eq_0x001, 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 }; @@ -1166,14 +1163,6 @@ static const rv_comp_data rvcp_subw[] = { { rv_op_illegal, NULL } }; -static const rv_comp_data rvcp_csrrw[] = { - { rv_op_fscsr, rvcc_fscsr }, - { rv_op_fsrm, rvcc_fsrm }, - { rv_op_fsflags, rvcc_fsflags }, - { rv_op_illegal, NULL } -}; - - static const rv_comp_data rvcp_csrrs[] = { { rv_op_rdcycle, rvcc_rdcycle }, { rv_op_rdtime, rvcc_rdtime }, @@ -1761,7 +1750,7 @@ static const rv_opcode_data rvi_opcode_data[] = { { "sfence.vm", rv_codec_r, rv_fmt_rs1 }, { "sfence.vma", rv_codec_r, rv_fmt_rs1_rs2 }, { "wfi", rv_codec_none, rv_fmt_none }, - { "csrrw", rv_codec_i_csr, rv_fmt_rd_csr_rs1, rvcp_csrrw }, + { "csrrw", rv_codec_i_csr, rv_fmt_rd_csr_rs1 }, { "csrrs", rv_codec_i_csr, rv_fmt_rd_csr_rs1, rvcp_csrrs }, { "csrrc", rv_codec_i_csr, rv_fmt_rd_csr_rs1 }, { "csrrwi", rv_codec_i_csr, rv_fmt_rd_csr_zimm, rvcp_csrrwi }, @@ -4443,7 +4432,14 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa) break; } break; - case 1: op = rv_op_csrrw; break; + case 1: + switch (operand_csr12(inst)) { + case 1: op = rv_op_fsflags; break; + case 2: op = rv_op_fsrm; break; + case 3: op = rv_op_fscsr; break; + default: op = rv_op_csrrw; break; + } + break; case 2: op = rv_op_csrrs; break; case 3: op = rv_op_csrrc; break; case 4: -- 2.43.0