From patchwork Wed Feb 6 14:58:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 157621 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6506879jaa; Wed, 6 Feb 2019 06:59:08 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia510ZWdruVOz7gq8C/Az6Hygv/QA2Dz3fVciIZQnI+XzUMHm14FRt7Oa7UZJ3d5eokQhkF X-Received: by 2002:a17:902:2887:: with SMTP id f7mr10844838plb.176.1549465148094; Wed, 06 Feb 2019 06:59:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549465148; cv=none; d=google.com; s=arc-20160816; b=qXnfhXLANS9JucrF6Ps9H1VK5Q1yjYqg3qiKTdeWkASKDBOuVByJKOiLE7VTLcXpC3 SJJ6m35ORwvt+889ypqc55n4oj7ts7TmAPpT84SXM3gzIdd+zKBIjyHdkwJmm2y0VxFB kciMdAhYgXAmpP3Q6DDtjm3eYVFXnLx/JhrPTXXT7++a7EyJdNVwdtoKHbb2kKe96Prd mO9j0adySP1kVKNdmFK+x9Sku46bMxeUH2qoAP0cvk/bgtyE2ZkWzu6y3Uj9AW40dWl6 pqRP+gSsjw9pZa/Hc149C3eIR7KrNzhbq1dr8kZtKgGJOAztJZ3LijY0fOod+CCKjAq5 g/Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:dkim-signature:delivered-to:sender :list-help:list-post:list-archive:list-subscribe:list-unsubscribe :list-id:precedence:mailing-list:dkim-signature:domainkey-signature; bh=lZba5FDsuN1vVFJD5XEauVSuUioz3geYJbfKqOGpteY=; b=hWTg4dqf65VCAYL8kNG/N1910J/T3exHrQ8JukfE9EZ23I7nZqVrGIm4LY5PuQuB1w zQkitWLw5JPFTPw5S6BDxSnwkRAa6cfPUQwrcFiWY/xatt9+FGGvUivaZpAj3fr9YjL4 JGG2/btAhC2e/l1rEmjvtl1F78FrXurczAsFDJ2V1qrIXmJO4s/R5XI3kMkOorM0Rwq1 aPAO/e6c0diqJFfpdyIklGIym2unrTmhaLAAm6HuGfwIaFHpjQENtThPahtTAfN6ug8g kO2bJmQniRYbR3bTK5vdA1e/Q7RDLB+mUON7XPU6VnhOwpTWVx6GP1alNlR9X0seOb7c p88A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QgFQhGOf; dkim=pass header.i=@linaro.org header.s=google header.b=VGccabcc; spf=pass (google.com: domain of libc-alpha-return-99815-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-99815-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id y123si471565pfy.18.2019.02.06.06.59.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 06:59:08 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-99815-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QgFQhGOf; dkim=pass header.i=@linaro.org header.s=google header.b=VGccabcc; spf=pass (google.com: domain of libc-alpha-return-99815-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-99815-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=w3r3Mxcy2Ts9rhE9OepigPJgOHnifUGsCw/Oj0UzDzcLwUPJbytbt Osq6HxNKx6o+rYku+Bj7YwL+viL2HvN2maF/+a9IHIgQ30qKqOq3KGqpSfG95ngB DAL+ffhihjPvdQvBIjgd5w4wQOpUvqIJTCJo5Dt8b/pxAhepqh9mIA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=uy+AD5J7sb4PCJ1WGVIO5zY8jrM=; b=QgFQhGOfP82eHcPa7+AKlGB8peXu leYTlXjlkVAVa4O55kpZoibjRPpnxBP5FFuslfujE3xJbQaCD/y0jb1VPMMOCmNH m3HcSLG8kp6/J7D7HT4exRxKcceVtKCqCdivYg63gW2k0ByTYQLzqEP+Y6iizP4h EVW9xdGjh7+9j30= Received: (qmail 108897 invoked by alias); 6 Feb 2019 14:58:58 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 108830 invoked by uid 89); 6 Feb 2019 14:58:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=drepper, 2920 X-HELO: mail-qt1-f194.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=lZba5FDsuN1vVFJD5XEauVSuUioz3geYJbfKqOGpteY=; b=VGccabcc+QsdYXhQGQI1igMBRUGgvJ7QmMWPpGB6Yuwc/LytEubdk5dFMXV5dHKA6t v8bkM++jXEYF9dHy9JuDZxpwCrEGRnHi+Jd+9zYUdnURYNVft0H1enynqS6XH9CEDj0D MLanj42DlXsNMmpcGg9OCZJ58sW5ofd/P66xHfot30n6yNQTSZI7wQ49YYCfUbWal8ue ACZx+lF7SrX7fu/lJtJrgUVKsfkFj5y2yDkAZ6b4jEjZhht8bwBuYG5WFNUz2EP/Q0Ku dE15EMvgtK8U+VoRSJbhf10kp/GvZtYQwUeSoGso/KB6UIiw7aLDhIOeiixS8dK9YhDE LGNg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 1/7] wcsmbs: optimize wcpcpy Date: Wed, 6 Feb 2019 12:58:44 -0200 Message-Id: <20190206145850.22003-1-adhemerval.zanella@linaro.org> This patch rewrites wcpcpy using wcslen and wmemcpy. This is similar to the optimizatio done on stpcpy by f559d8cf29. Checked on x86_64-linux-gnu and string tests on a simulated m68k-linux-gnu. * sysdeps/m68k/wcpcpy.c: Remove file. * wcsmbs/wcpcpy.c (__wcpcpy): Rewrite using wcslen and wmemcpy. --- sysdeps/m68k/wcpcpy.c | 36 ------------------------------------ wcsmbs/wcpcpy.c | 16 +++------------- 2 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 sysdeps/m68k/wcpcpy.c -- 2.17.1 diff --git a/sysdeps/m68k/wcpcpy.c b/sysdeps/m68k/wcpcpy.c deleted file mode 100644 index a4bac08308..0000000000 --- a/sysdeps/m68k/wcpcpy.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (C) 1996-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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 - . */ - -/* The generic version of this file assumes that __alignof__(wchar_t) == - sizeof (wchar_t). We therefore use this port-specific implementation - instead. */ -#include - -/* Copy SRC to DEST, returning the address of the terminating L'\0' in - DEST. */ -wchar_t * -__wcpcpy (wchar_t *dest, const wchar_t *src) -{ - do - ; - while ((*dest++ = *src++)); - - return dest - 1; -} - -weak_alias (__wcpcpy, wcpcpy) diff --git a/wcsmbs/wcpcpy.c b/wcsmbs/wcpcpy.c index 01978e98f3..dc30e9694e 100644 --- a/wcsmbs/wcpcpy.c +++ b/wcsmbs/wcpcpy.c @@ -17,6 +17,7 @@ . */ #include +#include #define __need_ptrdiff_t #include @@ -29,20 +30,9 @@ wchar_t * __wcpcpy (wchar_t *dest, const wchar_t *src) { - wchar_t *wcp = (wchar_t *) dest - 1; - wint_t c; - const ptrdiff_t off = src - dest + 1; - - do - { - c = wcp[off]; - *++wcp = c; - } - while (c != L'\0'); - - return wcp; + size_t len = __wcslen (src); + return __wmemcpy (dest, src, len + 1) + len; } - #ifndef WCPCPY weak_alias (__wcpcpy, wcpcpy) #endif