From patchwork Thu Dec 31 16:52:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 1421602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=bKOD1RuT; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D6Dk44TZhz9sRR for ; Fri, 1 Jan 2021 03:53:15 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 69211388CC0B; Thu, 31 Dec 2020 16:53:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69211388CC0B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609433592; bh=8ZyuMH3iqPqFBzhRK+BD7lm3oQT4OE9zBHjtnLa5mWU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=bKOD1RuTLUUuZIFoR76OtJcUfaUq7Ikhl9dhdlt1I489nIY1RnbYcPoG7pFT+pKuG zgmkWsXCWblTdIQG2iXPsyfm1mhv964Q41USegruLha5oXMMOLgT2h+XDCXai3beCy OluaYNkZ1iqryD0RIyQMdSyOshtnlhrxJNAZ5ZB0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10048.outbound.protection.outlook.com [40.107.1.48]) by sourceware.org (Postfix) with ESMTPS id BEE53385800A for ; Thu, 31 Dec 2020 16:53:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BEE53385800A Received: from AM6P193CA0045.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::22) by DBBPR08MB5882.eurprd08.prod.outlook.com (2603:10a6:10:200::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3700.29; Thu, 31 Dec 2020 16:53:05 +0000 Received: from VE1EUR03FT060.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8e:cafe::83) by AM6P193CA0045.outlook.office365.com (2603:10a6:209:8e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.19 via Frontend Transport; Thu, 31 Dec 2020 16:53:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT060.mail.protection.outlook.com (10.152.19.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.21 via Frontend Transport; Thu, 31 Dec 2020 16:53:04 +0000 Received: ("Tessian outbound fc5cc0046d61:v71"); Thu, 31 Dec 2020 16:53:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e34ef7817aabb400 X-CR-MTA-TID: 64aa7808 Received: from 2e38d83d629e.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1B54A450-497A-4363-A62C-4ACBE1A56A1F.1; Thu, 31 Dec 2020 16:52:48 +0000 Received: from FRA01-PR2-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2e38d83d629e.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 31 Dec 2020 16:52:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e8Sut2FR+5guuw1FL0NNzKFPtBcYtXL4Qhdc8dMsz50v00AfijI4fCWK3Rb1BuCMpY62/WraGMogFfOA47P/urlJrjiwSpSxVDasGrw6VyOaot6UTWVr3ShxEYyh+vWNCUAm0zswPmc0vINSWPqqAnLmcXoOo2QQHVavdtjds/Wkm1XptJyhQu5cIXQI/La0in3L9kyEEiSUkLabiecfXNxiP0nsF45MQa/NN4SOaCuxFP3SkFsNeQz9r0qZPkfKXq7269ZzyLKBcRrdxJrWx19Jh+irpl3TN9G5WR2rmDNRHxcbX05wg7ikisFKiIpKqEUIDqhETAeAnkO7Me9ZdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8ZyuMH3iqPqFBzhRK+BD7lm3oQT4OE9zBHjtnLa5mWU=; b=AA5/hedzVAaiEDUa4J1PouCKqoXTC4ZXw7Myi+yn6lXb0YBumMZBnke9d5W70iVVlapTQc1RMXOWx0gfdJR+bSuGZ4dZGH9X3bukUk5Y+8EWk86l8ZOFDELv7/4IbuM26uQq3/g8GBCtHf/MfCea3XLYqVrNpPBCvgic+t6IyO7gXzK/UxP4nu7c++daYnJDSwrH/bASPM15G9VU9eOZT25Rgw4tTU0kVzOpkkJlZw6EkuyDIq99kwuw2n+use4RYz9vUndIPoAIzmjWHCv34yrr4VGyO4XU9/hyI8pamGKmgI/PmZU0EjE9XXzY24ExXPiDief/Z+evYLdRKsmxSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PR2PR08MB4652.eurprd08.prod.outlook.com (2603:10a6:101:18::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3700.27; Thu, 31 Dec 2020 16:52:46 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::700f:ddbe:a347:ee4f]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::700f:ddbe:a347:ee4f%6]) with mapi id 15.20.3721.020; Thu, 31 Dec 2020 16:52:45 +0000 To: libc-alpha@sourceware.org Subject: [COMMITTED] aarch64: use PTR_ARG and SIZE_ARG instead of DELOUSE Date: Thu, 31 Dec 2020 16:52:39 +0000 Message-Id: <20201231165239.12811-1-szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.53] X-ClientProxiedBy: LO4P123CA0348.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::11) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.53) by LO4P123CA0348.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.19 via Frontend Transport; Thu, 31 Dec 2020 16:52:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ad35ca3c-d692-4696-27be-08d8adac8b08 X-MS-TrafficTypeDiagnostic: PR2PR08MB4652:|DBBPR08MB5882: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: qZlK1ev9V+eY0IGv16D1i9x/g3mjP0w6mEEWrC5IJNTQJxwqrOiiRUMPJigaIWLq5iczGNAYPrS8ceX1JZyq1m/h7PNv7Zq6uvX63wFu5XepJqMSlEtUBbptc5AW+ftILUwXRiHP3/cQzeXFupTNbP4eQWR8HAF/vtPvFsJZLs3j7UNLd4mUfwQLS+/+hO7bUFpzGYapxJBiD/Q95ZYBlIc/dUKyMoiLbXZN4ZKJKmCyulrp/U7f/zz7TVIk1xfLehUU0hA90qTRZ3UyOKhWsL1U1PXyGVnovpnQfYtQPPzEy49Z0yUw2ze57im4+EdrMMISYH5ZAYGFHCihtZHsr1b062rd+FkdtrtNEcedfIC0yKjszHwc6tki43bgmEZ9FXp/FA8hhRBbI69/nA8i1LBFdz1iMyUBMpVCnACJTPZQzBZ+OHdKQlBppRcs8CTSCERCryfiPgFR/MozLeD6Ww== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(366004)(39860400002)(396003)(956004)(52116002)(8676002)(44832011)(316002)(2906002)(69590400010)(6512007)(478600001)(8936002)(186003)(5660300002)(1076003)(26005)(16526019)(30864003)(36756003)(6506007)(86362001)(66476007)(83380400001)(6916009)(6486002)(6666004)(2616005)(66946007)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YO6RTRxvbJ/IFUKxvHnng32x7diLR0ZDmRw+sXU0CpK7DRN13bIpWRicCo7ESFeJIftZiZVf1liZNruEfu94Z8XivgeLcezKG1g01tFb5/ZKUvNzrx3ssdgLaqwwjLjXSV4A3TXfgP2s7kS44G0wO5p5nO5NpyZBhucD8zMHu3ys79E3+NuuSjHlQwGPafMxExCWLZ2lX10eB4t6SFOjk/xExHwqxATf3gdRPv2OE3pkQ64d+inMzYWqnNkOa90UE9wtUIT/5PN+fgUItTeiPcgdpYFC0TIKZn/OW0zz3wOqu92ZxIvgNhx2BAGBLuLeLhEuyBYYX86OEZyxuz5jtUKBcf47gpjxR1uzT8xgInGC1iAe2U4Nbz37lmCQkSemGAlhkEaRsvIFB+lvhPe0n/RT7V6P4KiuOkQPwtibTwtXvzsDJcAf9tpB5GLSHpAnhj2vAAAfKv96BbkvlREx5lrXtJtbFfyUfJfedDtgKnQMJilSQ/5ocoJO6Y08FyCSZs5hlufhXs9pRbdquqNqi0kfZBpALTZEkIMJZhCTXxw3Yhtxe0jEetGSvgT2fZNjA69WtXvrW9fsd6Qnyal5MDJQl7aA/9oPUa2em65AiKZvapoeaiJ/u1bAKubp+7NkPSeeFRqRyTaTFDsjSwrwSCtXR9BLEZlL97mQgx7EjpN3kXzjWwGTnWXDLaYxMAriauCpSI2Kw2s6xV1Ml97rG+f5BIRTA6447I9AmWNlbeGOT8/0964MWtxbdAVusJps2i6kL3rM/nQ1Ysbe8D0NInmL/4DUrMIptKMYjGVK0fZV3rbnyfxhkFpSFeXX+cjWK+XWVTCxOXtJjHDQMUiuuWa2aO/Plia4z9k5o4o9JlrUd8pbzquf0K69AgGsx0FREOonoDWSMisP28QBlWDhHCkC/e1yvUAha2hSPOlnM1T0FkXl6azMJ1xfhRCzBB+HBgIa185iQAaSO0zbz212fsvAyPZZOjhxaNMFLiCV0iQdpCyMD4bEvAnHWCjm/2bt X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB4652 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT060.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 326fac26-0305-4514-b21a-08d8adac7f76 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r/4RxGvfQqKdDEMYbXphp2ylfp9GJN1VnXD2tJPs9sQhA0N23gc2iGGd6SxLPJ5I4+QKXsViF6YVbfYBmA7VSx/ZyaZ86SgGdev82Krj8Bn+oJfL/VxgKyYq3e1acYj971Si1pubL+qKZiR7Z8PKEDwoKMDuwky/wT3/r4bHElcqOakNEZodh0QljfpN64+exEbAeWZu6XYNWLjnn2rLN2wL45eU4I6zSrF2Las/vy/FIrhnLbbskEAfOzTIMcrYSJo4BXg9DOv2vv97kGqut4WIQi7L66ZH5/ZVkY5R7VKUWg75teffO//FmIzaXXYr+VqWA5JaIiOggGnzwXg4Wbl2dJDEA2y6+ui/IxJTq0w4AkjR3X4lkEEUk4RuvzeHdFOUMY5tvIjIpmdSF+ODEHeRfmkLXsnISt7HOV4ajqryEpfay1cNHdcoegobDUYNbirsHjbyUlSzbdMdBkOlgfpR6mK/3+CVB237T10WC8fwLxdkfjMTZqV/6QVlVgXu X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(136003)(346002)(39860400002)(376002)(396003)(46966006)(186003)(8936002)(70586007)(6506007)(6486002)(478600001)(6916009)(44832011)(81166007)(6666004)(16526019)(316002)(2906002)(2616005)(1076003)(26005)(83380400001)(8676002)(36756003)(82310400003)(70206006)(356005)(6512007)(5660300002)(86362001)(956004)(69590400010)(30864003)(47076005)(336012)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2020 16:53:04.9813 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad35ca3c-d692-4696-27be-08d8adac8b08 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT060.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB5882 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" DELOUSE was added to asm code to make them compatible with non-LP64 ABIs, but it is an unfortunate name and the code was not compatible with ABIs where pointer and size_t are different. Glibc currently only supports the LP64 ABI so these macros are not really needed or tested, but for now the name is changed to be more meaningful instead of removing them completely. Some DELOUSE macros were dropped: clone, strlen and strnlen used it unnecessarily. The out of tree ILP32 patches are currently not maintained and will likely need a rework to rebase them on top of the time64 changes. --- sysdeps/aarch64/__longjmp.S | 2 +- sysdeps/aarch64/dl-tlsdesc.S | 6 +++--- sysdeps/aarch64/memchr.S | 4 ++-- sysdeps/aarch64/memcmp.S | 6 +++--- sysdeps/aarch64/memcpy.S | 12 ++++++------ sysdeps/aarch64/memrchr.S | 4 ++-- sysdeps/aarch64/memset.S | 4 ++-- sysdeps/aarch64/multiarch/memchr_nosimd.S | 4 ++-- sysdeps/aarch64/multiarch/memcpy_advsimd.S | 12 ++++++------ sysdeps/aarch64/multiarch/memcpy_falkor.S | 12 ++++++------ sysdeps/aarch64/multiarch/memcpy_thunderx.S | 12 ++++++------ sysdeps/aarch64/multiarch/memcpy_thunderx2.S | 12 ++++++------ sysdeps/aarch64/multiarch/memset_base64.S | 4 ++-- sysdeps/aarch64/multiarch/memset_kunpeng.S | 4 ++-- sysdeps/aarch64/multiarch/strlen_asimd.S | 2 +- sysdeps/aarch64/setjmp.S | 2 +- sysdeps/aarch64/strchr.S | 2 +- sysdeps/aarch64/strchrnul.S | 2 +- sysdeps/aarch64/strcmp.S | 4 ++-- sysdeps/aarch64/strcpy.S | 4 ++-- sysdeps/aarch64/strlen.S | 3 +-- sysdeps/aarch64/strnlen.S | 5 ++--- sysdeps/aarch64/strrchr.S | 2 +- sysdeps/aarch64/sysdep.h | 6 ++++-- sysdeps/unix/sysv/linux/aarch64/clone.S | 13 ++++++------- sysdeps/unix/sysv/linux/aarch64/getcontext.S | 2 +- sysdeps/unix/sysv/linux/aarch64/setcontext.S | 2 +- sysdeps/unix/sysv/linux/aarch64/swapcontext.S | 2 +- 28 files changed, 74 insertions(+), 75 deletions(-) diff --git a/sysdeps/aarch64/__longjmp.S b/sysdeps/aarch64/__longjmp.S index f9060776b4..601dbff483 100644 --- a/sysdeps/aarch64/__longjmp.S +++ b/sysdeps/aarch64/__longjmp.S @@ -46,7 +46,7 @@ ENTRY (__longjmp) cfi_offset(d14, JB_D14<<3) cfi_offset(d15, JB_D15<<3) - DELOUSE (0) + PTR_ARG (0) ldp x19, x20, [x0, #JB_X19<<3] ldp x21, x22, [x0, #JB_X21<<3] diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S index db8a064322..1666a1dd34 100644 --- a/sysdeps/aarch64/dl-tlsdesc.S +++ b/sysdeps/aarch64/dl-tlsdesc.S @@ -75,7 +75,7 @@ .align 2 _dl_tlsdesc_return: BTI_C - DELOUSE (0) + PTR_ARG (0) ldr PTR_REG (0), [x0, #PTR_SIZE] RET cfi_endproc @@ -99,7 +99,7 @@ _dl_tlsdesc_undefweak: BTI_C str x1, [sp, #-16]! cfi_adjust_cfa_offset (16) - DELOUSE (0) + PTR_ARG (0) ldr PTR_REG (0), [x0, #PTR_SIZE] mrs x1, tpidr_el0 sub PTR_REG (0), PTR_REG (0), PTR_REG (1) @@ -145,7 +145,7 @@ _dl_tlsdesc_undefweak: .align 2 _dl_tlsdesc_dynamic: BTI_C - DELOUSE (0) + PTR_ARG (0) /* Save just enough registers to support fast path, if we fall into slow path we will save additional registers. */ diff --git a/sysdeps/aarch64/memchr.S b/sysdeps/aarch64/memchr.S index 23f30f61b2..13db282bea 100644 --- a/sysdeps/aarch64/memchr.S +++ b/sysdeps/aarch64/memchr.S @@ -61,8 +61,8 @@ string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (MEMCHR) - DELOUSE (0) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (2) bic src, srcin, 15 cbz cntin, L(nomatch) ld1 {vdata.16b}, [src] diff --git a/sysdeps/aarch64/memcmp.S b/sysdeps/aarch64/memcmp.S index 827f54f99e..5176aeac8d 100644 --- a/sysdeps/aarch64/memcmp.S +++ b/sysdeps/aarch64/memcmp.S @@ -42,9 +42,9 @@ #define tmp2 x8 ENTRY_ALIGN (memcmp, 6) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) subs limit, limit, 16 b.lo L(less16) diff --git a/sysdeps/aarch64/memcpy.S b/sysdeps/aarch64/memcpy.S index e0b4c4502f..cfc1c75b41 100644 --- a/sysdeps/aarch64/memcpy.S +++ b/sysdeps/aarch64/memcpy.S @@ -73,9 +73,9 @@ */ ENTRY_ALIGN (MEMCPY, 6) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) add srcend, src, count add dstend, dstin, count @@ -209,9 +209,9 @@ END (MEMCPY) libc_hidden_builtin_def (MEMCPY) ENTRY_ALIGN (MEMMOVE, 4) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) add srcend, src, count add dstend, dstin, count diff --git a/sysdeps/aarch64/memrchr.S b/sysdeps/aarch64/memrchr.S index c25f430970..bdd899f970 100644 --- a/sysdeps/aarch64/memrchr.S +++ b/sysdeps/aarch64/memrchr.S @@ -59,8 +59,8 @@ string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (__memrchr) - DELOUSE (0) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (2) add end, srcin, cntin sub endm1, end, 1 bic src, endm1, 15 diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S index ac577f1660..7a472fd8a5 100644 --- a/sysdeps/aarch64/memset.S +++ b/sysdeps/aarch64/memset.S @@ -31,8 +31,8 @@ ENTRY_ALIGN (MEMSET, 6) - DELOUSE (0) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (2) dup v0.16B, valw add dstend, dstin, count diff --git a/sysdeps/aarch64/multiarch/memchr_nosimd.S b/sysdeps/aarch64/multiarch/memchr_nosimd.S index 41ce10eb32..3045b49802 100644 --- a/sysdeps/aarch64/multiarch/memchr_nosimd.S +++ b/sysdeps/aarch64/multiarch/memchr_nosimd.S @@ -64,8 +64,8 @@ ENTRY_ALIGN (MEMCHR, 6) - DELOUSE (0) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (2) /* Do not dereference srcin if no bytes to compare. */ cbz cntin, L(none_chr) diff --git a/sysdeps/aarch64/multiarch/memcpy_advsimd.S b/sysdeps/aarch64/multiarch/memcpy_advsimd.S index 48bb6d7ca4..9d39ad8f31 100644 --- a/sysdeps/aarch64/multiarch/memcpy_advsimd.S +++ b/sysdeps/aarch64/multiarch/memcpy_advsimd.S @@ -64,9 +64,9 @@ from the end. */ ENTRY (__memcpy_simd) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) add srcend, src, count add dstend, dstin, count @@ -181,9 +181,9 @@ libc_hidden_builtin_def (__memcpy_simd) ENTRY (__memmove_simd) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) add srcend, src, count add dstend, dstin, count diff --git a/sysdeps/aarch64/multiarch/memcpy_falkor.S b/sysdeps/aarch64/multiarch/memcpy_falkor.S index 8dfc2c759f..bebc16b466 100644 --- a/sysdeps/aarch64/multiarch/memcpy_falkor.S +++ b/sysdeps/aarch64/multiarch/memcpy_falkor.S @@ -73,9 +73,9 @@ #if IS_IN (libc) ENTRY_ALIGN (__memcpy_falkor, 6) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) cmp count, 32 add srcend, src, count @@ -218,9 +218,9 @@ libc_hidden_builtin_def (__memcpy_falkor) ENTRY_ALIGN (__memmove_falkor, 6) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) cmp count, 32 add srcend, src, count diff --git a/sysdeps/aarch64/multiarch/memcpy_thunderx.S b/sysdeps/aarch64/multiarch/memcpy_thunderx.S index e9407571b5..c04b17346b 100644 --- a/sysdeps/aarch64/multiarch/memcpy_thunderx.S +++ b/sysdeps/aarch64/multiarch/memcpy_thunderx.S @@ -81,9 +81,9 @@ ENTRY_ALIGN (MEMMOVE, 6) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) sub tmp1, dstin, src cmp count, 96 @@ -95,9 +95,9 @@ END (MEMMOVE) libc_hidden_builtin_def (MEMMOVE) ENTRY (MEMCPY) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) prfm PLDL1KEEP, [src] add srcend, src, count diff --git a/sysdeps/aarch64/multiarch/memcpy_thunderx2.S b/sysdeps/aarch64/multiarch/memcpy_thunderx2.S index 68e99455c8..0096c4ce6f 100644 --- a/sysdeps/aarch64/multiarch/memcpy_thunderx2.S +++ b/sysdeps/aarch64/multiarch/memcpy_thunderx2.S @@ -97,9 +97,9 @@ ENTRY_ALIGN (MEMMOVE, 6) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) add srcend, src, count cmp count, 16 @@ -127,9 +127,9 @@ libc_hidden_builtin_def (MEMMOVE) .p2align 4 ENTRY (MEMCPY) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + PTR_ARG (1) + SIZE_ARG (2) add srcend, src, count cmp count, 16 diff --git a/sysdeps/aarch64/multiarch/memset_base64.S b/sysdeps/aarch64/multiarch/memset_base64.S index 8f85cd1caf..aac05be308 100644 --- a/sysdeps/aarch64/multiarch/memset_base64.S +++ b/sysdeps/aarch64/multiarch/memset_base64.S @@ -36,8 +36,8 @@ ENTRY_ALIGN (MEMSET, 6) - DELOUSE (0) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (2) bfi valw, valw, 8, 8 bfi valw, valw, 16, 16 diff --git a/sysdeps/aarch64/multiarch/memset_kunpeng.S b/sysdeps/aarch64/multiarch/memset_kunpeng.S index 8e051d4fd1..793a659b48 100644 --- a/sysdeps/aarch64/multiarch/memset_kunpeng.S +++ b/sysdeps/aarch64/multiarch/memset_kunpeng.S @@ -31,8 +31,8 @@ ENTRY_ALIGN (MEMSET, 6) - DELOUSE (0) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (2) dup v0.16B, valw add dstend, dstin, count diff --git a/sysdeps/aarch64/multiarch/strlen_asimd.S b/sysdeps/aarch64/multiarch/strlen_asimd.S index bc5a4eaf77..154a28811e 100644 --- a/sysdeps/aarch64/multiarch/strlen_asimd.S +++ b/sysdeps/aarch64/multiarch/strlen_asimd.S @@ -86,7 +86,7 @@ character, return the length, if not, continue in the main loop. */ ENTRY (__strlen_asimd) - DELOUSE (0) + PTR_ARG (0) and tmp1, srcin, MIN_PAGE_SIZE - 1 cmp tmp1, MIN_PAGE_SIZE - 32 diff --git a/sysdeps/aarch64/setjmp.S b/sysdeps/aarch64/setjmp.S index 28fdd3f46a..57e5982cf7 100644 --- a/sysdeps/aarch64/setjmp.S +++ b/sysdeps/aarch64/setjmp.S @@ -33,7 +33,7 @@ END (_setjmp) libc_hidden_def (_setjmp) ENTRY (__sigsetjmp) - DELOUSE (0) + PTR_ARG (0) 1: stp x19, x20, [x0, #JB_X19<<3] diff --git a/sysdeps/aarch64/strchr.S b/sysdeps/aarch64/strchr.S index fd1b941666..5d21ca7938 100644 --- a/sysdeps/aarch64/strchr.S +++ b/sysdeps/aarch64/strchr.S @@ -56,7 +56,7 @@ string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (strchr) - DELOUSE (0) + PTR_ARG (0) bic src, srcin, 15 dup vrepchr.16b, chrin ld1 {vdata.16b}, [src] diff --git a/sysdeps/aarch64/strchrnul.S b/sysdeps/aarch64/strchrnul.S index 1ae4598f82..cc9d2b9bbb 100644 --- a/sysdeps/aarch64/strchrnul.S +++ b/sysdeps/aarch64/strchrnul.S @@ -54,7 +54,7 @@ string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (__strchrnul) - DELOUSE (0) + PTR_ARG (0) bic src, srcin, 15 dup vrepchr.16b, chrin ld1 {vdata.16b}, [src] diff --git a/sysdeps/aarch64/strcmp.S b/sysdeps/aarch64/strcmp.S index 77d7218dea..63b8390b4a 100644 --- a/sysdeps/aarch64/strcmp.S +++ b/sysdeps/aarch64/strcmp.S @@ -62,8 +62,8 @@ NUL too in big-endian, byte-reverse the data before the NUL check. */ ENTRY(strcmp) - DELOUSE (0) - DELOUSE (1) + PTR_ARG (0) + PTR_ARG (1) sub off2, src2, src1 mov zeroones, REP8_01 and tmp, src1, 7 diff --git a/sysdeps/aarch64/strcpy.S b/sysdeps/aarch64/strcpy.S index 80b16a0931..2926b6d2d7 100644 --- a/sysdeps/aarch64/strcpy.S +++ b/sysdeps/aarch64/strcpy.S @@ -73,8 +73,8 @@ string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (STRCPY) - DELOUSE (0) - DELOUSE (1) + PTR_ARG (0) + PTR_ARG (1) bic src, srcin, 15 mov wtmp, 0xf00f ld1 {vdata.16b}, [src] diff --git a/sysdeps/aarch64/strlen.S b/sysdeps/aarch64/strlen.S index e314fffed6..a4a30928ee 100644 --- a/sysdeps/aarch64/strlen.S +++ b/sysdeps/aarch64/strlen.S @@ -54,8 +54,7 @@ string, counting trailing zeros identifies exactly which byte matched. */ ENTRY (STRLEN) - DELOUSE (0) - DELOUSE (1) + PTR_ARG (0) bic src, srcin, 15 mov wtmp, 0xf00f ld1 {vdata.16b}, [src] diff --git a/sysdeps/aarch64/strnlen.S b/sysdeps/aarch64/strnlen.S index 086a5c7e99..5699105e95 100644 --- a/sysdeps/aarch64/strnlen.S +++ b/sysdeps/aarch64/strnlen.S @@ -55,9 +55,8 @@ #define REP8_80 0x8080808080808080 ENTRY_ALIGN_AND_PAD (__strnlen, 6, 9) - DELOUSE (0) - DELOUSE (1) - DELOUSE (2) + PTR_ARG (0) + SIZE_ARG (1) cbz limit, L(hit_limit) mov zeroones, #REP8_01 bic src, srcin, #15 diff --git a/sysdeps/aarch64/strrchr.S b/sysdeps/aarch64/strrchr.S index a9b2bf47c2..878fa16b21 100644 --- a/sysdeps/aarch64/strrchr.S +++ b/sysdeps/aarch64/strrchr.S @@ -59,7 +59,7 @@ if the relevant byte matched the NUL end of string. */ ENTRY(strrchr) - DELOUSE (0) + PTR_ARG (0) bic src, srcin, 15 dup vrepchr.16b, chrin mov wtmp, 0x3003 diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h index 2d802db008..e3e2f5f44d 100644 --- a/sysdeps/aarch64/sysdep.h +++ b/sysdeps/aarch64/sysdep.h @@ -25,12 +25,14 @@ # define AARCH64_R(NAME) R_AARCH64_ ## NAME # define PTR_REG(n) x##n # define PTR_LOG_SIZE 3 -# define DELOUSE(n) +# define PTR_ARG(n) +# define SIZE_ARG(n) #else # define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME # define PTR_REG(n) w##n # define PTR_LOG_SIZE 2 -# define DELOUSE(n) mov w##n, w##n +# define PTR_ARG(n) mov w##n, w##n +# define SIZE_ARG(n) mov w##n, w##n #endif #define PTR_SIZE (1<