From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 73BF63884575 for ; Fri, 20 Jan 2023 21:17:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73BF63884575 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x32c.google.com with SMTP id g2-20020a9d6b02000000b006864bf5e658so3836372otp.1 for ; Fri, 20 Jan 2023 13:17:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JRmZ2V3BqZ/QE9sTw/u6YDP8y8zkOWJrmkIgxVMn3T0=; b=E2kOpgQ1RHKC5WUnYfwnzyh96VvIykD02t1RGpX2jADPiViPXbhlHyxt7773YBkcj9 JcWMH+BmNrCPgCBUK7yrZge9UqDBjGSPkalgcnVL6P3iOzYkZFgudqHbWwFzHJ/x3bAV POm1Jerc507iHNNkfoPkPaQdr2oLJ9feX8S4Zbny1dLcybdvIM3WYksdbWMxeEVA8RPh gf7c11lcopPNoxt+/XqBsCxV8veLgMod4wOutqX/xi0aeTYEVqSeA93Q2bGAhmw5PmYw r/7uZW9xf3PqFGVhjyllbYlY7JLHOO4T6iXxAmgr1/Xkln0GEgOdHsp3ipF6U3tKOW0y 4nhw== 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=JRmZ2V3BqZ/QE9sTw/u6YDP8y8zkOWJrmkIgxVMn3T0=; b=ZOcNQDxpTtokTDTfmLst+cH6t4FKTJHLof8Lmsgdgp88ADSDD8df6s9gHubfnpLRGA E0/cueIhdobpJYBq+NY+I2awZrlfyUm3fpV5sWYPiS2id7Jsv1bjOpQvCQjObwjmQFCh RIgvylpdVb72c53QCvRDUG0ID6z/Yx6fwrEu5X1H4REnbsflXSZ5ygGkRpoTNqBbYI7o F2ntxPhymmlY9rTjvjWf1kw12MdUjEfABADUAJCAVPNiCiA3oaf4M/Tw8KgPHRiDYWy9 2ilZyPmr31q7GA89I8D4Mp+yWlN91RkBywxplp/NT22VpHw26WSX53nX/bQ8KwiIWFNn mBZg== X-Gm-Message-State: AFqh2kr2GkglxCOOAXrg3jHj/O1xKr4dVmryRZ0gkCMhWr9iRJikznsS iG8SiAAm8PRkh9bAPU3STWr5vzktnmr+/UzDWwg= X-Google-Smtp-Source: AMrXdXu3WQDKymJLuIPYC212aD/xRzx0FjY32HBcG3d/RDsoZC6ogiD7slReivMI8r54RUmCKQJs6w== X-Received: by 2002:a9d:624a:0:b0:66d:a5f7:9adc with SMTP id i10-20020a9d624a000000b0066da5f79adcmr9898960otk.2.1674249440099; Fri, 20 Jan 2023 13:17:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 13:17:19 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Richard Henderson , Noah Goldstein Subject: [PATCH v10 23/24] string: Hook up the default implementation on test-memchr Date: Fri, 20 Jan 2023 18:16:21 -0300 Message-Id: <20230120211622.3445279-24-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 Content-Transfer-Encoding: 8bit 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 List-Id: And remove SIMPLE_MEMCHR, which is not used anywhere. --- 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) -- 2.34.1