From patchwork Fri Mar 9 20:20:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 883976 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="ebLRUh0m"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zyf3r5Ncpz9sd5 for ; Sat, 10 Mar 2018 07:24:08 +1100 (AEDT) Received: from localhost ([::1]:47910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euOYg-0003zt-F6 for incoming@patchwork.ozlabs.org; Fri, 09 Mar 2018 15:24:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euOWE-0002QP-FD for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:21:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euOWB-0004Z5-CE for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:21:34 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:33489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euOWB-0004Yy-4j for qemu-devel@nongnu.org; Fri, 09 Mar 2018 15:21:31 -0500 Received: by mail-pg0-x243.google.com with SMTP id g12so3979345pgs.0 for ; Fri, 09 Mar 2018 12:21:31 -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=2qrXCrLwZ5ceK1fsFL+MZTN4hiR5UXENuU8v3nJs1n0=; b=ebLRUh0m0WgyTWOC0V2SBXi4GjBzBD608d10BSKGd9iBGu98rgvyEaZJDqLvtFmb71 dkqUTN69w82WbsUCIQnEZPSpi0y+bSyjQZ74JgYwVa253UEHLTSjSS8UcQhyPAZA0xAz dRJ4q7YCjRr+OEoFSGbrVsD20K200ZixkBGHXsAMx5CMy//j6KGcE3kShtt8BqEMM+Zg CIbLH29FRYaE59jhngx7wocNaVur31/sjtpKM4vO8c3ma6XrRivw8xdvxtw5YGdggpCo S9kGy1xI+yVAnONB7POBhZtRbQwgzJET6OvYxdPoQQ7hQtdtaObCPXZS5vwHTq5tgxjB OGXA== 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=2qrXCrLwZ5ceK1fsFL+MZTN4hiR5UXENuU8v3nJs1n0=; b=BgAEeZw79kHtkuCShW6POwg7cBTRQqX/iTQ+tCbQURM0dZnuV62XhHrk4HtLZx9ap6 HHne+9CjEjICCbhWBK+zqLFoG8fQIs64VaKb8Ep2OW7zpME66/LI8/JljkjKbSUX1378 AtoRiPR+6Treh2IFjTXIx6snalPkeyIGVr2PzwaPGbAl0Y3V/+klq3RY5qWRdUHdy4VW jUupLMuI7noh9mEAG0XuL7WMEgAHFzP5opZsfxihfd8zdSz2lKdhnKfEEMgyB0jLpPPl bPHsHbUi72aOwsuljYLiDSP7WyiEAqcEK2WJBevzpDp6DeO5ZaZbYj3vucNcFBPOkwM+ 2dig== X-Gm-Message-State: AElRT7GmFXhPWVmwemlg/POInptHuN//fSs7Z0YG7ID8A9uJbPzsuKgh jCg3ncavG7sD56uPR1A0QAqQ19uX3bc= X-Google-Smtp-Source: AG47ELsDldkQ7H8HFKNcwEQ6rkDdGMT6hXka+kmdIKsUbLr32369WdlvPSTgSMUhLIr8nu3GeA1D1g== X-Received: by 10.101.67.70 with SMTP id k6mr6465713pgq.93.1520626889817; Fri, 09 Mar 2018 12:21:29 -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 p1sm3830097pgr.67.2018.03.09.12.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 12:21:29 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Sat, 10 Mar 2018 09:20:18 +1300 Message-Id: <1520626818-93348-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:c05::243 Subject: [Qemu-devel] [PATCH] RISC-V: Fix isa string logic bug, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Cc: Palmer Dabbelt Cc: Peter Maydell 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..f0d6d1d 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -391,7 +391,7 @@ static const TypeInfo riscv_cpu_type_info = { char *riscv_isa_string(RISCVCPU *cpu) { int i; - size_t maxlen = 5 + ctz32(cpu->env.misa); + size_t maxlen = 5 + __builtin_popcountll(cpu->env.misa); char *isa_string = g_new0(char, maxlen); snprintf(isa_string, maxlen, "rv%d", TARGET_LONG_BITS); for (i = 0; i < sizeof(riscv_exts); i++) {