From 9b431e31e15b4620c862208c1079fdace62313aa Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 17 Mar 1996 12:36:52 +0000 Subject: Sun Mar 17 07:19:33 1996 Roland McGrath * db/Makefile (CFLAGS-hash_func.c): New variable; pass -Wno-unused. (CFLAGS): Append -Wno-unitialized. * sysdeps/alpha/memchr.S: New file. * sysdeps/alpha/memchr.c: Obsolete file removed. * string/tester.c: Soup up memchr tests. --- ChangeLog | 10 ++++++++-- db/Makefile | 7 +++++++ string/tester.c | 25 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d3da3f175..b8d5fef5e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 17 07:19:33 1996 Roland McGrath + + * db/Makefile (CFLAGS-hash_func.c): New variable; pass -Wno-unused. + (CFLAGS): Append -Wno-unitialized. + Sat Mar 16 20:58:43 1996 Roland McGrath * stdlib/erand48_r.c: Use FP division by powers of two to distribute @@ -5,8 +10,9 @@ Sat Mar 16 20:58:43 1996 Roland McGrath Sat Mar 16 20:08:22 1996 David Mosberger-Tang - * sysdeps/alpha/memchr.S: new file. - * sysdeps/alpha/memchr.c: obsolete file removed. + * sysdeps/alpha/memchr.S: New file. + * sysdeps/alpha/memchr.c: Obsolete file removed. + * string/tester.c: Soup up memchr tests. Sat Mar 16 16:26:09 1996 Roland McGrath diff --git a/db/Makefile b/db/Makefile index e41614af38..48e2570c6c 100644 --- a/db/Makefile +++ b/db/Makefile @@ -26,3 +26,10 @@ distribute := compat.h \ include ../Rules CPPFLAGS += -D__DBINTERFACE_PRIVATE + +# This file defines some static functions for alternative hash algorithms +# that are not actually used. +CFLAGS-hash_func.c := -Wno-unused + +# The db code outsmarts the compiler frequently. +override CFLAGS += -Wno-uninitialized diff --git a/string/tester.c b/string/tester.c index 34d4e1c8e0..d826ff7beb 100644 --- a/string/tester.c +++ b/string/tester.c @@ -375,6 +375,7 @@ DEFUN(main, (argc, argv), int argc AND char **argv) check(memchr("abcd", 'z', 4) == NULL, 1); /* Not found. */ (void) strcpy(one, "abcd"); check(memchr(one, 'c', 4) == one+2, 2); /* Basic test. */ + check(memchr(one, ~0xff|'c', 4) == one+2, 2); /* ignore highorder bits. */ check(memchr(one, 'd', 4) == one+3, 3); /* End of string. */ check(memchr(one, 'a', 4) == one, 4); /* Beginning. */ check(memchr(one, '\0', 5) == one+4, 5); /* Finding NUL. */ @@ -385,6 +386,30 @@ DEFUN(main, (argc, argv), int argc AND char **argv) (void) strcpy(one, "a\203b"); check(memchr(one, 0203, 3) == one+1, 9); /* Unsignedness. */ + /* now test all possible alignment and length combinations to catch + bugs due to unrolled loops (assuming unrolling is limited to no + more than 128 byte chunks: */ + { + char buf[128 + sizeof(long)]; + long align, len, i, pos; + + for (align = 0; align < sizeof(long); ++align) { + for (len = 0; len < sizeof(buf) - align; ++len) { + for (i = 0; i < len; ++i) { + buf[align + i] = 'x'; /* don't depend on memset... */ + } + for (pos = 0; pos < len; ++pos) { +#if 0 + printf("align %d, len %d, pos %d\n", align, len, pos); +#endif + check(memchr(buf + align, 'x', len) == buf + align + pos, 10); + check(memchr(buf + align, 'x', pos) == NULL, 11); + buf[align + pos] = '-'; + } + } + } + } + /* memcpy - need not work for overlap. */ it = "memcpy"; check(memcpy(one, "abc", 4) == one, 1); /* Returned value. */ -- cgit 1.4.1