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 D480AC5AD5A for ; Sun, 9 Aug 2026 22:44:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtC7y-0000xg-HC; Sun, 09 Aug 2026 18:36:22 -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 1wtC7v-0000vC-Dx for qemu-devel@nongnu.org; Sun, 09 Aug 2026 18:36:19 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wtC7u-0007Q9-0P for qemu-devel@nongnu.org; Sun, 09 Aug 2026 18:36:19 -0400 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-cbb662575d3so542519a12.0 for ; Sun, 09 Aug 2026 15:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1786314977; x=1786919777; 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=nS2rxErkjoDDZNGsv6FDl/aPsWDFlNYooWE1D4/6J7Y=; b=rCfEM3Fx3WeoqsDluBcPye0c7W/23PCQrbZBjkGGp1H9kuiFv3eOQtJcYd7B/cbv/B ZzIYMCx7DcwxUONKNGI8TeFsPjQ+TLBozCER2jrg0Py0kP1BJWyv3xa6+n2liWqLGMZm P5t9HmmzNDE1h18acXAt2Xan/QXtQHt+c06aigUT8+l14nTkeM8p/OFzgCa2uQQSi5i3 w7nnzSfdoi3iD5u+zkLC6VF89grsCwtvNaloolmPHnIp9inFkZA9oI+rV4BZPe8fKPTk XX2Vp4YI1ywc/tBZI0kVS2eJRAfmsTwu4KMd/eG8qvCfEF5Er+KWID30TSx4t4OMGLI7 YllQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786314977; x=1786919777; 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=nS2rxErkjoDDZNGsv6FDl/aPsWDFlNYooWE1D4/6J7Y=; b=TNcgmjIj1Q7WJv0Nu0KiniA0+Fk7pM4+sAI040MZ44rhkn2rMjpBvWOx0JQ4CQS352 ZXqFv53wsQINQgYXzWtaydEMHHkSdimCz3latnmKb0ffqGMmmC14F+VGGQTfvBiGXFim An9EzH7ChssDK2D8vClNKN9V43fdQfrCZz8+VXhwZlqhBDZOlaAwi5XBPYdyg6JgUG9s fFxOFduhf5em5+bmWE6bGZzF2i92B6MMCSOawuUu0vjEquNOIWsr6u2IJtwhaZTLcFha csbvp/YSAFHHXBJnLeqnBCSk5gb8JHO/ZN1XxuUKXssaj+82eDodbvf3Oe3JT9WM8Lml BEDw== X-Gm-Message-State: AOJu0YwiVQImrPBjl5CZ1vIUPGLAJdmFHYpw0CNNfUU1+80CUSTkBW7J 5ZTUZP9LU2HmHXPNZNjLHygaWDljuX1JxtfyGLHVxuGShOLszXhnjOWF1sAU7MK4qT527bJdmSN tAJ91 X-Gm-Gg: AR+sD10lkAnn2jPd0Mm3JxBrjIpW7gVeKPnvUgnkA6zYGsmNLBm54FK2HowX4m2RzXG jTVG1s3x23QYKqE4BGrq5vjjIsc4ByLMgbCUPmpV1lZ1eGkacEwY7f9TRlfrSyXVHMOoPTjV/ij Z6R1RYUUYUqROXrpeDFry0DkFME9XXz4duXT6WJHS+ikxzzWK4FhYUXkHKVway4i2YI6p7IPi6r MNE19jHEYjb1a+RZgLF5LwKm7FTn2VRa98WFPvDJE/PivvgCmBZTLx6bROFk5f5+W+HPtzRHYMg /Jfi51xv2V2b2lr8yUcv8nTGCYqisOGy+qBDqG+1FoimOAhFylm471qZi9uHH9JL3jzY2XgahoG /uOgpYfHPgkPg56B2WuiQL1eU+DDs5sPDmxyKl/HWlLuwwcdGKERwkVRK4Ou6wJu/Edgbcmlvzj 5c4JIThPBrYBNSag84PGqsHqpuONik9AdWat1VKLTs6FFtMgo9R9xTiD5WZ7ufLOsqIDHESADWk 3sa3USOwy5SMDoP/ZBykX+/SC+0F5M= X-Received: by 2002:a05:6a21:6daa:b0:3c4:3672:ba6 with SMTP id adf61e73a8af0-3cbadc15329mr26485869637.22.1786314976598; Sun, 09 Aug 2026 15:36:16 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2026 15:36:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org Subject: [PATCH 23/56] disas/riscv: Do not recognize c.{addw,subw} with rv32 Date: Sun, 9 Aug 2026 15:35:12 -0700 Message-ID: <20260809223545.730664-24-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::52d; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52d.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 These code points are reserved with RV32. Signed-off-by: Richard Henderson --- disas/riscv.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index 77347b557d..ddc2f73eae 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -3060,8 +3060,16 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa) case 1: op = rv_op_c_xor; break; case 2: op = rv_op_c_or; break; case 3: op = rv_op_c_and; break; - case 4: op = rv_op_c_subw; break; - case 5: op = rv_op_c_addw; break; + case 4: + if (isa != rv32) { + op = rv_op_c_subw; + } + break; + case 5: + if (isa != rv32) { + op = rv_op_c_addw; + } + break; case 6: op = rv_op_c_mul; break; case 7: switch ((inst >> 2) & 0b111) { -- 2.43.0