Add fls() for non-constant values.

diff --git a/src/core/bitops.c b/src/core/bitops.c
new file mode 100644 (file)
index 0000000..75d57bf
--- /dev/null
+++ b/src/core/bitops.c
@@ -0,0 +1,10 @@
+#include <strings.h>
+
+int __flsl ( long x ) {
+       int r = 0;
+
+       for ( r = 0 ; x ; r++ ) {
+               x >>= 1;
+       }
+       return r;
+}

diff --git a/src/include/strings.h b/src/include/strings.h
index a087b1d..968a7c1 100644 (file)
--- a/src/include/strings.h
+++ b/src/include/strings.h
@@ -40,17 +40,13 @@ __constant_flsl ( unsigned long x ) {
        return r;
 }
 
        return r;
 }
 

-#define __constant_fls(x) __constant_flsl(x)
-

 /* We don't actually have these functions yet */
 /* We don't actually have these functions yet */

-extern int __fls ( int x );

 extern int __flsl ( long x );
 
 #define flsl( x ) \
        ( __builtin_constant_p ( x ) ? __constant_flsl ( x ) : __flsl ( x ) )
 
 extern int __flsl ( long x );
 
 #define flsl( x ) \
        ( __builtin_constant_p ( x ) ? __constant_flsl ( x ) : __flsl ( x ) )
 

-#define fls( x ) \
-       ( __builtin_constant_p ( x ) ? __constant_fls ( x ) : __fls ( x ) )
+#define fls( x ) flsl ( x )

 
 extern int strcasecmp ( const char *s1, const char *s2 );
 
 
 extern int strcasecmp ( const char *s1, const char *s2 );