From patchwork Thu Feb 2 18:11:46 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: 64190 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 D456B382E6B2 for ; Thu, 2 Feb 2023 18:22:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D456B382E6B2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675362153; bh=OL/nmtaNoSYIPMw63VnOCBfX+pGM1wE/+KBtx1BSXX0=; 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=L4W9olyPtbPQaKdDlPI7MJt+4ESm2ZTbblcGf0mRYP9G5trXvpWvqfq7a+96nUZAo E9GfctWeDmEMuG8oMefhqn3aWYc/zjbw1VOAFDC4cy8kyxMtq7JDEHgGUiwIV1Myw8 mNw3v2CzZysSFCaC9LVP6QAIr43x0+p1Jr7YY3N8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 7660B38493C9 for ; Thu, 2 Feb 2023 18:13:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7660B38493C9 Received: by mail-ot1-x32d.google.com with SMTP id r34-20020a05683044a200b0068d4a8a8d2dso686186otv.12 for ; Thu, 02 Feb 2023 10:13:03 -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=OL/nmtaNoSYIPMw63VnOCBfX+pGM1wE/+KBtx1BSXX0=; b=ONoS0BkssKqXOSCYq/KKhNna8PfazPLDf1YsO9/1dx2woaMPNsdHesY1nFJX4Dgxyx fyO5C5M59V4kNflMGzKOOScwNiExTS3QumYxQCgNNdJ2XDZzkcfhzVmAFPnorbuUbrco AwnsetigXYQ5cKcKn8PfQGvPIZfnbZULKFRz4blCqlbZ9gUt+Q1mktl91IqL+8J/ziOn XLSnvLpfDbMqudOo5EPNxeglcWEN1qctvObCg4HtjN8ux96v2ULYOrPscCGykfosYJOm kG6tPWMtOUF1Lu/FemJjjsh058CdCOkff19VnvA5aYL6aVYSIlJ05tXkuE0TEAGRRzi8 O9/Q== X-Gm-Message-State: AO0yUKWNuTmka3dVlFOr3cswWZ4cS4rUx1WWvyrCePX9XZt4+t3wFvBh h67OsEFzapuyTejvRcFnR6OmJZjA9D1v6WYNPts= X-Google-Smtp-Source: AK7set85rq8ai3NrL/1JUlW1Oy4OagDLQaVKfht1BLtk+a/6dKgDqRsGhBfmseNXAGlxxKDCf+mnRg== X-Received: by 2002:a05:6830:30a5:b0:68b:d40e:e21f with SMTP id g37-20020a05683030a500b0068bd40ee21fmr3292239ots.34.1675361582468; Thu, 02 Feb 2023 10:13:02 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 10:13:01 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Jeff Law , Xi Ruoyao , Noah Goldstein Subject: [PATCH v12 28/31] string: Hook up the default implementation on test-strcpy Date: Thu, 2 Feb 2023 15:11:46 -0300 Message-Id: <20230202181149.2181553-29-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 Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reviewed-by: Richard Henderson --- string/test-strcpy.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/string/test-strcpy.c b/string/test-strcpy.c index 8183c4b7f3..3e04c754d0 100644 --- a/string/test-strcpy.c +++ b/string/test-strcpy.c @@ -47,23 +47,37 @@ # endif # include "test-string.h" # ifndef WIDE -# define SIMPLE_STRCPY simple_strcpy # define STRCPY strcpy # else -# define SIMPLE_STRCPY simple_wcscpy # define STRCPY wcscpy # endif IMPL (STRCPY, 1) -/* Naive implementation to verify results. */ -CHAR * -SIMPLE_STRCPY (CHAR *dst, const CHAR *src) -{ - CHAR *ret = dst; - while ((*dst++ = *src++) != '\0'); - return ret; -} +/* Also check the generic implementation. */ +#undef STRCPY +#undef libc_hidden_builtin_def +#define libc_hidden_builtin_def(a) +#undef libc_hidden_def +#define libc_hidden_def(a) +#undef weak_alias +#define weak_alias(a,b) +#undef attribute_hidden +#define attribute_hidden +# ifndef WIDE +# define STPCPY __stpcpy_default +# include "string/stpcpy.c" +# define STRCPY __strcpy_default +# define __stpcpy __stpcpy_default +# include "string/strcpy.c" +IMPL (__strcpy_default, 1) +# else +# define __wcslen wcslen +# define __wmemcpy wmemcpy +# define WCSCPY __wcscpy_default +# include "wcsmbs/wcscpy.c" +IMPL (__wcscpy_default, 1) +# endif #endif typedef CHAR *(*proto_t) (CHAR *, const CHAR *);