From patchwork Tue Feb 20 20:04:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 86081 X-Patchwork-Delegate: dj@redhat.com 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 AD6F93858C54 for ; Tue, 20 Feb 2024 20:05:36 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by sourceware.org (Postfix) with ESMTPS id D98E63858D35 for ; Tue, 20 Feb 2024 20:04:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D98E63858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D98E63858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708459506; cv=none; b=gbgMBxoZOoAhPXF+JoDp9uVsE8F9D7wgBSFr2iBSYsWrhxrfv4nnLEk6PNrlPQZSyJrznH4nwookd5LhzTGwgTYT2LW8UYdcH/VB4ADappEvKbTXqItFHp0CuN2dciQrCXWAXuhKCO7tEtCp3+udRSw5tdsXfH92yOpKKMRIQSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708459506; c=relaxed/simple; bh=xkjpUkRu1bwov7LQdBWiuHvi1i4m642IRiLKB8NfokE=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=rhFyHfPKhdlodeUjl8MUMVaenn9PFNEjuBJ0t1bW2GzpKUo3H2CRE9KznCQs4ZaauMS4FrXkj49deH/ifjJhls1VL1khHZr2pI5b2jex/C1IAOBs0KYy8c9EnQci7Tjqt8kmKbnh3sxcVaHWHGUl/7JG4iDUX0+oxpWrhFkSEQg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2999329dfe7so2345908a91.0 for ; Tue, 20 Feb 2024 12:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708459494; x=1709064294; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oioKGZxyR76jKGk0i5XDdgxGe3BOVWxrZW3jeicT1Ww=; b=oPVpGuLaJvSJuKBSJmxjyL2Wq+gMmOM41nAarRRgMgM6+++LmWO6z52o7l2SbW+Rvf t/iA7u9wd0bqXF+kdmp94x7dw9FciWgsYvpGtDGPv4KvM665dAxJd8ylwhAkv4emkqXM yZ88FngPG4DkkSrqJS5HplJAjrrTawECu07QVEoTuNIv/Yv3+AtSoWIB8rxl1GHCbvG2 j9/743e0WA385zQXqSpK27UXKm55ZJdaqRlT4ObGiuCSXwbD4bafcjXcNlm+t6UmmB8K JZAzzFpVaGUVgz80UnjF3Co3EjLR4TgRQATD3M75fw9yEsDmCHQLn0b+YCbQyp4uK332 8tuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708459494; x=1709064294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oioKGZxyR76jKGk0i5XDdgxGe3BOVWxrZW3jeicT1Ww=; b=FxhlABTcs0XyQQrvXQCv1gVyGuduPz1bvX29Uz4C+p1eHVGIe5JQynUZnHOmCFzwOp YruPAtH6Bs7cHlaA4xImNUyzdyHGnOo+brhKgfjJDANghdG1EgSNHg230XG+d4y0+7L5 kL3EBW+iMAvcrpf4n9LF53BnqC6frWcT/D191Pl/SDuJesmOnfeGIRFzNGxFDXOFj+I/ tsb7+KPz+TwMvEfW7kxrvUVuKG9/BDUJ9IJIgIKzQDhVEw832GwyJyO/7ZON67W9BdZt fareL2LoRnZu/u4Ma5R7AVLuA7+vah/qBoEOp57O2cqD3tJuXz6Pmn5Y+bpoYOUX2sJV US3w== X-Gm-Message-State: AOJu0YwnWQ2dQNAdkZjpI/xGv/zEPL/d/h4nt5knZUJ7I1nEdQzoere0 bs6K9vQVce2WOWuYOQN5LhNdn3UrP5C5XuuvVoNmfIuGbePdFFtM8M6/9dRKGySAu2FHO8PM1xb T X-Google-Smtp-Source: AGHT+IHYkoj+7w8WwbBA6azHopDSwIiy9veE3v2ch1P57cDzZouRg26Fm81k0Fs6m0kOvYlT2htKZQ== X-Received: by 2002:a17:90a:4ce1:b0:298:d301:db69 with SMTP id k88-20020a17090a4ce100b00298d301db69mr14536359pjh.33.1708459493605; Tue, 20 Feb 2024 12:04:53 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c0:8177:59a3:f5e3:1b0a:262]) by smtp.gmail.com with ESMTPSA id qn3-20020a17090b3d4300b00298f88c3e48sm42324pjb.11.2024.02.20.12.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:04:53 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Noah Goldstein , Alexander Monakov Subject: [PATCH v2 2/3] wcsmbs: Add test-wcsstr Date: Tue, 20 Feb 2024 17:04:44 -0300 Message-Id: <20240220200445.4000158-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220200445.4000158-1-adhemerval.zanella@linaro.org> References: <20240220200445.4000158-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Parametrize test-strstr.c so it can be used to check wcsstr. Checked on x86_64-linux-gnu and aarch64-linux-gnu. Reviewed-by: DJ Delorie --- string/test-strstr.c | 122 +++++++++++++++++++++++++++---------------- wcsmbs/Makefile | 1 + wcsmbs/test-wcsstr.c | 20 +++++++ 3 files changed, 97 insertions(+), 46 deletions(-) create mode 100644 wcsmbs/test-wcsstr.c diff --git a/string/test-strstr.c b/string/test-strstr.c index 05d0b7c98c..f82aeb2cfa 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -17,16 +17,44 @@ . */ #define TEST_MAIN -#define TEST_NAME "strstr" -#include "test-string.h" +#ifndef WIDE +# define TEST_NAME "strstr" +#else +# define TEST_NAME "wcsstr" +#endif + +#ifndef WIDE +# define CHAR char +# define STRLEN strlen +# define STRSTR strstr +# define STRCPY strcpy +# define MEMCPY memcpy +# define MEMSET memset +# define MEMPCPY mempcpy +# define L(s) s +#else +# include +# define CHAR wchar_t +# define STRLEN wcslen +# define STRCPY wcscpy +# define STRSTR wcsstr +# define MEMCPY wmemcpy +# define MEMSET wmemset +# define MEMPCPY wmempcpy +# define L(s) L ## s +/* The test requires up to 8191 charateres, so allocate at least 32Kb + (considering 4kb page size). */ +# define BUF1PAGES 4 +#endif +#include "test-string.h" /* Naive implementation to verify results. */ -static char * -simple_strstr (const char *s1, const char *s2) +static CHAR * +simple_strstr (const CHAR *s1, const CHAR *s2) { - ssize_t s1len = strlen (s1); - ssize_t s2len = strlen (s2); + ssize_t s1len = STRLEN (s1); + ssize_t s2len = STRLEN (s2); if (s2len > s1len) return NULL; @@ -38,28 +66,27 @@ simple_strstr (const char *s1, const char *s2) if (s1[i + j] != s2[j]) break; if (j == s2len) - return (char *) s1 + i; + return (CHAR *) s1 + i; } return NULL; } -typedef char *(*proto_t) (const char *, const char *); +typedef CHAR *(*proto_t) (const CHAR *, const CHAR *); -IMPL (strstr, 1) +IMPL (STRSTR, 1) static int -check_result (impl_t *impl, const char *s1, const char *s2, - char *exp_result) +check_result (impl_t *impl, const CHAR *s1, const CHAR *s2, + CHAR *exp_result) { - char *result = CALL (impl, s1, s2); + CHAR *result = CALL (impl, s1, s2); if (result != exp_result) { - error (0, 0, "Wrong result in function %s %s %s", impl->name, - (result == NULL) ? "(null)" : result, - (exp_result == NULL) ? "(null)" : exp_result); + error (0, 0, "Wrong result in function %p %p %p", impl->name, + result, exp_result); ret = 1; return -1; } @@ -68,7 +95,7 @@ check_result (impl_t *impl, const char *s1, const char *s2, } static void -do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result) +do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, CHAR *exp_result) { if (check_result (impl, s1, s2, exp_result) < 0) return; @@ -79,49 +106,51 @@ static void do_test (size_t align1, size_t align2, size_t len1, size_t len2, int fail) { - char *s1 = (char *) (buf1 + align1); - char *s2 = (char *) (buf2 + align2); + align1 = align1 * sizeof (CHAR); + align2 = align2 * sizeof (CHAR); - static const char d[] = "1234567890abcdef"; -#define dl (sizeof (d) - 1) - char *ss2 = s2; + CHAR *s1 = (CHAR *) (buf1 + align1); + CHAR *s2 = (CHAR *) (buf2 + align2); + + static const CHAR d[] = L("1234567890abcdef"); + const size_t dl = STRLEN (d); + CHAR *ss2 = s2; for (size_t l = len2; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - ss2 = mempcpy (ss2, d, t); + ss2 = MEMPCPY (ss2, d, t); } s2[len2] = '\0'; if (fail) { - char *ss1 = s1; + CHAR *ss1 = s1; for (size_t l = len1; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - memcpy (ss1, d, t); + MEMCPY (ss1, d, t); ++ss1[len2 > 7 ? 7 : len2 - 1]; ss1 += t; } } else { - memset (s1, '0', len1); - memcpy (s1 + len1 - len2, s2, len2); + MEMSET (s1, '0', len1); + MEMCPY (s1 + len1 - len2, s2, len2); } s1[len1] = '\0'; FOR_EACH_IMPL (impl, 0) do_one_test (impl, s1, s2, fail ? NULL : s1 + len1 - len2); - } static void check1 (void) { - const char s1[] = - "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"; - const char s2[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; - char *exp_result; + const CHAR s1[] = + L("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"); + const CHAR s2[] = L("_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + CHAR *exp_result; exp_result = simple_strstr (s1, s2); FOR_EACH_IMPL (impl, 0) @@ -131,30 +160,31 @@ check1 (void) static void check2 (void) { - const char s1_stack[] = ", enable_static, \0, enable_shared, "; + const CHAR s1_stack[] = L(", enable_static, \0, enable_shared, "); const size_t s1_byte_count = 18; - const char *s2_stack = &(s1_stack[s1_byte_count]); - const size_t s2_byte_count = 18; - char *exp_result; + const size_t s1_byte_len = 18 * sizeof (CHAR); + const CHAR *s2_stack = &(s1_stack[s1_byte_count]); + const size_t s2_byte_len = 18 * sizeof (CHAR);; + CHAR *exp_result; const size_t page_size_real = getpagesize (); /* Haystack at end of page. The following page is protected. */ - char *s1_page_end = (void *) buf1 + page_size - s1_byte_count; - strcpy (s1_page_end, s1_stack); + CHAR *s1_page_end = (void *) buf1 + page_size - s1_byte_len; + STRCPY (s1_page_end, s1_stack); /* Haystack which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s1_page_cross = (void *) buf1 + page_size_real - 8; - strcpy (s1_page_cross, s1_stack); + CHAR *s1_page_cross = (void *) buf1 + page_size_real - 8; + STRCPY (s1_page_cross, s1_stack); /* Needle at end of page. The following page is protected. */ - char *s2_page_end = (void *) buf2 + page_size - s2_byte_count; - strcpy (s2_page_end, s2_stack); + CHAR *s2_page_end = (void *) buf2 + page_size - s2_byte_len; + STRCPY (s2_page_end, s2_stack); /* Needle which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s2_page_cross = (void *) buf2 + page_size_real - 8; - strcpy (s2_page_cross, s2_stack); + CHAR *s2_page_cross = (void *) buf2 + page_size_real - 8; + STRCPY (s2_page_cross, s2_stack); exp_result = simple_strstr (s1_stack, s2_stack); FOR_EACH_IMPL (impl, 0) @@ -178,8 +208,8 @@ check2 (void) static void pr23637 (void) { - char *h = (char*) buf1; - char *n = (char*) buf2; + CHAR *h = (CHAR*) buf1; + CHAR *n = (CHAR*) buf2; for (int i = 0; i < N; i++) { @@ -194,7 +224,7 @@ pr23637 (void) /* Ensure we don't match at the first 'x'. */ h[0] = 'x'; - char *exp_result = simple_strstr (h, n); + CHAR *exp_result = simple_strstr (h, n); FOR_EACH_IMPL (impl, 0) check_result (impl, h, n, exp_result); } diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index f3333c6a4b..1cddd8cc6d 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -163,6 +163,7 @@ tests := \ test-wcspbrk \ test-wcsrchr \ test-wcsspn \ + test-wcsstr \ test-wmemchr \ test-wmemcmp \ test-wmemset \ diff --git a/wcsmbs/test-wcsstr.c b/wcsmbs/test-wcsstr.c new file mode 100644 index 0000000000..23d6517255 --- /dev/null +++ b/wcsmbs/test-wcsstr.c @@ -0,0 +1,20 @@ +/* Test wcsstr function. + Copyright (C) 2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define WIDE 1 +#include