From patchwork Tue Mar 27 19:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10311529 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 806F6600F6 for ; Tue, 27 Mar 2018 19:58:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76C3F28BC8 for ; Tue, 27 Mar 2018 19:58:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B9BB29471; Tue, 27 Mar 2018 19:58:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DCDB4294CC for ; Tue, 27 Mar 2018 19:58:23 +0000 (UTC) Received: from localhost ([::1]:35847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0uje-0006FA-KZ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 27 Mar 2018 15:58:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0uht-0004y6-IS for qemu-devel@nongnu.org; Tue, 27 Mar 2018 15:56:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0uhr-0006K2-1O for qemu-devel@nongnu.org; Tue, 27 Mar 2018 15:56:33 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:40071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0uhq-0006Ja-Rz for qemu-devel@nongnu.org; Tue, 27 Mar 2018 15:56:30 -0400 Received: by mail-pl0-x244.google.com with SMTP id x4-v6so65885pln.7 for ; Tue, 27 Mar 2018 12:56:30 -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=e4MlWbGmYrLqd0uIHSepukbo0M9/wO/krY7toIHVIyQ=; b=ABroGahO3b4jugXCaWJo0Hg3ND9RpdQeM4cK9timc1sHrxy+ikIuTdB7pkNRhqcpfW 8QaOtRNmXSr57x1lZqpqINcOspXRNPWvMFxhKaFhvnxuyfybe8LKnyOVgVU3Lu/TqzJg I/JbnNVl4EK48e3zQIeWbOtoZ26Lq2KYvMUAV+WnX3Wp2GIVmT/vy65vA8y/P9JIa2xc QD6Q/JYy0VT7hHoy1qPxqvfYNL55fjn5XoLJrdR0ayVSCgKg+LBkMq8Tr/oiAw9dTf91 JYL1TfXRmD+ZVl4nG9/7RCFX36BaeOIH1Gc3ClhLnZtx2Vga1WntWO+vCAoc2kp6kS2S XLgw== 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=e4MlWbGmYrLqd0uIHSepukbo0M9/wO/krY7toIHVIyQ=; b=AcNKE0u21ac0PEI/JIsawn5w9lxLxl/uN4ClF7OewkX8dMxE5OOrAoOlkf3G2YA2cf guUWa37iX6OKu2NsFICh/gcEZAm7expU6aMRa9WEEQZYukVRO99qvWZB0bWI5BhQYbOu vwMP+dR6SabAhZF9tpVlqCGobixoi1+d9YLqqnRML92o/ors6L+ljU/UgLXiFkLKqwSc LMdyqQm/YjJ8xnBEMQj3QNOmzWpo8bxaIW/blz+uTaqG1HMwyLJSvYjKxJ2M+3BeXR7g +eBjKUoQUKy6FMCNUywTMNJHWpVovNtv3FcjZ0AAnMSf9rUwFPKiuYfeKhF/1hzkUFB7 Pung== X-Gm-Message-State: AElRT7EihIc3//gYM6262kvC8x149io/grMP3o8QfY2zcsJxqrXAxdw+ zCnpEeGKtIOxAlEWNgFRWAglK1OnxuY= X-Google-Smtp-Source: AIpwx48KUb+YNJjL1atOvEcCgMkZPd3h50uFTVhe3pwjdb77Wz+ayIA7qScOjAhQPL2gXhwL5OZvaA== X-Received: by 2002:a17:902:bd05:: with SMTP id p5-v6mr660740pls.137.1522180589871; Tue, 27 Mar 2018 12:56:29 -0700 (PDT) Received: from monty.com ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id y23sm3805053pgv.4.2018.03.27.12.56.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Mar 2018 12:56:29 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Tue, 27 Mar 2018 12:55:47 -0700 Message-Id: <1522180547-22956-3-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1522180547-22956-1-git-send-email-mjc@sifive.com> References: <1522180547-22956-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::244 Subject: [Qemu-devel] [PATCH v1 2/2] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- disas/riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disas/riscv.c b/disas/riscv.c index 3c17501..74ad16e 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -600,7 +600,7 @@ static const rvc_constraint rvcc_mv[] = { rvc_imm_eq_zero, rvc_end }; static const rvc_constraint rvcc_not[] = { rvc_imm_eq_n1, rvc_end }; static const rvc_constraint rvcc_neg[] = { rvc_rs1_eq_x0, rvc_end }; static const rvc_constraint rvcc_negw[] = { rvc_rs1_eq_x0, rvc_end }; -static const rvc_constraint rvcc_sext_w[] = { rvc_rs2_eq_x0, rvc_end }; +static const rvc_constraint rvcc_sext_w[] = { rvc_imm_eq_zero, rvc_end }; static const rvc_constraint rvcc_seqz[] = { rvc_imm_eq_p1, rvc_end }; static const rvc_constraint rvcc_snez[] = { rvc_rs1_eq_x0, rvc_end }; static const rvc_constraint rvcc_sltz[] = { rvc_rs2_eq_x0, rvc_end };