From patchwork Thu Feb 2 18:11:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 64176 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CE1DE3846054 for ; Thu, 2 Feb 2023 18:15:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE1DE3846054 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675361734; bh=84s2cdQFH8ThfW1Y+HDXwNcet8gOIqmO0wxEXttSTec=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=NCnfItAZoGtz/+O8+qy+CyEm0BAjaGxC7/BGWjEywUP0mSf2HmPkQmC9/i2FlQFb2 yxYCsV3XHPCRp5pnPnHbJW55pDwGl4/aZHEeo9Df4awcX5vxKTYZfUl2OXtWjKFX9b nkj2wPzBVYQ6jYX8dW7iu8rtvBCo25GnNlwQftlk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) by sourceware.org (Postfix) with ESMTPS id 6BB9D3882117 for ; Thu, 2 Feb 2023 18:13:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6BB9D3882117 Received: by mail-oi1-x229.google.com with SMTP id bj22so2109308oib.11 for ; Thu, 02 Feb 2023 10:13:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=84s2cdQFH8ThfW1Y+HDXwNcet8gOIqmO0wxEXttSTec=; b=aoh2of3jChOVDbCUOmniKlHRTLws3pv1EDOn/J1bGrE5XVQ8yB1g0NE+u8Vpof7XcN NJ8dXZBo758mTN6BLV7YC2abWe7ZqVqN87aV5rfirB1zIyJJwxtGEh0Jn6qZ7OegTCBh buoiX95R0BDFEOFAuZtZ+Z98DHnfG0B70vqxuKNRjIpJs4ypXbjR0x0m3t5rwUki0zhn OSxWH4dXcsyzW4SUVhTgfONUK8Ox9t0vEW5xRxn1quPNeD71HUYIWeXLhTw51mIbqvg2 M6M0KtUyuWhQQydmhyBS52HmJ6bBaYdhg8QiBacOoCqnczDEbazBJxTKGFHjIfNHmu0p Yvpg== X-Gm-Message-State: AO0yUKUSHG7e9apmrUjAFpWOhCGOojgt8sY8xXhrzGV+zJU4U1Iazahx XqopOhwzOZEvrk2uW+wOndPoWz4aJu2H29/p/2U= X-Google-Smtp-Source: AK7set+URSMAQoTjSP2tOi0tlpV6v7G6nr4vA5qZa8ZfjYx6fXZgMYr2pxoZXPpv9tOkFll93yTzng== X-Received: by 2002:a05:6808:190f:b0:360:e80e:26a9 with SMTP id bf15-20020a056808190f00b00360e80e26a9mr4250141oib.12.1675361589233; Thu, 02 Feb 2023 10:13:09 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:1887:da12:b9d3:2162:a28c]) by smtp.gmail.com with ESMTPSA id ci10-20020a05683063ca00b00684a10970adsm126689otb.16.2023.02.02.10.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 10:13:08 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Jeff Law , Xi Ruoyao , Noah Goldstein Subject: [PATCH v12 31/31] string: Hook up the default implementation on test-strrchr Date: Thu, 2 Feb 2023 15:11:49 -0300 Message-Id: <20230202181149.2181553-32-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202181149.2181553-1-adhemerval.zanella@linaro.org> References: <20230202181149.2181553-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And remove SIMPLE_STRRCHR, which is not used anywhere. Reviewed-by: Richard Henderson --- 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 -# 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)