From patchwork Wed Feb 1 17:04:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 64112 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 D26D73850408 for ; Wed, 1 Feb 2023 17:09:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D26D73850408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675271389; bh=fCZ5kyOC1eDtCiQTk6o9DXr/dvyLVONJ0Q+KRkDmCD4=; 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=vuTKZKDC4/j7e10CXKKHFRVWlOsBophXzPMRAonTKsmjfJ0pv6dGoCdbFrSqeVLxk G4+yTkj5CruMXDquphz/UabyThFxfm3DS4wT22wuGkE8XS9VD+APt6+FboipflhKEQ bzIXlyBKYs0PdPAzg6edmteeKrEAS02E66x3+Ydc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 C407A3858407 for ; Wed, 1 Feb 2023 17:05:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C407A3858407 Received: by mail-ot1-x32c.google.com with SMTP id k91-20020a9d19e4000000b0068bca1294aaso3478311otk.8 for ; Wed, 01 Feb 2023 09:05:21 -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=fCZ5kyOC1eDtCiQTk6o9DXr/dvyLVONJ0Q+KRkDmCD4=; b=WQn3tjJvIbQRmYVkiOtGbKokkWSwqZQu1WTWF3QLSoO2yxXp9vKsMDxF1tZtv0AjFM dQhRlSjEp6msHzdUzaxRIth/uGiaJ0+nDb+W3vamZnlQajCJNbInReiKvtqa+VIYlL0l AsL+3oZdPER7dxN9bnniob3Redax7Lp93/F/n4JeQenMmThk9rwD9iIHtGpC6TPm5GYV n8L3ox4/fPUz3CwVtdbubUbSvVy86285OlxcoDOxIX1aRvozS4DCbhnjLb5WT1Ey6Wsx LS/rEZENbH17dNIBXp2GPBGiE3T0hU7oSJkrGKxx9I8oL8uW2PiCmAqmJ9yFoEzvguQi l1vg== X-Gm-Message-State: AO0yUKUlfyaljxghgAuqygF89fclDQdpbvTWyg8tRrUZwUabQSsPdhiS WwSJGH+fHztXhMIKnOrztOvDaYDrfTAEfaEtdQs= X-Google-Smtp-Source: AK7set9w9zmfoseIPF+60r7F9G8Li4UP8xcSY7fjFVHOWCv+x9H+k6nA1BXzG+xz5LoomXSLgvZK4Q== X-Received: by 2002:a9d:7e8d:0:b0:68d:3fc8:7c13 with SMTP id m13-20020a9d7e8d000000b0068d3fc87c13mr915757otp.14.1675271120898; Wed, 01 Feb 2023 09:05:20 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:1887:d2ed:98c2:d2cc:bf06]) by smtp.gmail.com with ESMTPSA id b17-20020a056830311100b006863ccbf067sm8077090ots.74.2023.02.01.09.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 09:05:20 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Noah Goldstein , Jeff Law , Xi Ruoyao Subject: [PATCH v11 27/29] string: Hook up the default implementation on test-strcpy Date: Wed, 1 Feb 2023 14:04:04 -0300 Message-Id: <20230201170406.303978-28-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230201170406.303978-1-adhemerval.zanella@linaro.org> References: <20230201170406.303978-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" --- string/test-strcpy.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) Reviewed-by: Richard Henderson 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 *);