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 Netto X-Patchwork-Id: 1037583 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-99815-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="vr7gCb6P"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VGccabcc"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vl2d2Y1Vz9sLw for ; Thu, 7 Feb 2019 01:59:05 +1100 (AEDT) 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=U16XyaDm8F/t9J6uc/GWGZvWOPGNNvumgwPyMmPkQMS9Qfcz8WhRm OJDRtXTy7pvMa7rtR2YZo2hsF69MiB+jlcTuZD/UX1ZKOSNqhKEy2km63XrGnHEL MmHo3b4P4JwbI52i9/IRJSDMI0L7JL8QkG0iIWwvavtxvFhnjW5K/g= 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=vr7gCb6PYoFgMQN1klP4av/laUw2 I0gwWO/JjK9SEwKRR6YCUbK4ooe2K3Uzn1z3Fbca+9PMUdMdWJzVP7Nem0M36sOY 8NngK6zS5rbTQxKXT0pKYwT+ZULiMDxsCr21bSDHn9TS9034xWL6c5lQ7yzGCGei X1WWSJSlEFLO7rg= 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== 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 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