From nobody Mon Sep 21 18:57:16 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=1784142513; cv=none; d=zohomail.com; s=zohoarc; b=ZG6Uv7PlZVdv21Houd9I/emGGaERIMYbiIYwE5+OxMDNCjsCGH3fgE7YYw0XqzKC0yLUN6ykBKifStK1NBqJTE/DO5PXG3l0XvljyuFOWqkmvPNjBE0671tmQY5+sFXwessm8fx/VPcxpzdKsyfyCl1j2FrqKo9ZYQpUN36ujgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784142513; 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=DrGyzzIREJlWtQBu4xVZTTE8OcBcEv+CZjOxRrU5wmQ=; b=E3gQizQLUWxFfOgdV3YzqAN9/+K9fQBjcJSWZHuGP4k7TqXkVLkcc8CSlUK4UePnjZ33SXqFY/eGzjf43Kcd5lxsLGmff4vpS6OWMqEpn6R9vItZjrPHevtrbJFhcNxTZZPBo1q2xISt5OFsnfnjcT9xKkPkZICzFCHo0shNpTM= 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 1784142513312478.1308879481787; Wed, 15 Jul 2026 12:08:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wk4xe-0003mG-L0; Wed, 15 Jul 2026 15:08:04 -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 1wk4xW-0003j5-LT; Wed, 15 Jul 2026 15:07:55 -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 1wk4xS-0001o5-7Z; Wed, 15 Jul 2026 15:07:54 -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 AB5CF4023C; Wed, 15 Jul 2026 21:07:43 +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 A7013FF861; Wed, 15 Jul 2026 21:07:43 +0200 (CEST) Received: from naga.. (unknown [78.243.103.16]) (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 E15D3400E7; Wed, 15 Jul 2026 21:07:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=univ-grenoble-alpes.fr; s=2020; t=1784142463; bh=cIoCa6uQAskBje+hAP7eqP57YaZpyMwGxTDnEkEojM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p7l56AAIfAFI3e9ylHei1rcvX68uRic+ZSNwKafn0ZEePolFlEq40q3WeFOUKR8jR gVPne+vvk2YlJe+uDICow7wZObozV5H++qsu3Yl7o0bJbxOZpZoIwkYSZDpYl13BOs S/U5WzOaLcR7M+0GkqlR4aWT59X0RK6jEoRdRxJn+katXz0oCuGd4Gz1YBKTZuBQ+Y 7JhhOWRZjdEfebG6UNL/RBBofTw2uQiqF8ZuTfo5PEY8Arp9O/5P3iBboD3aoC/ohc mU1B8jFCJ25Yl7GpZvKMUghXmdoibcKdakWWmosRqV3q7bfvPvVidDaJVbx7v4fBpy tMIYBcI4uePZg== From: frederic.petrot@univ-grenoble-alpes.fr To: palmer@dabbelt.com, alistair.francis@wdc.com, daniel.barboza@oss.qualcomm.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 2/3] disas/riscv.c: Correct disasm of lq Date: Wed, 15 Jul 2026 21:07:36 +0200 Message-ID: <20260715190737.1381701-3-frederic.petrot@univ-grenoble-alpes.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260715190737.1381701-1-frederic.petrot@univ-grenoble-alpes.fr> References: <20260715190737.1381701-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: 1784142519285158500 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. 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 490bda8e56..831ff526ad 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