From nobody Sat Oct 25 08:49:10 2025 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520629420332298.74763039812296; Fri, 9 Mar 2018 13:03:40 -0800 (PST) Received: from localhost ([::1]:48088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euPAp-0004Dg-CL for importer@patchew.org; Fri, 09 Mar 2018 16:03:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euP9p-0003sD-Ox for qemu-devel@nongnu.org; Fri, 09 Mar 2018 16:02:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euP9l-0004dT-9e for qemu-devel@nongnu.org; Fri, 09 Mar 2018 16:02:29 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:34805) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euP9l-0004d2-3E for qemu-devel@nongnu.org; Fri, 09 Mar 2018 16:02:25 -0500 Received: by mail-pf0-x241.google.com with SMTP id j20so1774572pfi.1 for ; Fri, 09 Mar 2018 13:02:24 -0800 (PST) Received: from localhost.localdomain (125-237-39-90-fibre.bb.spark.co.nz. [125.237.39.90]) by smtp.gmail.com with ESMTPSA id e125sm3640080pgc.76.2018.03.09.13.02.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 13:02:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id; bh=8icID4aJW8dkaFyrON8nE/qhLmZos9Cb9etZBzHQASw=; b=IsnKNaMErcI4Ac4i4VkiBcEmBRqZ1OQJpuHERHVZrKeg6r7wIF8vs/4mG4BUw2lr/u lExMVO+ompxH/Kj1sf6iWfVrv+bgPRdxOpCByqIJOXzNFAN8jJFPcfvbWOSWZLZNBWnX WR66lgz4BwF7ETul4KzYB6vFVtAt3ilAMWAisVnpDPzBcXpp2OsFJgRy6ZHRCCZ8W2Vd qYzypiJkbOajjDsUPTHV0V4JHWVl2VkMm28zOilbEuv7eXaO54biD0EgOekGciHbK847 VOll1WmQEMb7IyxWXjYArouSqa6iZDOGqXIgLPsAe+eJ7EYPiS6hj7CNgLR6MTJI1631 pDbw== 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; bh=8icID4aJW8dkaFyrON8nE/qhLmZos9Cb9etZBzHQASw=; b=Zs4FgOng9G11/TLZwnc5ZVqlQPYulNOcDH1YzkgU7afK/0/XOr/FalOPB+1iUSO0fg jeWqUJmmGdZkBGFXwyHfqezQ/FJ2jN1h4XwFoElmg9jXprrxV+z8wHl3VMwuK4/ONpUr YCIbJPXorGrc/tR3sKBdiVdQXwjLYsq1+Fu/nL+X/xw245fn5h5K7DxlDHCrKR/4yXcp sHqtYdNc655W5aKMEcFrKOlzO6aQicixDUy6tX5WFVZ4HQFO6H9iqUJF14C3y9J+RUdi NX8IwGmvdjdiVLdAqBZtqFtnAoJ1CoQfrULr75FqmhHiZWl2qxQ0IDhKreuklPzCiAll bzWA== X-Gm-Message-State: APf1xPA7U7JlQzHxVzuTy8uoL6AVt+6xF+Twel1fdgkVT8RHgzAewym0 lCpX5X8hlt35nQQsFe0ZasGTSZ3MBIY= X-Google-Smtp-Source: AG47ELsG/AcTFGWZrcYfrcHUrfCjZpNDPZkxSAcyDlTxqOPJIH4FeUGB7Sj0yoIH5ftN+7VtHJABsw== X-Received: by 10.99.110.131 with SMTP id j125mr25522009pgc.382.1520629343399; Fri, 09 Mar 2018 13:02:23 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Sat, 10 Mar 2018 10:01:12 +1300 Message-Id: <1520629272-98060-1-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH v2] RISC-V: Fix riscv_isa_string, use popcount to count bits 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 , Michael Clark , Palmer Dabbelt 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" Logic bug caused the string size calculation for the RISC-V format ISA string to be small. This fix allows slack for rv128. Cc: Palmer Dabbelt Cc: Peter Maydell Cc: Eric Blake Signed-off-by: Michael Clark --- target/riscv/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 4851890..1456535 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -391,7 +391,7 @@ static const TypeInfo riscv_cpu_type_info =3D { char *riscv_isa_string(RISCVCPU *cpu) { int i; - size_t maxlen =3D 5 + ctz32(cpu->env.misa); + size_t maxlen =3D 8 + ctpop64(cpu->env.misa); char *isa_string =3D g_new0(char, maxlen); snprintf(isa_string, maxlen, "rv%d", TARGET_LONG_BITS); for (i =3D 0; i < sizeof(riscv_exts); i++) { --=20 2.7.0