From patchwork Thu Feb 2 18:11:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 64185 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 78B423893673 for ; Thu, 2 Feb 2023 18:19:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78B423893673 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675361987; bh=nL3t/Vb1wus9jJSBkebYEj0KSZ0wG9m9limuqle5l3A=; 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=XVjpKEjepiJHlncNnrx7jXhXKhu1oVhdnpNHxGe5Zf/7tLyyNMYv1vILTPQhOXBAi nahihwIP4M3his4Dx26D8o3iE0qpBKL2FLRNA8jUP9yXEiV3AL7J49A3hW8BjIGeLs wpZcM/ldbieuHXv4lac3I/+3oNMnd6p/DrB3Pato= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id 50A553865488 for ; Thu, 2 Feb 2023 18:12:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 50A553865488 Received: by mail-oi1-x236.google.com with SMTP id s66so2130732oib.7 for ; Thu, 02 Feb 2023 10:12:52 -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=nL3t/Vb1wus9jJSBkebYEj0KSZ0wG9m9limuqle5l3A=; b=zdADwfjd3B1v9KnZkLYmLJJy3Pg0b2gxjoxExNjCYflBl9Y5IkruG7pWN4S+3XZ3u1 96p/Bh4Jj/fJHxtTXe4GKyQrNCdwve/5G6yrUqvZvDQAYrSEBBQMt8qXsB2FNcR+A66Q JGcy8KfGcxYKlK7uSHJc2ZcvYzZRo+/l4wok1e0fKDz8z7NDB+n6DZQm9eYmYsiDj53I ZizXnhZACo0pmww4oa/aZLmHQq2rYiM051BDeff7AeZc6soUy1YF5RYtPhQV5lICkq6F wPdEpcQ0vIb8dNeAmye4UZSK0WmtXxfCuTLxZZtCSmLQpbOzANp6UNT/bEPNJRtXayb7 bzHA== X-Gm-Message-State: AO0yUKWug8IGw3F4+5M1Rea0AX3QXuVvLCp2hKo9P89EvBMVjmxfZw/7 9RiXPA1i1IXhkH27rrCQYxMipCgM/Gm6oAKjZLI= X-Google-Smtp-Source: AK7set8Y52seN1bZO9YDOM1IhmtXdflzjWNf33157szXWQweSHsAje261uLyjgiW8+4LB9U0CJ6weQ== X-Received: by 2002:a05:6808:298:b0:378:8edd:1f7a with SMTP id z24-20020a056808029800b003788edd1f7amr1065240oic.42.1675361571067; Thu, 02 Feb 2023 10:12:51 -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.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 10:12:50 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Jeff Law , Xi Ruoyao , Noah Goldstein Subject: [PATCH v12 23/31] string: Hook up the default implementation on test-strnlen Date: Thu, 2 Feb 2023 15:11:41 -0300 Message-Id: <20230202181149.2181553-24-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" Also remove the SIMPLE_STRNLEN, which is not used anywhere. Reviewed-by: Richard Henderson --- string/test-strnlen.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/string/test-strnlen.c b/string/test-strnlen.c index 8b5372c3a1..ef73dd34f4 100644 --- a/string/test-strnlen.c +++ b/string/test-strnlen.c @@ -43,17 +43,30 @@ typedef size_t (*proto_t) (const CHAR *, size_t); -IMPL (STRNLEN, 1) - -/* Naive implementation to verify results. */ -size_t -SIMPLE_STRNLEN (const CHAR *s, size_t maxlen) -{ - size_t i; - - for (i = 0; i < maxlen && s[i]; ++i); - return i; -} +/* Also check the default implementation. */ +#undef STRNLEN +#ifndef WIDE +# define MEMCHR __memchr_default +# define weak_alias(a, b) +# define libc_hidden_def(a) +# define libc_hidden_builtin_def(a) +# include "string/memchr.c" +# undef STRNLEN +# define STRNLEN __strnlen_default +# define memchr __memchr_default +# include "string/strnlen.c" +IMPL (__strnlen_default, 1) +#else +# define WMEMCHR __wmemchr_default +# define weak_alias(a, b) +# define libc_hidden_def(a) +# define libc_hidden_weak(a) +# include "wcsmbs/wmemchr.c" +# define WCSNLEN __wcsnlen_default +# define wmemchr __wmemchr_default +# include "wcsmbs/wcsnlen.c" +IMPL (__wcsnlen_default, 1) +#endif static void do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len)