Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 3b0414362934a1f1fe258508a0f01fb01a42ad1e) +++ uspace/lib/c/Makefile (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) @@ -61,5 +61,4 @@ generic/bd.c \ generic/bd_srv.c \ - generic/bitops.c \ generic/cap.c \ generic/cfg.c \ Index: uspace/lib/c/generic/bitops.c =================================================================== --- uspace/lib/c/generic/bitops.c (revision 3b0414362934a1f1fe258508a0f01fb01a42ad1e) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * Copyright (c) 2013 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup libc - * @{ - */ - -#include - -int __popcountsi2(int a) -{ - int bits = 0; - for (unsigned int i = 0; i < sizeof(a) * 8; i++) { - if (((a >> i) & 1) != 0) { - bits++; - } - } - return bits; -} - -int __popcountdi2(long a) -{ - int bits = 0; - for (unsigned int i = 0; i < sizeof(a) * 8; i++) { - if (((a >> i) & 1) != 0) { - bits++; - } - } - return bits; -} - -/** @} - */ Index: uspace/lib/c/include/bitops.h =================================================================== --- uspace/lib/c/include/bitops.h (revision 3b0414362934a1f1fe258508a0f01fb01a42ad1e) +++ uspace/lib/c/include/bitops.h (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) @@ -107,7 +107,4 @@ } -extern int __popcountsi2(int); -extern int __popcountdi2(long); - #endif Index: uspace/lib/softint/Makefile =================================================================== --- uspace/lib/softint/Makefile (revision 3b0414362934a1f1fe258508a0f01fb01a42ad1e) +++ uspace/lib/softint/Makefile (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) @@ -35,4 +35,5 @@ SOURCES = \ + generic/bits.c \ generic/comparison.c \ generic/division.c \ Index: uspace/lib/softint/generic/bits.c =================================================================== --- uspace/lib/softint/generic/bits.c (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) +++ uspace/lib/softint/generic/bits.c (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup softint + * @{ + */ + +#include + +/** Compute number of set bits in a number. */ +int __popcountsi2(int a) +{ + int bits = 0; + for (unsigned int i = 0; i < sizeof(a) * 8; i++) { + if (((a >> i) & 1) != 0) { + bits++; + } + } + return bits; +} + +/** Compute number of set bits in a number. */ +int __popcountdi2(long a) +{ + int bits = 0; + for (unsigned int i = 0; i < sizeof(a) * 8; i++) { + if (((a >> i) & 1) != 0) { + bits++; + } + } + return bits; +} + +/** @} + */ Index: uspace/lib/softint/include/bits.h =================================================================== --- uspace/lib/softint/include/bits.h (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) +++ uspace/lib/softint/include/bits.h (revision 879d7745e8d519a39b5821d8a9a7c619de5973cd) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup softint + * @{ + */ +/** @file + */ + +#ifndef __SOFTINT_BITS_H_ +#define __SOFTINT_BITS_H_ + +extern int __popcountsi2(int); +extern int __popcountdi2(long); + + +#endif + +/** @} + */