incremental improvement in cleanliness

This commit is contained in:
G.E.
2024-03-12 12:37:08 +02:00
parent 523db6051d
commit d6d7a96c44
4 changed files with 16 additions and 8 deletions

View File

@@ -42,6 +42,10 @@
#elif defined(ARCH_PPC64EL)
#include "util/arch/ppc64el/ppc64el.h"
#endif
#ifdef __NetBSD__
#include <strings.h>
#define HAVE_LOCAL_POPCOUNT
#endif
#endif // UTIL_ARCH_X86_H_

View File

@@ -36,12 +36,8 @@
#include "ue2common.h"
#include "util/arch.h"
#ifdef __NetBSD__
#include <strings.h>
#endif
#ifndef __NetBSD__
#ifndef HAVE_LOCAL_POPCOUNT
static really_inline
u32 popcount32(u32 x) {
return __builtin_popcount(x);
@@ -56,7 +52,7 @@ u32 popcount32(u32 x) {
// return (((x + (x >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
// #endif
}
#endif /* __NetBSD__ */
#endif /* HAVE_LOCAL_POPCOUNT */
static really_inline
u32 popcount32x4(u32 const *x) {
@@ -67,7 +63,7 @@ u32 popcount32x4(u32 const *x) {
return sum;
}
#ifndef __NetBSD__
#ifndef HAVE_LOCAL_POPCOUNT
static really_inline
u32 popcount64(u64a x) {
return __builtin_popcountll(x);
@@ -88,7 +84,7 @@ u32 popcount64(u64a x) {
// return popcount32(x >> 32) + popcount32(x);
// #endif
}
#endif /* __NetBSD__ */
#endif /* HAVE_LOCAL_POPCOUNT */
static really_inline
u32 popcount64x4(u64a const *x) {