From owner-dev-commits-src-main@freebsd.org Thu Jan 14 14:37:47 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BA1E4E475E; Thu, 14 Jan 2021 14:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGn3H0mgJz4Rgn; Thu, 14 Jan 2021 14:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CAFB39A8; Thu, 14 Jan 2021 14:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10EEbkf9055102; Thu, 14 Jan 2021 14:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10EEbkBx055101; Thu, 14 Jan 2021 14:37:46 GMT (envelope-from git) Date: Thu, 14 Jan 2021 14:37:46 GMT Message-Id: <202101141437.10EEbkBx055101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 37bd3aa6fac8 - main - amd64: use builtins for all ffs* variants MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37bd3aa6fac8ed2eda86e06f1aff854ed8b6acd8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2021 14:37:47 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=37bd3aa6fac8ed2eda86e06f1aff854ed8b6acd8 commit 37bd3aa6fac8ed2eda86e06f1aff854ed8b6acd8 Author: Mateusz Guzik AuthorDate: 2021-01-14 12:33:24 +0000 Commit: Mateusz Guzik CommitDate: 2021-01-14 14:37:22 +0000 amd64: use builtins for all ffs* variants While here even up whitespace. --- sys/amd64/include/cpufunc.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 2bf2339c7d6e..763ed2c64c8a 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -160,24 +160,13 @@ enable_intr(void) #ifdef _KERNEL #define HAVE_INLINE_FFS -#define ffs(x) __builtin_ffs(x) +#define ffs(x) __builtin_ffs(x) #define HAVE_INLINE_FFSL - -static __inline __pure2 int -ffsl(long mask) -{ - - return (__builtin_ffsl(mask)); -} +#define ffsl(x) __builtin_ffsl(x) #define HAVE_INLINE_FFSLL - -static __inline __pure2 int -ffsll(long long mask) -{ - return (ffsl((long)mask)); -} +#define ffsll(x) __builtin_ffsll(x) #define HAVE_INLINE_FLS