From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id D6AA53858C33; Mon, 6 Feb 2023 20:15:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D6AA53858C33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675714528; bh=fThIWnQTh6ZeiSttVv46wRRPZOi8NqS84D+w+XgmOMI=; h=From:To:Subject:Date:From; b=LYK/+JvrEpo6U5lDOzPTBEav8EVdQEfCN6oY6rO+MtsPUqgTLQh3k/NEPQx29mCn3 8nFlPUagvHHdtPJy4YespLYIV+Ln6iAQHT1goqrbstG5+wcpgTinVaPTgtE0ePdwbY Te4AHyv70WGRt7tH/qcdb6zLEPhVJ9JbaXYHztD4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] string: Hook up the default implementation on test-memchr X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 3092c84900ec08c7c5b6608489df39e24888a563 X-Git-Newrev: 0dfa8617b5c3c2d2ef9e3366bec98b33828d8eae Message-Id: <20230206201528.D6AA53858C33@sourceware.org> Date: Mon, 6 Feb 2023 20:15:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0dfa8617b5c3c2d2ef9e3366bec98b33828d8eae commit 0dfa8617b5c3c2d2ef9e3366bec98b33828d8eae Author: Adhemerval Zanella Date: Tue Jan 17 10:14:03 2023 -0300 string: Hook up the default implementation on test-memchr And remove SIMPLE_MEMCHR, which is not used anywhere. Reviewed-by: Richard Henderson Diff: --- string/test-memchr.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/string/test-memchr.c b/string/test-memchr.c index 862094ef0b..0daecab537 100644 --- a/string/test-memchr.c +++ b/string/test-memchr.c @@ -30,7 +30,6 @@ # define MEMCHR memchr # define CHAR char # define UCHAR unsigned char -# define SIMPLE_MEMCHR simple_memchr # define BIG_CHAR CHAR_MAX # define SMALL_CHAR 127 #else @@ -38,7 +37,6 @@ # define MEMCHR wmemchr # define CHAR wchar_t # define UCHAR wchar_t -# define SIMPLE_MEMCHR simple_wmemchr # define BIG_CHAR WCHAR_MAX # define SMALL_CHAR 1273 #endif /* WIDE */ @@ -47,15 +45,26 @@ typedef CHAR *(*proto_t) (const CHAR *, int, size_t); IMPL (MEMCHR, 1) -/* Naive implementation to verify results. */ -CHAR * -SIMPLE_MEMCHR (const CHAR *s, int c, size_t n) -{ - while (n--) - if (*s++ == (CHAR) c) - return (CHAR *) s - 1; - return NULL; -} +/* Also check the generic implementation. */ +#undef MEMCHR +#undef weak_alias +#define weak_alias(a, b) +#undef libc_hidden_builtin_def +#define libc_hidden_builtin_def(a) +#undef libc_hidden_def +#define libc_hidden_def(a) +#undef libc_hidden_weak +#define libc_hidden_weak(a) +#ifndef WIDE +# define MEMCHR __memchr_default +# include "string/memchr.c" +# define MEMCHR_DEFAULT MEMCHR +#else +# define WMEMCHR __wmemchr_default +# include "wcsmbs/wmemchr.c" +# define MEMCHR_DEFAULT WMEMCHR +#endif +IMPL (MEMCHR_DEFAULT, 1) static void do_one_test (impl_t *impl, const CHAR *s, int c, size_t n, CHAR *exp_res)