Changeset 38737 in project for release

Timestamp:

06/05/20 03:56:03 (2 months ago)

Author:

Kon Lovett

Message:

add 64bit uword-bitwise-count

File:

• release/5/bitwise-utils/trunk/bitwise-utils.scm (modified) (3 diffs)

release/5/bitwise-utils/trunk/bitwise-utils.scm

@@ -24 +24 @@
 ;promotional, or sales literature without prior written consent in
 ;each case.
-
-#>
-/* Number of 1 bits */
-static unsigned int
-C_uword_bits( C_uword n )
-{
-# define TWO( c )       ( ((C_uword) 1u) << (c))
-# define MASK( c )      (((C_uword) -1) / (TWO( TWO( c ) ) + 1u))
-# define COUNT( x, c )  ((x) & MASK( c )) + (((x) >> (TWO( c ))) & MASK( c ))
-
-  if (0 == n) return (unsigned int) 0;
-
-        n = COUNT( n, 0 );
-        n = COUNT( n, 1 );
-        n = COUNT( n, 2 );
-        n = COUNT( n, 3 );
-        n = COUNT( n, 4 );
-# ifdef C_SIXTY_FOUR
-        n = COUNT( n, 5 );
-# endif
-
-        return (unsigned int) n;
-
-# undef COUNT
-# undef MASK
-# undef TWO
-}
-<#
 
 (module bitwise-utils
@@ -70 +42 @@
 
 (import scheme)
-(import (only (chicken base) sub1 add1 fixnum? foldl cut))
+(import (only (chicken base) declare sub1 add1 fixnum? foldl cut))
 (import (chicken type))
 (import (chicken foreign))
@@ -148 +120 @@
 (define *uword-size* (foreign-type-size "C_uword"))
 
+#>
+#define TWO( c )       ( ((C_uword) 1u) << (c))
+#define MASK( c )      (((C_uword) -1) / (TWO( TWO( c ) ) + 1u))
+#define COUNT( x, c )  ((x) & MASK( c )) + (((x) >> (TWO( c ))) & MASK( c ))
+<#
+
 (cond-expand
   (64bit
     (define uword-bitwise-count
-      (foreign-lambda* unsigned-int ((integer64 n))
-        "return( C_uword_bits( (C_uword) n ) );")) )
+      (foreign-lambda* unsigned-int ((integer64 n)) "
+        if (0 == n) C_return( (unsigned int) 0 );
+        n = COUNT( n, 0 );
+        n = COUNT( n, 1 );
+        n = COUNT( n, 2 );
+        n = COUNT( n, 3 );
+        n = COUNT( n, 4 );
+        C_return( (unsigned int) COUNT( n, 5 ) );")) )
   (else ;32bit
     (define uword-bitwise-count
-      (foreign-lambda* unsigned-int ((integer32 n))
-        "return( C_uword_bits( (C_uword) n ) );")) ) )
+      (foreign-lambda* unsigned-int ((integer32 n)) "
+        if (0 == n) C_return( (unsigned int) 0 );
+        n = COUNT( n, 0 );
+        n = COUNT( n, 1 );
+        n = COUNT( n, 2 );
+        n = COUNT( n, 3 );
+        C_return( (unsigned int) COUNT( n, 4 ) );")) ) )
+
+#|
+#>
+#undef COUNT
+#undef MASK
+#undef TWO
+<#
+|#
 
 (define (integer->uwords n) (bitwise-split n (* 8 *uword-size*)))