Improve name: "count-one-bits" is better than "popcount".

* MODULES.html.sh: Update name.
* lib/popcount.h: Renamed lib/count-one-bits.h.
(popcount): Renamed count_one_bits.
(popcountl): Renamed count_one_bits_l.
(popcountll): Renamed count_one_bits_ll.
* m4/popcount.m4: Renamed m4/count-one-bits.m4.
* modules/popcount: Renamed module/count-one-bits.
* modules/popcount-tests: Renamed module/count-one-bits-tests.
* tests/test-popcount.c: Renamed tests/test-count-one-bits.c.

ChangeLog

@@ -1,3 +1,16 @@
+2007-07-24  Ben Pfaff  <blp@gnu.org>
+
+	Improve name: "count-one-bits" is better than "popcount".
+	* MODULES.html.sh: Update name.
+	* lib/popcount.h: Renamed lib/count-one-bits.h.
+	(popcount): Renamed count_one_bits.
+	(popcountl): Renamed count_one_bits_l.
+	(popcountll): Renamed count_one_bits_ll.
+	* m4/popcount.m4: Renamed m4/count-one-bits.m4.
+	* modules/popcount: Renamed module/count-one-bits.
+	* modules/popcount-tests: Renamed module/count-one-bits-tests.
+	* tests/test-popcount.c: Renamed tests/test-count-one-bits.c.
+
 2007-07-23  Ben Pfaff  <blp@gnu.org>
 
 	* lib/popcount.h (popcount32): Reduce size of constants, to allow

MODULES.html.sh

@@ -1609,9 +1609,9 @@ func_all_modules ()
   func_echo "$element"
 
   func_begin_table
+  func_module count-one-bits
   func_module gcd
   func_module minmax
-  func_module popcount
   func_end_table
 
   element="Environment variables <stdlib.h>"

lib/count-one-bits.h

@@ -1,4 +1,4 @@
-/* popcount.h -- population count
+/* count-one-bits.h -- counts the number of 1-bits in a word.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -17,29 +17,28 @@
 
 /* Written by Ben Pfaff.  */
 
-#ifndef POPCOUNT_H
+#ifndef COUNT_ONE_BITS_H
-# define POPCOUNT_H 1
+# define COUNT_ONE_BITS_H 1
 
 #include <limits.h>
 #include <stdlib.h>
 #include "verify.h"
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR >= 4)
-#define POPCOUNT_CALCULATION(NAME, TYPE)        \
+#define COUNT_ONE_BITS(BUILTIN, TYPE)              \
-        return __builtin_##NAME (x);
+        return BUILTIN (x);
 #else
-#define POPCOUNT_CALCULATION(NAME, TYPE)                        \
+#define COUNT_ONE_BITS(BUILTIN, TYPE)                           \
-        int pop = popcount32 (x);                               \
+        int count = count_one_bits_32 (x);                      \
         if (CHAR_BIT * sizeof (TYPE) > 32)                      \
-          pop += popcount32 (x >> 31 >> 1);                     \
+          count += count_one_bits_32 (x >> 31 >> 1);            \
         (void) verify_true (CHAR_BIT * sizeof (TYPE) <= 64);    \
-        return pop;
+        return count;
 
-/* Compute and return the population count of the low 32 bits of
+/* Compute and return the the number of 1-bits set in the least
-   X, that is, the number of 1-bits set in its least significant
+   significant 32 bits of X. */
-   32 bits. */
 static inline int
-popcount32 (unsigned int x)
+count_one_bits_32 (unsigned int x)
 {
   x = ((x & 0xaaaaaaaaU) >> 1) + (x & 0x55555555U);
   x = ((x & 0xccccccccU) >> 2) + (x & 0x33333333U);
@@ -49,30 +48,27 @@ popcount32 (unsigned int x)
 }
 #endif
 
-/* Compute and return the population count of X, that is, the
+/* Compute and return the number of 1-bits set in X. */
-   number of 1-bits set in X. */
 static inline int
-popcount (unsigned int x)
+count_one_bits (unsigned int x)
 {
-  POPCOUNT_CALCULATION (popcount, unsigned int);
+  COUNT_ONE_BITS (__builtin_popcount, unsigned int);
 }
 
