Changeset 1bc545c8942b47e034f824644b4834a991178afc

Timestamp:

05/01/08 06:49:56 (8 months ago)

Author:

krayouva <krayouva@…>

Parents:

75ff31607066f7bcb0b471c3652443662c0f985f

Children:

d0c804297259976d08303935ebc0332aec812118

git-committer:

krayouva <krayouva@gmail.com> / 2008-04-30T16:49:56Z-0400

Message:

* Added unit tests to new bit counting routines

- Also, the builtin routines aren't defined when the input is 0,

so added special casing in that case.

Location:

c

Files:

• include/global.h (modified) (2 diffs)
• test/test_global.c (modified) (2 diffs)

c/include/global.h

@@ -139 +139 @@
 {
 #ifdef __GNUC__
-    return __builtin_clz(word);
+    if (word)
+        return __builtin_clz(word);
+    return 32;
 #else
     static const int count_leading_zeros[] = {
@@ -180 +182 @@
 {
 #ifdef __GNUC__
-    return __builtin_ctz(word);
+    if (word)
+        return __builtin_ctz(word);
+    return 32;
 #else
     static const int count_trailing_zeros[] = {

c/test/test_global.c

@@ -84 +84 @@
 }
 
+static void test_count_leading_zeros(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal(32, frt_count_leading_zeros(0));
+    Aiequal(31, frt_count_leading_zeros(1));
+    Aiequal(30, frt_count_leading_zeros(2));
+    Aiequal(30, frt_count_leading_zeros(3));
+    Aiequal( 0, frt_count_leading_zeros(0xffffffff));
+}
+
+static void test_count_leading_ones(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal( 0, frt_count_leading_ones(0));
+    Aiequal( 0, frt_count_leading_ones(1));
+    Aiequal( 0, frt_count_leading_ones(2));
+    Aiequal( 0, frt_count_leading_ones(3));
+    Aiequal(32, frt_count_leading_ones(0xffffffff));
+}
+
+static void test_count_trailing_zeros(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal(32, frt_count_trailing_zeros(0));
+    Aiequal( 0, frt_count_trailing_zeros(1));
+    Aiequal( 1, frt_count_trailing_zeros(2));
+    Aiequal( 0, frt_count_trailing_zeros(3));
+    Aiequal( 4, frt_count_trailing_zeros(0xfffffff0));
+    Aiequal( 0, frt_count_trailing_zeros(0xffffffff));
+}
+
+static void test_count_trailing_ones(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal( 0, frt_count_trailing_ones(0));
+    Aiequal( 1, frt_count_trailing_ones(1));
+    Aiequal( 0, frt_count_trailing_ones(2));
+    Aiequal( 2, frt_count_trailing_ones(3));
+    Aiequal( 0, frt_count_trailing_ones(0xfffffff0));
+    Aiequal(32, frt_count_trailing_ones(0xffffffff));
+}
+
+static void test_count_zeros(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal(32, frt_count_zeros(0));
+    Aiequal(31, frt_count_zeros(1));
+    Aiequal(31, frt_count_zeros(2));
+    Aiequal(30, frt_count_zeros(3));
+    Aiequal( 4, frt_count_zeros(0xfffffff0));
+    Aiequal( 0, frt_count_zeros(0xffffffff));
+}
+
+static void test_count_ones(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal( 0, frt_count_ones(0));
+    Aiequal( 1, frt_count_ones(1));
+    Aiequal( 1, frt_count_ones(2));
+    Aiequal( 2, frt_count_ones(3));
+    Aiequal(28, frt_count_ones(0xfffffff0));
+    Aiequal(32, frt_count_ones(0xffffffff));
+}
+
+static void test_round2(TestCase *tc, void *data)
+{
+    (void)data;
+    Aiequal(   1, frt_round2(0));
+    Aiequal(   2, frt_round2(1));
+    Aiequal(   4, frt_round2(2));
+    Aiequal(   4, frt_round2(3));
+    Aiequal(1024, frt_round2(1023));
+    Aiequal(2048, frt_round2(1024));
+}
 
 TestSuite *ts_global(TestSuite *suite)
@@ -92 +166 @@
     tst_run_test(suite, test_stacktrace, NULL);
     tst_run_test(suite, test_sighandler, NULL);
-
+    tst_run_test(suite, test_count_leading_zeros, NULL);
+    tst_run_test(suite, test_count_leading_ones, NULL);
+    tst_run_test(suite, test_count_trailing_zeros, NULL);
+    tst_run_test(suite, test_count_trailing_ones, NULL);
+    tst_run_test(suite, test_count_zeros, NULL);
+    tst_run_test(suite, test_count_ones, NULL);
+    tst_run_test(suite, test_round2, NULL);
     return suite;
 }