From patchwork Fri Jan 20 21:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63513 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 6981F38AA241 for ; Fri, 20 Jan 2023 21:21:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6981F38AA241 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674249704; bh=mCE/YFqXL4Z7i4zGFW/a0I/C1EeOtkop6T1+5F6jnvE=; 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=RSCdHNAEo/uLtf7uUZKIgsyEzVVsqwupeVyG1ZI7pb7odrq2juF8sKQ0/LUJj8R52 paTdCDTT+amnat4Kr9OEG0HoghKTWXoCxe6Jo3QnPj8AFmXiaiwQRyLB5AiDTfkbnR EXnyKtB5Eo/Lo4MW+1aTa4VbW683pyawU9eDnXBs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 4602E38845F9 for ; Fri, 20 Jan 2023 21:17:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4602E38845F9 Received: by mail-ot1-x329.google.com with SMTP id d6-20020a056830138600b0068585c52f86so3823488otq.4 for ; Fri, 20 Jan 2023 13:17: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=mCE/YFqXL4Z7i4zGFW/a0I/C1EeOtkop6T1+5F6jnvE=; b=gULIv7W7na+ECbV3t68H5cUSCm1goy/ew0Ue1E313fnWQKhVuosqy9jYJL8ToNzXH8 LWjvRCY/M9k08VZqmWwYRluEQ+K51h4njC60BGkEiDg/J4JivE/Ro7RRZlC53uu4HJSi R0fBtKPTavWSj0E9fPWNdJc6mI2bLzZ+mYayO9A2Gy2en7LNUJkDom/sPRVJ7FR/Qmxa 1kWLiKW6olo9LrcpDCQdQzkmjGyB36yfb1mliThPykx8QxfMiCgNmDQwOWS3QBd8PpYW RWckjZU728qUCK8ViC95D/69AgvfjZAVhJp7mj0EbWX2ZRvxc+yinjx+w17xFNfxopgx y/Jw== X-Gm-Message-State: AFqh2kr6qfKsPk6EARZ0spxCt2iB2TSO407rGYM3pPBvX93YrAyddKfw N91TAcJxEmvZ4aQW7VqbOyWpAjVMNS1xVS8RiE8= X-Google-Smtp-Source: AMrXdXsqrkroJA0uVG8YwwAS9TRKMJGQRV0OmxVextPUX9eMZPelys4nBKqo2nA9AKbXKszbsFlZaw== X-Received: by 2002:a9d:6b03:0:b0:684:e93d:c06d with SMTP id g3-20020a9d6b03000000b00684e93dc06dmr7932327otp.17.1674249429010; Fri, 20 Jan 2023 13:17:09 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:f284:be2f:4ee5:d122]) by smtp.gmail.com with ESMTPSA id d18-20020a056830139200b00686467f920bsm6937432otq.48.2023.01.20.13.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 13:17:08 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Noah Goldstein Subject: [PATCH v10 18/24] string: Hook up the default implementation on test-strlen Date: Fri, 20 Jan 2023 18:16:16 -0300 Message-Id: <20230120211622.3445279-19-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120211622.3445279-1-adhemerval.zanella@linaro.org> References: <20230120211622.3445279-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 Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Also remove the simple_STRLEN and builtin_strlen, which are not used anywhere. --- string/test-strlen.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/string/test-strlen.c b/string/test-strlen.c index 81adf23737..0f98576f40 100644 --- a/string/test-strlen.c +++ b/string/test-strlen.c @@ -37,27 +37,24 @@ typedef size_t (*proto_t) (const CHAR *); -/* Naive implementation to verify results. */ -size_t -simple_STRLEN (const CHAR *s) -{ - const CHAR *p; - - for (p = s; *p; ++p); - return p - s; -} +IMPL (STRLEN, 1) +/* Also check the generic implementation. */ +#undef STRLEN +#undef weak_alias +#define weak_alias(a, b) +#undef libc_hidden_builtin_def +#define libc_hidden_builtin_def(a) #ifndef WIDE -size_t -builtin_strlen (const CHAR *p) -{ - return __builtin_strlen (p); -} -IMPL (builtin_strlen, 0) +# define STRLEN __strlen_default +# include "string/strlen.c" +IMPL (__strlen_default, 1) +#else +# define WCSLEN __wcslen_default +# include "wcsmbs/wcslen.c" +IMPL (__wcslen_default, 1) #endif -IMPL (STRLEN, 1) - static void do_one_test (impl_t *impl, const CHAR *s, size_t exp_len)