-/* Compute and return the population count of X, that is, the
+/* Compute and return the number of 1-bits set in X. */
-   number of 1-bits set in X. */
 static inline int
-popcountl (unsigned long int x)
+count_one_bits_l (unsigned long int x)
 {
-  POPCOUNT_CALCULATION (popcountl, unsigned long int);
+  COUNT_ONE_BITS (__builtin_popcountl, unsigned long int);
 }
 
 #if HAVE_UNSIGNED_LONG_LONG_INT
-/* Compute and return the population count of X, that is, the
+/* Compute and return the number of 1-bits set in X. */
-   number of 1-bits set in X. */
 static inline int
-popcountll (unsigned long long int x)
+count_one_bits_ll (unsigned long long int x)
 {
-  POPCOUNT_CALCULATION (popcountll, unsigned long long int);
+  COUNT_ONE_BITS (__builtin_popcountll, unsigned long long int);
 }
 #endif
 
-#endif /* POPCOUNT_H */
+#endif /* COUNT_ONE_BITS_H */

m4/count-one-bits.m4

@@ -1,12 +1,12 @@
-# popcount.m4 serial 1
+# count-one-bits.m4 serial 1
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_POPCOUNT],
+AC_DEFUN([gl_COUNT_ONE_BITS],
 [
-  dnl We don't need (and can't compile) popcountll
+  dnl We don't need (and can't compile) count_one_bits_ll
   dnl unless the type 'unsigned long long int' exists.
   AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
 ])

modules/count-one-bits

@@ -1,21 +1,21 @@
 Description:
-Compute population count (number of 1-bits in a word).
+Counts the number of 1-bits in a word.
 
 Files:
-lib/popcount.h
+lib/count-one-bits.h
-m4/popcount.m4
+m4/count-one-bits.m4
 
 Depends-on:
 inline
 verify
 
 configure.ac:
-gl_POPCOUNT
+gl_COUNT_ONE_BITS
 
 Makefile.am:
 
 Include:
-"popcount.h"
+"count-one-bits.h"
 
 License:
 GPL

modules/count-one-bits-tests

@@ -0,0 +1,10 @@
+Files:
+tests/test-count-one-bits.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-count-one-bits
+check_PROGRAMS += test-count-one-bits

modules/popcount-tests

@@ -1,10 +0,0 @@
-Files:
-tests/test-popcount.c
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-popcount
-check_PROGRAMS += test-popcount

tests/test-count-one-bits.c

@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "popcount.h"
+#include "count-one-bits.h"
 
 #include <limits.h>
 #include <stdio.h>
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
 {
   int i, j;
 
-#define TEST_POPCOUNT(FUNC, TYPE, BITS, MAX, ONE)       \
+#define TEST_COUNT_ONE_BITS(FUNC, TYPE, BITS, MAX, ONE) \
   ASSERT (FUNC (0) == 0);                               \
   for (i = 0; i < BITS; i++)                            \
     {                                                   \
@@ -70,11 +70,12 @@ main (int argc, char *argv[])
     }                                                   \
   ASSERT (FUNC (MAX) == BITS);
 
-  TEST_POPCOUNT (popcount, unsigned int, UINT_BIT, UINT_MAX, 1U);
+  TEST_COUNT_ONE_BITS (count_one_bits, unsigned int, UINT_BIT, UINT_MAX, 1U);
-  TEST_POPCOUNT (popcountl, unsigned long int, ULONG_BIT, ULONG_MAX, 1UL);
+  TEST_COUNT_ONE_BITS (count_one_bits_l, unsigned long int,
+                       ULONG_BIT, ULONG_MAX, 1UL);
 #ifdef HAVE_UNSIGNED_LONG_LONG_INT
-  TEST_POPCOUNT (popcountll,
+  TEST_COUNT_ONE_BITS (count_one_bits_ll,
-                 unsigned long long int, ULLONG_BIT, ULLONG_MAX, 1ULL);
+                       unsigned long long int, ULLONG_BIT, ULLONG_MAX, 1ULL);
 #endif
 
   return 0;