From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org,
Richard Henderson <richard.henderson@linaro.org>,
Jeff Law <jeffreyalaw@gmail.com>, Xi Ruoyao <xry111@xry111.site>,
Noah Goldstein <goldstein.w.n@gmail.com>
Subject: [PATCH v12 31/31] string: Hook up the default implementation on test-strrchr
Date: Thu, 2 Feb 2023 15:11:49 -0300 [thread overview]
Message-ID: <20230202181149.2181553-32-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230202181149.2181553-1-adhemerval.zanella@linaro.org>
And remove SIMPLE_STRRCHR, which is not used anywhere.
---
string/test-strrchr.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/string/test-strrchr.c b/string/test-strrchr.c
index 2cd5de42cd..c979574c92 100644
--- a/string/test-strrchr.c
+++ b/string/test-strrchr.c
@@ -26,14 +26,12 @@
#ifdef WIDE
# include <wchar.h>
-# define SIMPLE_STRRCHR simple_wcsrchr
# define STRRCHR wcsrchr
# define CHAR wchar_t
# define UCHAR wchar_t
# define BIG_CHAR WCHAR_MAX
# define SMALL_CHAR 1273
#else
-# define SIMPLE_STRRCHR simple_strrchr
# define STRRCHR strrchr
# define CHAR char
# define UCHAR unsigned char
@@ -45,18 +43,30 @@ typedef CHAR *(*proto_t) (const CHAR *, int);
IMPL (STRRCHR, 1)
-/* Naive implementation to verify results. */
-CHAR *
-SIMPLE_STRRCHR (const CHAR *s, int c)
-{
- const CHAR *ret = NULL;
-
- for (; *s != '\0'; ++s)
- if (*s == (CHAR) c)
- ret = s;
-
- return (CHAR *) (c == '\0' ? s : ret);
-}
+/* Also check the generic implementation. */
+#undef STRRCHR
+#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 STRLEN __strlen_default
+# include "string/strlen.c"
+# define MEMRCHR __memrchr_default
+# include "string/memrchr.c"
+# define STRRCHR __strrchr_default
+# include "string/strrchr.c"
+# define STRRCHR_DEFAULT __strrchr_default
+#else
+# define WCSRCHR __wcsrchr_default
+# include "wcsmbs/wcsrchr.c"
+# define STRRCHR_DEFAULT __wcsrchr_default
+#endif
+IMPL (STRRCHR_DEFAULT, 1)
static void
do_one_test (impl_t *impl, const CHAR *s, int c, CHAR *exp_res)
--
2.34.1
next prev parent reply other threads:[~2023-02-02 18:13 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 18:11 [PATCH v12 00/31] Improve generic string routines Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 01/31] Parameterize op_t from memcopy.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 02/31] Parameterize OP_T_THRES " Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 03/31] Add string vectorized find and detection functions Adhemerval Zanella
2023-02-03 0:24 ` Richard Henderson
2023-02-03 12:39 ` Adhemerval Zanella Netto
2023-02-03 13:40 ` Adhemerval Zanella Netto
2023-02-04 2:54 ` Richard Henderson
2023-02-02 18:11 ` [PATCH v12 04/31] string: Improve generic strlen Adhemerval Zanella
2023-02-03 23:23 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 05/31] string: Improve generic strchrnul Adhemerval Zanella
2023-02-03 23:23 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 06/31] string: Improve generic strchr Adhemerval Zanella
2023-02-03 23:24 ` Noah Goldstein
2023-02-04 2:58 ` Richard Henderson
2023-02-06 13:07 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 07/31] string: Improve generic strcmp Adhemerval Zanella
2023-02-03 23:25 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 08/31] string: Improve generic strncmp Adhemerval Zanella
2023-02-03 0:34 ` Richard Henderson
2023-02-21 9:28 ` Szabolcs Nagy
2023-02-21 12:24 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 09/31] string: Improve generic stpcpy Adhemerval Zanella
2023-02-03 23:26 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 10/31] string: Improve generic strcpy Adhemerval Zanella
2023-02-03 23:26 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 11/31] string: Improve generic memchr Adhemerval Zanella
2023-02-03 23:26 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 12/31] string: Improve generic strnlen with memchr Adhemerval Zanella
2023-02-03 23:27 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 13/31] string: Improve generic memrchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 14/31] string: Improve generic strrchr with memrchr and strlen Adhemerval Zanella
2023-02-04 3:06 ` Richard Henderson
2023-02-06 14:01 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 15/31] hppa: Add memcopy.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 16/31] hppa: Add string-fza.h, string-fzc.h, and string-fzi.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 17/31] alpha: Add string-fza, string-fzb.h, string-fzi.h, and string-shift.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 18/31] arm: Add string-fza.h Adhemerval Zanella
2023-02-20 13:24 ` Szabolcs Nagy
2023-02-20 13:45 ` Szabolcs Nagy
2023-02-20 14:01 ` Adhemerval Zanella Netto
2023-02-20 16:12 ` Szabolcs Nagy
2023-02-02 18:11 ` [PATCH v12 19/31] powerpc: " Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 20/31] sh: Add string-fzb.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 21/31] riscv: Add string-fza.h and string-fzi.h Adhemerval Zanella
2023-02-03 19:47 ` Noah Goldstein
2023-02-06 16:14 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 22/31] string: Hook up the default implementation on test-strlen Adhemerval Zanella
2023-02-03 23:30 ` Noah Goldstein
2023-02-06 17:36 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 23/31] string: Hook up the default implementation on test-strnlen Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 24/31] string: Hook up the default implementation on test-strchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 25/31] string: Hook up the default implementation on test-strcmp Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 26/31] string: Hook up the default implementation on test-strncmp Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 27/31] string: Hook up the default implementation on test-stpcpy Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 28/31] string: Hook up the default implementation on test-strcpy Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 29/31] string: Hook up the default implementation on test-memchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 30/31] string: Hook up the default implementation on test-memrchr Adhemerval Zanella
2023-02-02 18:11 ` Adhemerval Zanella [this message]
2023-02-03 1:55 ` [PATCH v12 31/31] string: Hook up the default implementation on test-strrchr Richard Henderson
2023-02-02 18:17 ` [PATCH v12 00/31] Improve generic string routines Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230202181149.2181553-32-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=goldstein.w.n@gmail.com \
--cc=jeffreyalaw@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=richard.henderson@linaro.org \
--cc=xry111@xry111.site \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).