From nobody Fri Dec 19 03:46:24 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A61CBC83F2C for ; Sat, 2 Sep 2023 13:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233592AbjIBNfo (ORCPT ); Sat, 2 Sep 2023 09:35:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233120AbjIBNfo (ORCPT ); Sat, 2 Sep 2023 09:35:44 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DC131738 for ; Sat, 2 Sep 2023 06:35:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1693661733; bh=adKYv+UWCAtL6RnGzj9nIBJ/HQrhFBvKNcQpOXq1TGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fAbK/+f59o0nFsY7PmslyoS5pHnhg8H4k2Rp7HYy9XAeYFWockUwzwwYlFU+VM7iJ dStQbPfzEbfklMzNAV6CQphMOlwmNPgfCWTV2yMBvFnaUkmbekN0E5SrAg+pZxelcG FjcTf83uHhIY21i0fUb/XKo7155W9N87t9d/xjtXk8/GnjOC85b+Ifhq48kGkGoOcI eAIdmXAbq6W+gJfPmr1L10oq/Dxv+twRAbvliE0Ij+BcoeT8DI+8/kCAAYd7WFKLOd /01Nzb0HC63R90yc02TkGmg8ccA4a1Itzr0tiOFUVo5lXRuuoi5dnoB6BYWIttkSjJ Xw9iIO4Vwd6xA== Received: from localhost.localdomain (unknown [182.253.126.208]) by gnuweeb.org (Postfix) with ESMTPSA id 6CAC424B3E2; Sat, 2 Sep 2023 20:35:29 +0700 (WIB) From: Ammar Faizi To: Willy Tarreau , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Cc: Ammar Faizi , David Laight , Nicholas Rosenberg , Alviro Iskandar Setiawan , Michael William Jonathan , GNU/Weeb Mailing List , Linux Kernel Mailing List Subject: [RFC PATCH v3 4/4] tools/nolibc: string: Remove the `_nolibc_memcpy_up()` function Date: Sat, 2 Sep 2023 20:35:05 +0700 Message-Id: <20230902133505.2176434-5-ammarfaizi2@gnuweeb.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902133505.2176434-1-ammarfaizi2@gnuweeb.org> References: <20230902133505.2176434-1-ammarfaizi2@gnuweeb.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This function is only called by memcpy(), there is no real reason to have this wrapper. Delete this function and move the code to memcpy() directly. Signed-off-by: Ammar Faizi Reviewed-by: Alviro Iskandar Setiawan --- tools/include/nolibc/string.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tools/include/nolibc/string.h b/tools/include/nolibc/string.h index 22dcb3f566baeefe..a01c69dd495f550c 100644 --- a/tools/include/nolibc/string.h +++ b/tools/include/nolibc/string.h @@ -10,84 +10,78 @@ #include "std.h" =20 static void *malloc(size_t len); =20 /* * As much as possible, please keep functions alphabetically sorted. */ =20 static __attribute__((unused)) int memcmp(const void *s1, const void *s2, size_t n) { size_t ofs =3D 0; int c1 =3D 0; =20 while (ofs < n && !(c1 =3D ((unsigned char *)s1)[ofs] - ((unsigned char *= )s2)[ofs])) { ofs++; } return c1; } =20 -static __attribute__((unused)) -void *_nolibc_memcpy_up(void *dst, const void *src, size_t len) -{ - size_t pos =3D 0; - - while (pos < len) { - ((char *)dst)[pos] =3D ((const char *)src)[pos]; - pos++; - } - return dst; -} - #ifndef NOLIBC_ARCH_HAS_MEMMOVE /* might be ignored by the compiler without -ffreestanding, then found as * missing. */ __attribute__((weak,unused,section(".text.nolibc_memmove"))) void *memmove(void *dst, const void *src, size_t len) { size_t dir, pos; =20 pos =3D len; dir =3D -1; =20 if (dst < src) { pos =3D -1; dir =3D 1; } =20 while (len) { pos +=3D dir; ((char *)dst)[pos] =3D ((const char *)src)[pos]; len--; } return dst; } #endif /* #ifndef NOLIBC_ARCH_HAS_MEMMOVE */ =20 #ifndef NOLIBC_ARCH_HAS_MEMCPY /* must be exported, as it's used by libgcc on ARM */ __attribute__((weak,unused,section(".text.nolibc_memcpy"))) void *memcpy(void *dst, const void *src, size_t len) { - return _nolibc_memcpy_up(dst, src, len); + size_t pos =3D 0; + + while (pos < len) { + ((char *)dst)[pos] =3D ((const char *)src)[pos]; + pos++; + } + return dst; } #endif /* #ifndef NOLIBC_ARCH_HAS_MEMCPY */ =20 #ifndef NOLIBC_ARCH_HAS_MEMSET /* might be ignored by the compiler without -ffreestanding, then found as * missing. */ __attribute__((weak,unused,section(".text.nolibc_memset"))) void *memset(void *dst, int b, size_t len) { char *p =3D dst; =20 while (len--) { /* prevent gcc from recognizing memset() here */ __asm__ volatile(""); *(p++) =3D b; } return dst; } #endif /* #ifndef NOLIBC_ARCH_HAS_MEMSET */ --=20 Ammar Faizi