From patchwork Tue Jul 12 19:28:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 55979 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 5E36938768BC for ; Tue, 12 Jul 2022 19:28:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5E36938768BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1657654113; bh=MqwKxyOCfEwn/gNHEUPJRbgy9gaU1xQcHRgg/9DkCuk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ibJuDnzcUsejYxhmrJV+NVfiSWZnHejD2JFE+LZVp89o4XJ/NyeIwoV0CmYOpUJsE wDqAy0s11PnrdcDePCInClw9pN9vx8a/Snf987EO6A6AQIxr4RgnWcUjIs8j1Z3h5s kAuJUQjSIR0cVolzGeS+iLtQpx4kPHRmPyz0U/mA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id 582D03857BA1 for ; Tue, 12 Jul 2022 19:28:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 582D03857BA1 Received: by mail-pj1-x1031.google.com with SMTP id x18-20020a17090a8a9200b001ef83b332f5so12861374pjn.0 for ; Tue, 12 Jul 2022 12:28:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MqwKxyOCfEwn/gNHEUPJRbgy9gaU1xQcHRgg/9DkCuk=; b=7EeAhPEJvYyNdpvnjoL/lwg2VdJWD+doONBtxln6p6bqq7+jxDKB7AnX3FPBnqCCJF VLgYGCy8A/1AEfbsF0sVbLOZVAQmzf62bCleghQjUSfKPlFVN1EI79Qi7Il/8OCOsZdt 1B8M405SGLBp6o7i+TLOaemrXTXsKx9Lp92+4EonMV6Vrm56cfpnWd+K2OMCSQypI3pL evcrq8PShuasmXbZe0GyNHQuD0AkNk0uy8Sh/Ir38NewkM/oKA9OZ+8ePegkdFdpX65B cCsF2bypm3gqqES3XMNLqey9gOc4Zoryypn07Ryx5rqI1zTp/sUOkRm1BjV6PS/qALb4 iT8w== X-Gm-Message-State: AJIora8iB8c7QH8ZiLzwBa9VsMx+pBQSB4QPlZX+/UKVX3COO2Uts4vA CxgEtZ6nTaC1IKXznLoW5oSujrE5Y1I= X-Google-Smtp-Source: AGRyM1t2h0Uo6X0pDI4CbEeMuMw/1mjI9n4Qpnjfg+FVzK7BHzqJgV8PQRrnanzsd5JQ+LsK1ha3pQ== X-Received: by 2002:a17:903:1108:b0:16a:a0ab:8f89 with SMTP id n8-20020a170903110800b0016aa0ab8f89mr25238713plh.12.1657654092158; Tue, 12 Jul 2022 12:28:12 -0700 (PDT) Received: from noah-tgl.. ([192.55.60.37]) by smtp.gmail.com with ESMTPSA id m16-20020a170902db1000b0016c4cbefea3sm4468768plx.218.2022.07.12.12.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 12:28:11 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 1/4] x86: Rename STRCASECMP_NONASCII macro to STRCASECMP_L_NONASCII Date: Tue, 12 Jul 2022 12:28:05 -0700 Message-Id: <20220712192808.335531-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The previous macro name can be confusing given that both `__strcasecmp_l_nonascii` and `__strcasecmp_nonascii` are functions and we use the `_l` version. --- sysdeps/x86_64/multiarch/strcmp-avx2.S | 6 +++--- sysdeps/x86_64/multiarch/strcmp-evex.S | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S index 516cde1145..3ab21e3a58 100644 --- a/sysdeps/x86_64/multiarch/strcmp-avx2.S +++ b/sysdeps/x86_64/multiarch/strcmp-avx2.S @@ -89,12 +89,12 @@ # define STRCASECMP __strncasecmp_avx2 # define LOCALE_REG rcx # define LOCALE_REG_LP RCX_LP -# define STRCASECMP_NONASCII __strncasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strncasecmp_l_nonascii # else # define STRCASECMP __strcasecmp_avx2 # define LOCALE_REG rdx # define LOCALE_REG_LP RDX_LP -# define STRCASECMP_NONASCII __strcasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strcasecmp_l_nonascii # endif # endif @@ -215,7 +215,7 @@ STRCMP: mov (%LOCALE_REG), %RAX_LP # endif testl $1, LOCALE_DATA_VALUES + _NL_CTYPE_NONASCII_CASE * SIZEOF_VALUES(%rax) - jne STRCASECMP_NONASCII + jne STRCASECMP_L_NONASCII leaq _nl_C_LC_CTYPE_tolower + 128 * 4(%rip), TOLOWER_BASE # endif diff --git a/sysdeps/x86_64/multiarch/strcmp-evex.S b/sysdeps/x86_64/multiarch/strcmp-evex.S index e97d51bb26..afbf13a230 100644 --- a/sysdeps/x86_64/multiarch/strcmp-evex.S +++ b/sysdeps/x86_64/multiarch/strcmp-evex.S @@ -123,12 +123,12 @@ # define STRCASECMP __strncasecmp_evex # define LOCALE_REG rcx # define LOCALE_REG_LP RCX_LP -# define STRCASECMP_NONASCII __strncasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strncasecmp_l_nonascii # else # define STRCASECMP __strcasecmp_evex # define LOCALE_REG rdx # define LOCALE_REG_LP RDX_LP -# define STRCASECMP_NONASCII __strcasecmp_l_nonascii +# define STRCASECMP_L_NONASCII __strcasecmp_l_nonascii # endif # endif @@ -241,7 +241,7 @@ STRCMP: mov (%LOCALE_REG), %RAX_LP # endif testl $1, LOCALE_DATA_VALUES + _NL_CTYPE_NONASCII_CASE * SIZEOF_VALUES(%rax) - jne STRCASECMP_NONASCII + jne STRCASECMP_L_NONASCII leaq _nl_C_LC_CTYPE_tolower + 128 * 4(%rip), TOLOWER_BASE # endif