walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up bit functions 

Compile all code-paths possible, to better catch errors.
Also enable MSVC ones on mingw which seems to support them.
This commit is contained in:
Behdad Esfahbod 2018-02-16 14:21:40 -08:00
parent 978ace6fbb
commit 864a2dddae
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/hb-private.hh
View File

@ -51,7 +51,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__MINGW32__)
#include <intrin.h> #include <intrin.h>
#endif #endif
@ -372,41 +372,52 @@ _hb_popcount (T mask)
static inline HB_CONST_FUNC unsigned int static inline HB_CONST_FUNC unsigned int
_hb_bit_storage (unsigned int number) _hb_bit_storage (unsigned int number)
{ {
if (unlikely (!number)) return 0;
#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__) #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
return likely (number) ? (sizeof (unsigned int) * 8 - __builtin_clz (number)) : 0; return sizeof (unsigned int) * 8 - __builtin_clz (number);
#elif defined(_MSC_VER) #endif
#if defined(_MSC_VER) || defined(__MINGW32__)
{
unsigned long where; unsigned long where;
if (_BitScanReverse (&where, number)) return 1 + where; _BitScanReverse (&where, number);
return 0; return 1 + where;
#else }
#endif
unsigned int n_bits = 0; unsigned int n_bits = 0;
while (number) { while (number) {
n_bits++; n_bits++;
number >>= 1; number >>= 1;
} }
return n_bits; return n_bits;
#endif
} }
/* Returns the number of zero bits in the least significant side of number */ /* Returns the number of zero bits in the least significant side of number */
static inline HB_CONST_FUNC unsigned int static inline HB_CONST_FUNC unsigned int
_hb_ctz (unsigned int number) _hb_ctz (unsigned int number)
{ {
#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
return likely (number) ? __builtin_ctz (number) : 0;
#elif defined(_MSC_VER)
unsigned long where;
if (_BitScanForward (&where, number)) return where;
return 0;
#else
unsigned int n_bits = 0;
if (unlikely (!number)) return 0; if (unlikely (!number)) return 0;
#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
return __builtin_ctz (number);
#endif
#if defined(_MSC_VER) || defined(__MINGW32__)
{
unsigned long where;
_BitScanForward (&where, number);
return where;
}
#endif
unsigned int n_bits = 0;
while (!(number & 1)) { while (!(number & 1)) {
n_bits++; n_bits++;
number >>= 1; number >>= 1;
} }
return n_bits; return n_bits;
#endif
} }
static inline bool static inline bool