From nobody Mon Jul 27 20:04:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=univ-grenoble-alpes.fr ARC-Seal: i=1; a=rsa-sha256; t=1784216853; cv=none; d=zohomail.com; s=zohoarc; b=jnNtUdlLBk/JcOuKjXB1FLL5W3RK3FP7WygnoDF0m2hHq0tmJSAeFzQifhCbUyxYoVkduDFvx+gmmNoc2NM+skrc+2+PtodJeBqNMmVzQ/8hCPmRgPxH8fXiY1MuJ/Z/YiQirHjdZ0JZNsA03wD3kVRonDQ2U8FgR6na5kieSS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784216853; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sIZ2so12Q6g/7QImL8F3uZWdniub3TC0ekGQdgFMzJw=; b=eTT0GJXn1vwDlHadwOV25NQ0uxNZfKB+4vwY1xjc0B4ckCurVcLRuUxVfgWicH/EDpWiHAe3FzxxqTxJbyH5iRt68AutGvRb7DrIh885uYxHflqhOZUqT8AtHmY29mDnVXpLzM5pdgqy0LcDAnogLNBdzjiSaDY9qxj1avPHSpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784216853099379.81653203929363; Thu, 16 Jul 2026 08:47:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkOJ1-0004FF-11; Thu, 16 Jul 2026 11:47:25 -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 1wkOIT-00048c-Ri; Thu, 16 Jul 2026 11:47:07 -0400 Received: from zm-mta-out-3.u-ga.fr ([152.77.200.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkOIK-0002MH-6M; Thu, 16 Jul 2026 11:46:42 -0400 Received: from mailhub-1.u-ga.fr (mailhub-1.u-ga.fr [129.88.178.98]) by zm-mta-out-3.u-ga.fr (Postfix) with ESMTP id CC3104028E; Thu, 16 Jul 2026 17:46:37 +0200 (CEST) Received: from smtps.univ-grenoble-alpes.fr (smtps3.u-ga.fr [195.83.24.62]) by mailhub-1.u-ga.fr (Postfix) with ESMTP id C7C78FF85D; Thu, 16 Jul 2026 17:46:37 +0200 (CEST) Received: from naga.tima.u-ga.fr (naga.tima.u-ga.fr [147.171.132.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: petrotf@univ-grenoble-alpes.fr) by smtps.univ-grenoble-alpes.fr (Postfix) with ESMTPSA id 9CCBC400E7; Thu, 16 Jul 2026 17:46:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=univ-grenoble-alpes.fr; s=2020; t=1784216797; bh=jSuRj9IRW0QigeZa4bLZgDPiu+5R/Vid2SH/Mkyex04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QBbb6R7rj4pRAe9pMvBbtat+nTXaVfL9ezqVDFpUYWv25a5vlJNpo/yjvZqifV3TT l+4Wk31HTNkJuHUr+9FNOhIdz7PCzwrCYGhU39kGSacT5in8DvAaakua63bfqQ9Bmd QhdZUs0nB0fJ4gNZoN/XIHwxwUGxfSElMT5ZzsCvg6wkx3Z/I3r97EySoALalxJVWE dnuJvG5oho0Nk9ucezm5S8ZCeWInsLm05eGn5oCgVFlJU9NV8PNM684TW5utfQezhD W4f6WrMd51pKaEf3vFbXf5TBVX9IOGo9k8zWhF1sSQlHzbce4381eRk2UKp3f9kZbN BmCY+k+SkwA+g== From: frederic.petrot@univ-grenoble-alpes.fr To: daniel.barboza@oss.qualcomm.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: julien.thillard@univ-grenoble-alpes.fr, =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9trot?= Subject: [PATCH v2 1/3] disas/riscv.c: Correct indent for checkpatch Date: Thu, 16 Jul 2026 17:46:13 +0200 Message-ID: <20260716154615.1545145-2-frederic.petrot@univ-grenoble-alpes.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716154615.1545145-1-frederic.petrot@univ-grenoble-alpes.fr> References: <20260716154615.1545145-1-frederic.petrot@univ-grenoble-alpes.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Greylist: Whitelist-UGA SMTP Authentifie (petrotf@univ-grenoble-alpes.fr) via submission-587 ACL (41) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=152.77.200.56; envelope-from=frederic.petrot@univ-grenoble-alpes.fr; helo=zm-mta-out-3.u-ga.fr X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @univ-grenoble-alpes.fr) X-ZM-MESSAGEID: 1784216860210158500 From: Fr=C3=A9d=C3=A9ric P=C3=A9trot Trival indentation patch on the cbo/lq relevant code, in preparation for modifications in that part. Signed-off-by: Fr=C3=A9d=C3=A9ric P=C3=A9trot Reviewed-by: Daniel Henrique Barboza --- disas/riscv.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index 7f1b262773..689502f083 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -2887,25 +2887,25 @@ static void decode_inst_opcode(rv_decode *dec, rv_i= sa isa) case 0: op =3D rv_op_fence; break; case 1: op =3D rv_op_fence_i; break; case 2: - /* - * 'lq' shares the "(...) 010 ..... 0001111" opcode space - * with 'cbo' insns. Check the next 5 bits to select - * what we want: - * - * cbo_inval 0000000 00000 ..... 010 00000 0001111 - * cbo_clean 0000000 00001 ..... 010 00000 0001111 - * cbo_flush 0000000 00010 ..... 010 00000 0001111 - * cbo_zero 0000000 00100 ..... 010 00000 0001111 - * - * Anything that doesn't match these will default to 'lq'. - */ - switch ((inst >> 17) & 0b11111) { - case 0: op =3D rv_op_cbo_inval; break; - case 1: op =3D rv_op_cbo_clean; break; - case 2: op =3D rv_op_cbo_flush; break; - case 4: op =3D rv_op_cbo_zero; break; - default: op =3D rv_op_lq; break; - } + /* + * 'lq' shares the "(...) 010 ..... 0001111" opcode space + * with 'cbo' insns. Check the next 5 bits to select + * what we want: + * + * cbo_inval 0000000 00000 ..... 010 00000 0001111 + * cbo_clean 0000000 00001 ..... 010 00000 0001111 + * cbo_flush 0000000 00010 ..... 010 00000 0001111 + * cbo_zero 0000000 00100 ..... 010 00000 0001111 + * + * Anything that doesn't match these will default to 'lq'. + */ + switch ((inst >> 17) & 0b11111) { + case 0: op =3D rv_op_cbo_inval; break; + case 1: op =3D rv_op_cbo_clean; break; + case 2: op =3D rv_op_cbo_flush; break; + case 4: op =3D rv_op_cbo_zero; break; + default: op =3D rv_op_lq; break; + } } break; case 4: --=20 2.43.0 From nobody Mon Jul 27 20:04:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=univ-grenoble-alpes.fr ARC-Seal: i=1; a=rsa-sha256; t=1784216907; cv=none; d=zohomail.com; s=zohoarc; b=Vow4KSFUrftzDDNk3bxXYckEtyGOkScVXlhdtVr7m3dBZ8Rq9XHgKUSJfufTvKPX62h2j7/IJGEnOfBEKZC7BPLDDvP7Kb0MyLL5fZz0JaSkRE11mPP/cZKQJBR6LCIeCyurn5y1y2tnSGg/9eFNwakh2k8MFSiWI0F7RdTfl2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784216907; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nt7PBmpNBw4EBBskGl9TWaBA7VEo8xGBf8+RflydiKM=; b=TXoMXS39uKTOr0QhLsgebzfQj7JvNvXVeGa7QFMq0qsBKKkq5CpXN7bMw+Ay+PFiZdENPGGAlzkPvDp+kj0qPzFHbfD7U13u5FbvM2lxuJGHKun/jPq3PrWcSLHvJrPHWpI/RG14ZuPgVEtrtuKfIBlb784jACk8xR1Gjp7dsQI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784216907312172.1960227340736; Thu, 16 Jul 2026 08:48:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkOJN-0004Ub-26; Thu, 16 Jul 2026 11:47:45 -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 1wkOIg-00049F-I9; Thu, 16 Jul 2026 11:47:07 -0400 Received: from zm-mta-out-3.u-ga.fr ([152.77.200.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkOIa-0002NJ-Um; Thu, 16 Jul 2026 11:46:58 -0400 Received: from mailhub-2.u-ga.fr (mailhub-2.u-ga.fr [129.88.178.102]) by zm-mta-out-3.u-ga.fr (Postfix) with ESMTP id D607240297; Thu, 16 Jul 2026 17:46:48 +0200 (CEST) Received: from smtps.univ-grenoble-alpes.fr (smtps3.u-ga.fr [195.83.24.62]) by mailhub-2.u-ga.fr (Postfix) with ESMTP id D1B88FF85F; Thu, 16 Jul 2026 17:46:48 +0200 (CEST) Received: from naga.tima.u-ga.fr (naga.tima.u-ga.fr [147.171.132.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: petrotf@univ-grenoble-alpes.fr) by smtps.univ-grenoble-alpes.fr (Postfix) with ESMTPSA id AA2E7400E7; Thu, 16 Jul 2026 17:46:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=univ-grenoble-alpes.fr; s=2020; t=1784216808; bh=rslQ9alLFFA5W9cWtD262id/j27w+aRzGV3v6dT27ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gQRX3snJ1my8Uqw2sko5JBmqR5h0/80oYhkos5OM8BNgYSfznviK+/bOEUg9u69qU 9u+BcGM/w8bWMnk09uljyw4Dg6rwAsgOdXT4lyV9JZKzgKbX0ThLLFatSKNEYgLFcW 1SbyXhCCQwN7U3vyB2RWMu9zsNOmMwid7/48aALhLh34SVN+noMLEaO+2H0rzOilWx R5M9npOcOqdkmzdQFNIGgY576zvkCdHQtjKHIvrjq8EZ+bjRqv3wB1dsoG8GXpk3jx M8hMZsP48Ovh2YrNuHIDmZRxp7tAbYssjZQstm5TyM+57jWAuv/5FBlDrrWii0qtSf 6pcBpAzlbqbrw== From: frederic.petrot@univ-grenoble-alpes.fr To: daniel.barboza@oss.qualcomm.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: julien.thillard@univ-grenoble-alpes.fr, =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9trot?= Subject: [PATCH v2 2/3] disas/riscv.c: Correct wrong shifts for cbo Date: Thu, 16 Jul 2026 17:46:14 +0200 Message-ID: <20260716154615.1545145-3-frederic.petrot@univ-grenoble-alpes.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716154615.1545145-1-frederic.petrot@univ-grenoble-alpes.fr> References: <20260716154615.1545145-1-frederic.petrot@univ-grenoble-alpes.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Greylist: Whitelist-UGA SMTP Authentifie (petrotf@univ-grenoble-alpes.fr) via submission-587 ACL (41) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=152.77.200.56; envelope-from=frederic.petrot@univ-grenoble-alpes.fr; helo=zm-mta-out-3.u-ga.fr X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @univ-grenoble-alpes.fr) X-ZM-MESSAGEID: 1784216910577158500 From: Fr=C3=A9d=C3=A9ric P=C3=A9trot The cache block operations are specified on bits 31:20, but for some reason a shift of 17 and a 5 bit masking were performed. Make this a raw shift of 20 prior to test for the cbo operation. Fixes: 9273cda722 ("disas/riscv.c: add 'cbo' insns to disassembler") Reported-by: Julien Thillard Signed-off-by: Fr=C3=A9d=C3=A9ric P=C3=A9trot Reviewed-by: Daniel Henrique Barboza --- disas/riscv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index 689502f083..b32a040745 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -2889,8 +2889,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa= isa) case 2: /* * 'lq' shares the "(...) 010 ..... 0001111" opcode space - * with 'cbo' insns. Check the next 5 bits to select - * what we want: + * with 'cbo' insns. * * cbo_inval 0000000 00000 ..... 010 00000 0001111 * cbo_clean 0000000 00001 ..... 010 00000 0001111 @@ -2899,7 +2898,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa= isa) * * Anything that doesn't match these will default to 'lq'. */ - switch ((inst >> 17) & 0b11111) { + switch (inst >> 20) { case 0: op =3D rv_op_cbo_inval; break; case 1: op =3D rv_op_cbo_clean; break; case 2: op =3D rv_op_cbo_flush; break; --=20 2.43.0 From nobody Mon Jul 27 20:04:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=univ-grenoble-alpes.fr ARC-Seal: i=1; a=rsa-sha256; t=1784216894; cv=none; d=zohomail.com; s=zohoarc; b=JFjxx1yKgH17yh/b7PmpBxNnf2i/NZnhxzZFAyTRnIF4HGUR2bhIJooANlV47Sj3EG6XzU+zQlabEHmawpA80XF/ihtiQh017sNlfE1snwHlO4u2fvykUXCtVqX3EIuwcFoEuqoD+CBzJeGO7APdGaanRBSo/oy9babWPTS3e6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784216894; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sM1YlM8GPxHBZUuHP4vY2lRYFSGzYEB5xkRQU3GLHUY=; b=RObL74w3Z7rRlWgDFRUT6/cMiXG7SLgYsAMTdI06U4v05NSyUjsQGeHd4uIoJTxa98vC4tquE9PlHmNEx+g4/2f4OlpUOZ702feielW8AlN+XFdclLLNc9p9Z5Tl1jcoDHszRRLM4aRiIoVdxiUfb8aNckEIuIC4cDItuphaLjs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784216893790691.4050829861512; Thu, 16 Jul 2026 08:48:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkOJL-0004Rw-84; Thu, 16 Jul 2026 11:47:43 -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 1wkOIj-00049V-Ef; Thu, 16 Jul 2026 11:47:07 -0400 Received: from zm-mta-out-3.u-ga.fr ([152.77.200.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkOIh-0002Ny-5t; Thu, 16 Jul 2026 11:47:04 -0400 Received: from mailhub-2.u-ga.fr (mailhub-2.u-ga.fr [129.88.178.102]) by zm-mta-out-3.u-ga.fr (Postfix) with ESMTP id 493A840290; Thu, 16 Jul 2026 17:46:57 +0200 (CEST) Received: from smtps.univ-grenoble-alpes.fr (smtps3.u-ga.fr [195.83.24.62]) by mailhub-2.u-ga.fr (Postfix) with ESMTP id 44EBDFF85F; Thu, 16 Jul 2026 17:46:57 +0200 (CEST) Received: from naga.tima.u-ga.fr (naga.tima.u-ga.fr [147.171.132.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: petrotf@univ-grenoble-alpes.fr) by smtps.univ-grenoble-alpes.fr (Postfix) with ESMTPSA id 1BF45400E7; Thu, 16 Jul 2026 17:46:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=univ-grenoble-alpes.fr; s=2020; t=1784216817; bh=222PKS7W3N4GNn4iMmnFhJO/JpIslbGJc2peC8KZ+3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=4HJthci8um1XpVvaqDsk104V+Eytiwc8vaTFAIPMaP7rrRxmClQE+KsLZ3h2dYe0Y UQy5Z+2MEr1x3kKDhaYma4dmqnB7tA8mw+86wS5whwORQ8vm5K8pXO72SjRNUSbrGk MeBrjiw+6CWxAqECG9xXZlTKzjUrI8ImPR0u7l8lRyoVE03b+4QlpVtmcHOqnAMW1n QNmkyEyiy3KgjUL8z5OfuYcVphDfn5t9IJMlq087lnhwl950Mg7GdHmEJ7x0OqnI0V kQXTlcyIiTTVjgfQnV/rzVGeP8VYzyLsYSdkHTTByMQAFy1UqQtHFVQz/YqJQCxlXL swx2R40N8DBWg== From: frederic.petrot@univ-grenoble-alpes.fr To: daniel.barboza@oss.qualcomm.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: julien.thillard@univ-grenoble-alpes.fr, =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9trot?= Subject: [PATCH v2 3/3] disas/riscv.c: Correct disasm of lq Date: Thu, 16 Jul 2026 17:46:15 +0200 Message-ID: <20260716154615.1545145-4-frederic.petrot@univ-grenoble-alpes.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716154615.1545145-1-frederic.petrot@univ-grenoble-alpes.fr> References: <20260716154615.1545145-1-frederic.petrot@univ-grenoble-alpes.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Greylist: Whitelist-UGA SMTP Authentifie (petrotf@univ-grenoble-alpes.fr) via submission-587 ACL (41) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=152.77.200.56; envelope-from=frederic.petrot@univ-grenoble-alpes.fr; helo=zm-mta-out-3.u-ga.fr X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @univ-grenoble-alpes.fr) X-ZM-MESSAGEID: 1784216898674158500 From: Fr=C3=A9d=C3=A9ric P=C3=A9trot Lq shares the cmo opcode space, but the cbos must have rd =3D 0. Now ensure that they are matched only in that case. This implies that lq can be recognized as such only when rd !=3D 0. Update the decoder file accordingly. Fixes: 9273cda722 ("disas/riscv.c: add 'cbo' insns to disassembler") Reported-by: Julien Thillard Signed-off-by: Fr=C3=A9d=C3=A9ric P=C3=A9trot Reviewed-by: Daniel Henrique Barboza --- disas/riscv.c | 19 ++++++++++--------- target/riscv/insn32.decode | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/disas/riscv.c b/disas/riscv.c index b32a040745..27bf4d9954 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -2889,21 +2889,22 @@ static void decode_inst_opcode(rv_decode *dec, rv_i= sa isa) case 2: /* * 'lq' shares the "(...) 010 ..... 0001111" opcode space - * with 'cbo' insns. + * with 'cbo' insns, but assumes rd !=3D 0. * * cbo_inval 0000000 00000 ..... 010 00000 0001111 * cbo_clean 0000000 00001 ..... 010 00000 0001111 * cbo_flush 0000000 00010 ..... 010 00000 0001111 * cbo_zero 0000000 00100 ..... 010 00000 0001111 - * - * Anything that doesn't match these will default to 'lq'. */ - switch (inst >> 20) { - case 0: op =3D rv_op_cbo_inval; break; - case 1: op =3D rv_op_cbo_clean; break; - case 2: op =3D rv_op_cbo_flush; break; - case 4: op =3D rv_op_cbo_zero; break; - default: op =3D rv_op_lq; break; + if ((inst >> 7) & 0b11111) { + op =3D rv_op_lq; + } else { + switch (inst >> 20) { + case 0: op =3D rv_op_cbo_inval; break; + case 1: op =3D rv_op_cbo_clean; break; + case 2: op =3D rv_op_cbo_flush; break; + case 4: op =3D rv_op_cbo_zero; break; + } } } break; diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 21272fdb50..aa02dae3c9 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -216,6 +216,8 @@ ldu ............ ..... 111 ..... 0000011 @i ] =20 # *** RVI128 lq *** + # *** Catches an lq with rd =3D 0, which we disallow + illegal ------------ ----- 010 00000 0001111 lq ............ ..... 010 ..... 0001111 @i } sq ............ ..... 100 ..... 0100011 @s --=20 2.43.0