Skip to content

Commit ed31847

Browse files
committed
fix generic ctz/clz
1 parent c8607a8 commit ed31847

1 file changed

Lines changed: 34 additions & 23 deletions

File tree

‎include/mimalloc/internal.h‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -873,16 +873,18 @@ static inline size_t mi_ctz(uintptr_t x) {
873873
}
874874

875875
#else
876-
static inline size_t mi_ctz32(uint32_t x) {
876+
877+
static inline size_t mi_ctz_generic32(uint32_t x) {
877878
// de Bruijn multiplication, see <http://supertech.csail.mit.edu/papers/debruijn.pdf>
878-
static const unsigned char debruijn[32] = {
879+
static const uint8_t debruijn[32] = {
879880
0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
880881
31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
881882
};
882883
if (x==0) return 32;
883-
return debruijn[((x & -(int32_t)x) * 0x077CB531UL) >> 27];
884+
return debruijn[(uint32_t)((x & -(int32_t)x) * (uint32_t)(0x077CB531U)) >> 27];
884885
}
885-
static inline size_t mi_clz32(uint32_t x) {
886+
887+
static inline size_t mi_clz_generic32(uint32_t x) {
886888
// de Bruijn multiplication, see <http://supertech.csail.mit.edu/papers/debruijn.pdf>
887889
static const uint8_t debruijn[32] = {
888890
31, 22, 30, 21, 18, 10, 29, 2, 20, 17, 15, 13, 9, 6, 28, 1,
@@ -894,28 +896,37 @@ static inline size_t mi_clz32(uint32_t x) {
894896
x |= x >> 4;
895897
x |= x >> 8;
896898
x |= x >> 16;
897-
return debruijn[(uint32_t)(x * 0x07C4ACDDUL) >> 27];
899+
return debruijn[(uint32_t)(x * (uint32_t)(0x07C4ACDDU)) >> 27];
898900
}
899901

900-
static inline size_t mi_clz(uintptr_t x) {
901-
if (x==0) return MI_INTPTR_BITS;
902-
#if (MI_INTPTR_BITS <= 32)
903-
return mi_clz32((uint32_t)x);
904-
#else
905-
size_t count = mi_clz32((uint32_t)(x >> 32));
906-
if (count < 32) return count;
907-
return (32 + mi_clz32((uint32_t)x));
908-
#endif
902+
static inline size_t mi_ctz(size_t x) {
903+
if (x==0) return MI_SIZE_BITS;
904+
#if (MI_SIZE_BITS <= 32)
905+
return mi_ctz_generic32((uint32_t)x);
906+
#else
907+
const uint32_t lo = (uint32_t)x;
908+
if (lo != 0) {
909+
return mi_ctz_generic32(lo);
910+
}
911+
else {
912+
return (32 + mi_ctz_generic32((uint32_t)(x>>32)));
913+
}
914+
#endif
909915
}
910-
static inline size_t mi_ctz(uintptr_t x) {
911-
if (x==0) return MI_INTPTR_BITS;
912-
#if (MI_INTPTR_BITS <= 32)
913-
return mi_ctz32((uint32_t)x);
914-
#else
915-
size_t count = mi_ctz32((uint32_t)x);
916-
if (count < 32) return count;
917-
return (32 + mi_ctz32((uint32_t)(x>>32)));
918-
#endif
916+
917+
static inline size_t mi_clz(size_t x) {
918+
if (x==0) return MI_SIZE_BITS;
919+
#if (MI_SIZE_BITS <= 32)
920+
return mi_clz_generic32((uint32_t)x);
921+
#else
922+
const uint32_t hi = (uint32_t)(x>>32);
923+
if (hi != 0) {
924+
return mi_clz_generic32(hi);
925+
}
926+
else {
927+
return 32 + mi_clz_generic32((uint32_t)x);
928+
}
929+
#endif
919930
}
920931

921932
#endif

0 commit comments

Comments
 (0)