From: cem Date: Thu, 22 Oct 2015 20:28:37 +0000 (+0000) Subject: Add libkern ffsll() for parity with flsll() X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dfc679ec8ee31e6ea3042909242f76f28a8b97b2;p=people%2Fliuw%2Ffreebsd.git Add libkern ffsll() for parity with flsll() Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D3962 --- diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 33838ae146a..66c8daf7e94 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -120,6 +120,7 @@ libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/divdi3.c standard libkern/ffsl.c standard +libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index a3b649e588d..3a9a651d61c 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -82,6 +82,7 @@ kern/subr_dummy_vdso_tc.c standard libkern/bcmp.c standard libkern/ffs.c standard libkern/ffsl.c standard +libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 9f04beff101..ffe272e382d 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -530,6 +530,7 @@ kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip kern/subr_sfbuf.c standard libkern/divdi3.c standard +libkern/ffsll.c standard libkern/flsll.c standard libkern/memmove.c standard libkern/memset.c standard diff --git a/sys/conf/files.mips b/sys/conf/files.mips index d0dd23bd870..22b947265dc 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -56,6 +56,7 @@ kern/subr_sfbuf.c optional mips | mipsel | mipsn32 # gcc/clang runtime libkern/ffsl.c standard +libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 78f85baeb34..75269b48800 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -222,6 +222,7 @@ kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip kern/subr_sfbuf.c standard libkern/divdi3.c standard +libkern/ffsll.c standard libkern/flsll.c standard libkern/memmove.c standard libkern/memset.c standard diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index be17b6ee5bd..7aa9840881b 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -87,6 +87,7 @@ libkern/cmpdi2.c optional powerpc libkern/divdi3.c optional powerpc libkern/ffs.c standard libkern/ffsl.c standard +libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 0a0b721c91f..84f23ff4b05 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -67,6 +67,7 @@ kern/syscalls.c optional ktr kern/subr_sfbuf.c standard libkern/ffs.c standard libkern/ffsl.c standard +libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.c standard diff --git a/sys/libkern/ffsll.c b/sys/libkern/ffsll.c new file mode 100644 index 00000000000..3a610cd4e2f --- /dev/null +++ b/sys/libkern/ffsll.c @@ -0,0 +1,48 @@ +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +/* + * Find First Set bit + */ +int +ffsll(long long mask) +{ + int bit; + + if (mask == 0) + return (0); + for (bit = 1; !(mask & 1); bit++) + mask = (unsigned long long)mask >> 1; + return (bit); +} diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 7b0e0e42ec6..7484cdc9198 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -89,6 +89,9 @@ int ffs(int); #ifndef HAVE_INLINE_FFSL int ffsl(long); #endif +#ifndef HAVE_INLINE_FFSLL +int ffsll(long long); +#endif #ifndef HAVE_INLINE_FLS int fls(int); #endif