Changeset 62836 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace

Timestamp:

Aug 1, 2016 4:50:21 PM (8 years ago)

Author:

vboxsync

Message:

dt_popc: Use ARCH_BITS and UINTxx_C() instead of _IPL32/_LP64 and UL/ULL.

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c

@@ -854 +854 @@
 dt_popc(ulong_t x)
 {
+#ifdef VBOX
+# if ARCH_BITS == 32
+    x = x - ((x >> 1) & UINT32_C(0x55555555));
+    x = (x & UINT32_C(0x33333333)) + ((x >> 2) & UINT32_C(0x33333333));
+    x = (x + (x >> 4)) & UINT32_C(0x0F0F0F0F);
+    x = x + (x >> 8);
+    x = x + (x >> 16);
+    return (x & 0x3F);
+# elif ARCH_BITS == 64
+    x = x - ((x >> 1) & UINT64_C(0x5555555555555555));
+    x = (x & UINT64_C(0x3333333333333333)) + ((x >> 2) & UINT64_C(0x3333333333333333));
+    x = (x + (x >> 4)) & UINT64_C(0x0F0F0F0F0F0F0F0F);
+    x = x + (x >> 8);
+    x = x + (x >> 16);
+    x = x + (x >> 32);
+    return (x & 0x7F);
+# else
+#  error "ARCH_BITS"
+# endif
+#else  /* !VBOX */
 #ifdef _ILP32
         x = x - ((x >> 1) & 0x55555555UL);
@@ -871 +891 @@
         return (x & 0x7F);
 #endif
+#endif /* !VBOX */
 }