From nobody Tue Feb 10 16:22:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521915532670751.9148020576195; Sat, 24 Mar 2018 11:18:52 -0700 (PDT) Received: from localhost ([::1]:46680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eznkc-0005h5-4o for importer@patchew.org; Sat, 24 Mar 2018 14:18:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eznhg-0004b0-Cm for qemu-devel@nongnu.org; Sat, 24 Mar 2018 14:16:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezngc-0003p7-CF for qemu-devel@nongnu.org; Sat, 24 Mar 2018 14:15:44 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:42135) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ezngc-0003oe-54 for qemu-devel@nongnu.org; Sat, 24 Mar 2018 14:14:38 -0400 Received: by mail-pl0-x241.google.com with SMTP id w15-v6so9385428plq.9 for ; Sat, 24 Mar 2018 11:14:38 -0700 (PDT) Received: from monty.com (h98.112.139.40.ip.windstream.net. [40.139.112.98]) by smtp.gmail.com with ESMTPSA id k24sm22314646pff.77.2018.03.24.11.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Mar 2018 11:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mVEoJhhsGdxkDz6IiuxLgvBOpHn2jnNrtkf+xXLqlII=; b=Gepi/M54cNEfRGOhmFtlPbYeZiHIHdicv/v8ZnEY7FPVsZZ1yY0tZbRv5wpT4Zojvg 6nR1Ype72dL446dIC+/YfqWV1yK8/6A9XhiEENkZQBidHhLxEQtSekDP9ydYHsMmpcYf Q/BeorHTnUypdvQKlUC6xzrD/GOnWDa/TzfCwxEQyN13IdQiWHORZ3RI5SXka/Vj1dxF LiZDk1oq5b+Z0iotr9hmjb9mw6EW+/kf4yejlHmOicf8hq4RusWIf3aZaBADaKse+ltX DxA9xcb8rOsCmxan/e8j2LuzVbQO1QVA0hbc0sfzCJPiY+7U7IvFZWKQV8k/QEX658SV 0VwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mVEoJhhsGdxkDz6IiuxLgvBOpHn2jnNrtkf+xXLqlII=; b=qCrUtgJJ8DRlqd3kNPjrXSYxr4Bj9KV5Z8KyCOWCqKfz5hPTS0M+Dz1BCfYWh5BqBe 2K5PvOMoBOhGMV1Ap+JGZ9HGls8qyybgMiLo/KsaxA6VEuxTsoV0KRMy2MC5v7Vsr7Z7 rjksia6E6bOxHQaU87+nzctbThaai/ScoOY1m+oBGhIAQHEsGrdVgB/YMrroG965f2uI 60dVW8pmOuhpU9sHYsy0rEbQoCjBMUoAOAOGEPvulTWnlgtSibTJ43yQQcQ+QCR3IUM5 vw/C2q900FFSRjYqa4qTrgsdKgRUFeobhlQKw9pgtpHMehjgMZxVncEwVpsD0a9SJ72S Vm7A== X-Gm-Message-State: AElRT7Hu2ZlnZGs+O5x/glpOu0r/A97JdJsViZkziQGmwi5GKaZ4lUhN uFMvCAGEIcyCe8E2uMCxkujjXQPJcHE= X-Google-Smtp-Source: AG47ELv935X+dPHewA0ts1uu7bz6ZCF4IxPWsrjknW6l/347HrfyIqu1wzfSitLgtdQOUkWjMdTRIA== X-Received: by 2002:a17:902:9a05:: with SMTP id v5-v6mr34093697plp.69.1521915277293; Sat, 24 Mar 2018 11:14:37 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sat, 24 Mar 2018 11:13:39 -0700 Message-Id: <1521915220-65389-14-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1521915220-65389-1-git-send-email-mjc@sifive.com> References: <1521915220-65389-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH v6 25/26] RISC-V: Fix incorrect disassembly for addiw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Michael Clark , patches@groups.riscv.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This fixes a bug in the disassembler constraints used to lift instructions into pseudo-instructions, whereby addiw instructions are always lifted to sext.w instead of just lifting addiw with a zero immediate. An associated fix has been made to the metadata used to machine generate the disseasembler: https://github.com/michaeljclark/riscv-meta/ commit/4a6b2f3898430768acfe201405224d2ea31e1477 Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Peter Maydell Signed-off-by: Michael Clark --- disas/riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disas/riscv.c b/disas/riscv.c index 4580308..2cecf0d 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -600,7 +600,7 @@ static const rvc_constraint rvcc_mv[] =3D { rvc_imm_eq_= zero, rvc_end }; static const rvc_constraint rvcc_not[] =3D { rvc_imm_eq_n1, rvc_end }; static const rvc_constraint rvcc_neg[] =3D { rvc_rs1_eq_x0, rvc_end }; static const rvc_constraint rvcc_negw[] =3D { rvc_rs1_eq_x0, rvc_end }; -static const rvc_constraint rvcc_sext_w[] =3D { rvc_rs2_eq_x0, rvc_end }; +static const rvc_constraint rvcc_sext_w[] =3D { rvc_imm_eq_zero, rvc_end }; static const rvc_constraint rvcc_seqz[] =3D { rvc_imm_eq_p1, rvc_end }; static const rvc_constraint rvcc_snez[] =3D { rvc_rs1_eq_x0, rvc_end }; static const rvc_constraint rvcc_sltz[] =3D { rvc_rs2_eq_x0, rvc_end }; --=20 2.7.0