Move BitCount() macro from hamt.c to util.h.

svn path=/trunk/yasm/; revision=488

diff --git a/libyasm/hamt.c b/libyasm/hamt.c
index eb4df1f3c68fca15cbe9f302b775476be0339dab..1f56bd1bc9a0a6c5b4349710288d8e4938eb634a 100644 (file)
--- a/libyasm/hamt.c
+++ b/libyasm/hamt.c
@@ -58,19 +58,6 @@ struct HAMT {
     } while (0)
 #define GetSubTrie(n)          (HAMTNode *)((unsigned long)((n)->BaseValue)&~1UL)
 
-/* Bit-counting */
-#define SK5    0x55555555
-#define SK3    0x33333333
-#define SKF0   0x0F0F0F0F
-#define BitCount(d, s)         do {            \
-       d = s;                                  \
-       d -= (d>>1) & SK5;                      \
-       d = (d & SK3) + ((d>>2) & SK3);         \
-       d = (d & SKF0) + ((d>>4) & SKF0);       \
-       d += d>>16;                             \
-       d += d>>8;                              \
-    } while (0)
-
 static unsigned long
 HashKey(const char *key)
 {

diff --git a/libyasm/util.h b/libyasm/util.h
index abd7f53941bc79cbc4f087ee8e9eb9ce1d82db94..2dbd480f26ed19c96361efce3db2dd5ccbdb729a 100644 (file)
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -135,6 +135,19 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p);
 #endif
 
+/* Bit-counting: used primarily by HAMT but also in a few other places. */
+#define SK5    0x55555555
+#define SK3    0x33333333
+#define SKF0   0x0F0F0F0F
+#define BitCount(d, s)         do {            \
+       d = s;                                  \
+       d -= (d>>1) & SK5;                      \
+       d = (d & SK3) + ((d>>2) & SK3);         \
+       d = (d & SKF0) + ((d>>4) & SKF0);       \
+       d += d>>16;                             \
+       d += d>>8;                              \
+    } while (0)
+
 #include "coretype.h"
 
 #include "valparam.h"

diff --git a/src/hamt.c b/src/hamt.c
index eb4df1f3c68fca15cbe9f302b775476be0339dab..1f56bd1bc9a0a6c5b4349710288d8e4938eb634a 100644 (file)
--- a/src/hamt.c
+++ b/src/hamt.c
@@ -58,19 +58,6 @@ struct HAMT {
     } while (0)
 #define GetSubTrie(n)          (HAMTNode *)((unsigned long)((n)->BaseValue)&~1UL)
 
-/* Bit-counting */
-#define SK5    0x55555555
-#define SK3    0x33333333
-#define SKF0   0x0F0F0F0F
-#define BitCount(d, s)         do {            \
-       d = s;                                  \
-       d -= (d>>1) & SK5;                      \
-       d = (d & SK3) + ((d>>2) & SK3);         \
-       d = (d & SKF0) + ((d>>4) & SKF0);       \
-       d += d>>16;                             \
-       d += d>>8;                              \
-    } while (0)
-
 static unsigned long
 HashKey(const char *key)
 {

diff --git a/src/util.h b/src/util.h
index abd7f53941bc79cbc4f087ee8e9eb9ce1d82db94..2dbd480f26ed19c96361efce3db2dd5ccbdb729a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -135,6 +135,19 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p);
 #endif
 
+/* Bit-counting: used primarily by HAMT but also in a few other places. */
+#define SK5    0x55555555
+#define SK3    0x33333333
+#define SKF0   0x0F0F0F0F
+#define BitCount(d, s)         do {            \
+       d = s;                                  \
+       d -= (d>>1) & SK5;                      \
+       d = (d & SK3) + ((d>>2) & SK3);         \
+       d = (d & SKF0) + ((d>>4) & SKF0);       \
+       d += d>>16;                             \
+       d += d>>8;                              \
+    } while (0)
+
 #include "coretype.h"
 
 #include "valparam.h"

diff --git a/util.h b/util.h
index abd7f53941bc79cbc4f087ee8e9eb9ce1d82db94..2dbd480f26ed19c96361efce3db2dd5ccbdb729a 100644 (file)
--- a/util.h
+++ b/util.h
@@ -135,6 +135,19 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 void xfree(/*@only@*/ /*@out@*/ /*@null@*/ void *p);
 #endif
 
+/* Bit-counting: used primarily by HAMT but also in a few other places. */
+#define SK5    0x55555555
+#define SK3    0x33333333
+#define SKF0   0x0F0F0F0F
+#define BitCount(d, s)         do {            \
+       d = s;                                  \
+       d -= (d>>1) & SK5;                      \
+       d = (d & SK3) + ((d>>2) & SK3);         \
+       d = (d & SKF0) + ((d>>4) & SKF0);       \
+       d += d>>16;                             \
+       d += d>>8;                              \
+    } while (0)
+
 #include "coretype.h"
 
 #include "valparam.h"