bruno/advent-of-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update lib from tools repo (some fixed for 32 bits)

Browse Source
This commit is contained in:
Bruno Raoult
2022-12-07 13:20:48 +01:00
parent ca06a4a355
commit 81a58c6266
3 changed files with 67 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
2022/include/bits.h
View File

@@ -10,8 +10,8 @@
* SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
*
*/
#ifndef BITS_H
#define BITS_H
#ifndef _BITS_H
#define _BITS_H
#include <stdint.h>
#include <stdbool.h>
@@ -25,10 +25,10 @@
#endif
/* no plan to support 32bits for now...
* #if __WORDSIZE != 64
* #error "Only 64 bits word size supported."
* #endif
*/
#if __WORDSIZE != 64
#error "Only 64 bits word size supported."
#endif
/* fixed-size types
*/
@@ -49,6 +49,51 @@ typedef unsigned int uint;
typedef unsigned short ushort;
typedef unsigned char uchar;
/* count set bits: 10101000 -> 3
* ^ ^ ^
*/
static __always_inline int popcount64(u64 n)
{
# if __has_builtin(__builtin_popcountl)
# ifdef DEBUG_BITS
log_f(1, "builtin.\n");
# endif
return __builtin_popcountl(n);
# else
# ifdef DEBUG_BITS
log_f(1, "emulated.\n");
# endif
int count = 0;
while (n) {
count++;
n &= (n - 1);
}
return count;
# endif
}
static __always_inline int popcount32(u32 n)
{
# if __has_builtin(__builtin_popcount)
# ifdef DEBUG_BITS
log_f(1, "builtin.\n");
# endif
return __builtin_popcount(n);
# else
# ifdef DEBUG_BITS
log_f(1, "emulated.\n");
# endif
int count = 0;
while (n) {
count++;
n &= (n - 1);
}
return count;
# endif
}
/* char is a special case, as it can be signed or unsigned
*/
typedef signed char schar;
@@ -74,7 +119,7 @@ static __always_inline int ctz64(u64 n)
# ifdef DEBUG_BITS
log_f(1, "emulated.\n");
# endif
return popcount64((n & −n) − 1);
return popcount64((n & -n) - 1);
# endif
}
@@ -96,7 +141,7 @@ static __always_inline int ctz32(u32 n)
# ifdef DEBUG_BITS
log_f(1, "emulated.\n");
# endif
return popcount32((n & −n) − 1);
return popcount32((n & -n) - 1);
# endif
}
@@ -218,51 +263,6 @@ static __always_inline uint ffs32(u32 n)
# endif
}
/* count set bits: 10101000 -> 3
* ^ ^ ^
*/
static __always_inline int popcount64(u64 n)
{
# if __has_builtin(__builtin_popcountl)
# ifdef DEBUG_BITS
log_f(1, "builtin.\n");
# endif
return __builtin_popcountl(n);
# else
# ifdef DEBUG_BITS
log_f(1, "emulated.\n");
# endif
int count = 0;
while (n) {
count++;
n &= (n - 1);
}
return count;
# endif
}
static __always_inline int popcount32(u32 n)
{
# if __has_builtin(__builtin_popcount)
# ifdef DEBUG_BITS
log_f(1, "builtin.\n");
# endif
return __builtin_popcount(n);
# else
# ifdef DEBUG_BITS
log_f(1, "emulated.\n");
# endif
int count = 0;
while (n) {
count++;
n &= (n - 1);
}
return count;
# endif
}
/* rolXX are taken from kernel's <linux/bitops.h> are are:
* SPDX-License-Identifier: GPL-2.0
*/
@@ -518,4 +518,4 @@ int __bits_per(unsigned long n)
#define bit_for_each32_2(pos, tmp, ul) \
for (tmp = ul, pos = ctz32(tmp); tmp; tmp ^= 1U << pos, pos = ctz32(tmp))
#endif /* BITS_H */
#endif /* _BITS_H */