bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: new module memchr2


From: Eric Blake
Subject: Re: new module memchr2
Date: Sat, 01 Mar 2008 08:55:11 -0700
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080213 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Bruce Korb on 3/1/2008 7:57 AM:
|>  +  charmask1 |= charmask2 << 16;
|
| Have you tested this?  :(

Yes, but unfortunately, my tests didn't trigger every possible alignment.
~ Also, the tests made use of the GNU extension of adding int + void*,
which is invalid in C89.  Fixed thusly:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHyXxe84KuGfSFAYARAh2xAKCxcI4YZ8ZtOuUuopriMs9uivZ2EgCgraiD
9ATnEeG7tqvXXNBrYuPuCwU=
=HfOr
-----END PGP SIGNATURE-----
>From cdc13566c60ec33afcce63957c58df27016e6200 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 1 Mar 2008 08:40:22 -0700
Subject: [PATCH] Fix bugs in last patch.

* lib/memchr2.c (memchr2): Fix typo.
* tests/test-memchr2.c: Test previous bug, and don't use GNU
extension.
Reported by Bruce Korb.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog            |    6 +++++
 lib/memchr2.c        |    4 +-
 tests/test-memchr2.c |   58 +++++++++++++++++++++++++++++++++----------------
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d3e4ba..d660676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-03-01  Eric Blake  <address@hidden>
 
+       Fix bugs in last patch.
+       * lib/memchr2.c (memchr2): Fix typo.
+       * tests/test-memchr2.c: Test previous bug, and don't use GNU
+       extension.
+       Reported by Bruce Korb.
+
        New module 'memchr2'.
        * modules/memchr2: New file.
        * modules/memchr2-tests: Likewise.
diff --git a/lib/memchr2.c b/lib/memchr2.c
index 540ed9f..d5b0a78 100644
--- a/lib/memchr2.c
+++ b/lib/memchr2.c
@@ -81,8 +81,8 @@ memchr2 (void const *s, int c1_in, int c2_in, size_t n)
   magic_bits = 0xfefefefe;
   charmask1 = c1 | (c1 << 8);
   charmask2 = c2 | (c2 << 8);
-  charmask1 |= charmask2 << 16;
-  charmask1 |= charmask2 << 16;
+  charmask1 |= charmask1 << 16;
+  charmask2 |= charmask2 << 16;
 #if 0xffffffffU < UINTMAX_MAX
   magic_bits |= magic_bits << 32;
   charmask1 |= charmask1 << 32;
diff --git a/tests/test-memchr2.c b/tests/test-memchr2.c
index 68e8595..639ecd3 100644
--- a/tests/test-memchr2.c
+++ b/tests/test-memchr2.c
@@ -34,6 +34,10 @@
     }                                                                       \
   while (0)
 
+/* Calculating void * + int is not portable, so this wrapper converts
+   to char * to make the tests easier to write.  */
+#define MEMCHR2 (char *) memchr2
+
 int
 main ()
 {
@@ -48,27 +52,28 @@ main ()
   input[n - 2] = 'e';
   input[n - 1] = 'a';
 
-  ASSERT (memchr2 (input, 'a', 'b', n) == input);
-  ASSERT (memchr2 (input, 'b', 'a', n) == input);
+  /* Basic behavior tests.  */
+  ASSERT (MEMCHR2 (input, 'a', 'b', n) == input);
+  ASSERT (MEMCHR2 (input, 'b', 'a', n) == input);
 
-  ASSERT (memchr2 (input, 'a', 'b', 0) == NULL);
-  ASSERT (memchr2 (NULL, 'a', 'b', 0) == NULL);
+  ASSERT (MEMCHR2 (input, 'a', 'b', 0) == NULL);
+  ASSERT (MEMCHR2 (NULL, 'a', 'b', 0) == NULL);
 
-  ASSERT (memchr2 (input, 'b', 'd', n) == input + 1);
-  ASSERT (memchr2 (input + 2, 'b', 'd', n - 2) == input + 1026);
+  ASSERT (MEMCHR2 (input, 'b', 'd', n) == input + 1);
+  ASSERT (MEMCHR2 (input + 2, 'b', 'd', n - 2) == input + 1026);
 
-  ASSERT (memchr2 (input, 'd', 'e', n) == input + 1026);
-  ASSERT (memchr2 (input, 'e', 'd', n) == input + 1026);
+  ASSERT (MEMCHR2 (input, 'd', 'e', n) == input + 1026);
+  ASSERT (MEMCHR2 (input, 'e', 'd', n) == input + 1026);
 
-  ASSERT (memchr2 (input + 1, 'a', 'e', n - 1) == input + n - 2);
-  ASSERT (memchr2 (input + 1, 'e', 'a', n - 1) == input + n - 2);
+  ASSERT (MEMCHR2 (input + 1, 'a', 'e', n - 1) == input + n - 2);
+  ASSERT (MEMCHR2 (input + 1, 'e', 'a', n - 1) == input + n - 2);
 
-  ASSERT (memchr2 (input, 'f', 'g', n) == NULL);
-  ASSERT (memchr2 (input, 'f', '\0', n) == NULL);
+  ASSERT (MEMCHR2 (input, 'f', 'g', n) == NULL);
+  ASSERT (MEMCHR2 (input, 'f', '\0', n) == NULL);
 
-  ASSERT (memchr2 (input, 'a', 'a', n) == input);
-  ASSERT (memchr2 (input + 1, 'a', 'a', n - 1) == input + n - 1);
-  ASSERT (memchr2 (input, 'f', 'f', n) == NULL);
+  ASSERT (MEMCHR2 (input, 'a', 'a', n) == input);
+  ASSERT (MEMCHR2 (input + 1, 'a', 'a', n - 1) == input + n - 1);
+  ASSERT (MEMCHR2 (input, 'f', 'f', n) == NULL);
 
   /* Check that a very long haystack is handled quickly if one of the
      two bytes is found near the beginning.  */
@@ -76,10 +81,25 @@ main ()
     size_t repeat = 10000;
     for (; repeat > 0; repeat--)
       {
-       ASSERT (memchr2 (input, 'c', 'e', n) == input + 2);
-       ASSERT (memchr2 (input, 'e', 'c', n) == input + 2);
-       ASSERT (memchr2 (input, 'c', '\0', n) == input + 2);
-       ASSERT (memchr2 (input, '\0', 'c', n) == input + 2);
+       ASSERT (MEMCHR2 (input, 'c', 'e', n) == input + 2);
+       ASSERT (MEMCHR2 (input, 'e', 'c', n) == input + 2);
+       ASSERT (MEMCHR2 (input, 'c', '\0', n) == input + 2);
+       ASSERT (MEMCHR2 (input, '\0', 'c', n) == input + 2);
+      }
+  }
+
+  /* Alignment tests.  */
+  {
+    int i, j;
+    for (i = 0; i < 32; i++)
+      {
+       for (j = 0; j < 256; j++)
+         input[i + j] = j;
+       for (j = 0; j < 256; j++)
+         {
+           ASSERT (MEMCHR2 (input + i, j, 0xff, 256) == input + i + j);
+           ASSERT (MEMCHR2 (input + i, 0xff, j, 256) == input + i + j);
+         }
       }
   }
 
-- 
1.5.4


reply via email to

[Prev in Thread] Current Thread [Next in Thread]