From patchwork Wed Mar 27 18:45:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 161268 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp6828972jan; Wed, 27 Mar 2019 11:47:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqy3ZQ79tp+E6leVxGpnq4x7IhHteM4X7Aw/Cfwoy3r3nmGE69nH/8ys3p8Vr1fFu0BrQlJl X-Received: by 2002:a81:5f86:: with SMTP id t128mr33718526ywb.467.1553712448349; Wed, 27 Mar 2019 11:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553712448; cv=none; d=google.com; s=arc-20160816; b=ES7cCsnUFlQpTIhC9WnDDRXYMEifNhJ+ZeE2SIpcPVZycR5qmKzSs8BWDzty0+z/+U xzjQeYPddaZXy2rsL5iKE0lkoOsQ93pMvBzPmpCIU9/7eYgKzvdgZeH9nuzeABcPVVVX yLx0aJh5iHzS0UO4SShF4yzcwAISYGkXVZTY8bQL9tCfImB1DTb1Plj1YWeLHEF6qDcd 9WEPPJcOXlHJcp9exjyXqZZkrMxdtsnnhxjAujv7h05cl1/VnReM/5VRM4dv1X7uOMJC H6d9aGtdLR1/AuOrmtryRLYyj0I+TnXJP9tX5blkuNMhrhU5BbckCkn+qGq9dDVxWk0c OpUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=zdfoeIptthxFyG8tddWwvRsGYpLogftZmy59HmF0pYQ=; b=rQuoxHlIZmfcI1zS/hGuHE79aCQYpHwnAaIqnFxTcQ+P0TZqB8lXQqYMsGjq3obdIv wly9T4Qz5e7+8xVaN2nTxL+EWmXbCkAISV9n8VsVAt0SkAHnX6pFkdrbRFuuGIYcyB2g SuH8k+MZJRNAd2NjNbGaLxHKqZ1i6nPZr8gqXQECOY3HBmDkKFASrLBUXcYStNxHQxUN 02IdD/6jKRN0jgF9WsGWXCMvNy6h0RL9UV/LrKzICn6g6nFKzCBI2ubOqkcatAiuUaTN /bTTCG/NJaQC3/b82fnH4AqAYwRprAxFP2A2WNVHSBWazWcH3ElNb+fR5CgbEg6tOoYy QXsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id o129si13840762ywe.81.2019.03.27.11.47.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Mar 2019 11:47:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h9DYe-0001jR-1G; Wed, 27 Mar 2019 18:45:52 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h9DYd-0001jI-0n for xen-devel@lists.xenproject.org; Wed, 27 Mar 2019 18:45:51 +0000 X-Inumbo-ID: 8a9984f2-50c0-11e9-bc90-bc764e045a96 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 8a9984f2-50c0-11e9-bc90-bc764e045a96; Wed, 27 Mar 2019 18:45:50 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C1B68A78; Wed, 27 Mar 2019 11:45:49 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8E6753F557; Wed, 27 Mar 2019 11:45:48 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 27 Mar 2019 18:45:24 +0000 Message-Id: <20190327184531.30986-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190327184531.30986-1-julien.grall@arm.com> References: <20190327184531.30986-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 05/12] xen/arm64: bitops: Match the register size with the value size in flsl X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Artem_Mygaiev@epam.com, Oleksandr_Tyshchenko@epam.com, Julien Grall , sstabellini@kernel.org, Andrii_Anisov@epam.com MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Clang is pickier than GCC for the register size in asm statement. It expects the register size to match the value size. The instruction clz is expecting the two operands to be the same size (i.e 32-bit or 64-bit). As the flsl function is dealing with 64-bit value, we need to make the destination variable 64-bit as well. While at it, add a newline before the return statement. Signed-off-by: Julien Grall --- xen/include/asm-arm/arm64/bitops.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/asm-arm/arm64/bitops.h b/xen/include/asm-arm/arm64/bitops.h index 6bf1922680..05045f1109 100644 --- a/xen/include/asm-arm/arm64/bitops.h +++ b/xen/include/asm-arm/arm64/bitops.h @@ -34,12 +34,13 @@ static /*__*/always_inline unsigned long __ffs(unsigned long word) static inline int flsl(unsigned long x) { - int ret; + uint64_t ret; if (__builtin_constant_p(x)) return generic_flsl(x); asm("clz\t%0, %1" : "=r" (ret) : "r" (x)); + return BITS_PER_LONG - ret; }