From nobody Thu Mar 26 13:02:24 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fhP7h1Sp0z6FWqD for ; Thu, 26 Mar 2026 13:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhP7h11MPz3SXf for ; Thu, 26 Mar 2026 13:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774530144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NMSFUbHsExui3D6F1HmeFnr6O1QfccsCc66whqvBpI=; b=awfjHBx0P5jzU3zWoUgPVF2li+O3mcUzW5SRrwiITbTUGL8mrMhErJHjcYkYmHTal7UEbi lZb/zoVh9SP2qAFwuATtR2zjMOB0SvF68xY9qQk0yZgnyI1KuJjJKhuB0zzjuvNUnurZYn XAPHXfCNSaNP3ek6Kpr8NGWIxRAjx1sHKlGfqB5IU/Cvca7tY6HhU8zIzsA2f/uymOV7yu p24q14NWYcW7jWoOv2f0OoCKU7Cw8WA8YbmF//EjyqwpYYrCkkcJAIgZ1u5pPuofkWP09D 6SsjeY8XDsNfx/Dg/G0WRHyzU9nlV9hSp4EIEr1vXeRIT1RVLKUq8wHmQYPx6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774530144; a=rsa-sha256; cv=none; b=wU0zC98uIe1l/L3bsDBQRen7PYhC+vanbStqeEcKKAkRwSt9pCkdJ8TAsl4sQ2VaXquR1w FDTCo1JOlvfC1bCe+/inpHYBUbdnHaKt7XgsWqDXuRHjgicWYZQCRPs1pmTWrhhddMPyhj OzEe8qGxedsVxOCKgN4oQfio0gTr6/99SV14fqmlCdFwls8qfUEAyR6ZJi3kBdIKSq7sj0 YwB6LYU0nT122Fw+fZt7KVvkQ4eU91hH1sBBEodH4dR7Zo3Hg3mb/a91gl5urKydF14olN CPKa3aZJ69rn5GII33Go7eGLs5JP8DD/8Tgf9qL7xyeOJ3lzev6DavgqMsRNrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774530144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/NMSFUbHsExui3D6F1HmeFnr6O1QfccsCc66whqvBpI=; b=gSaqOuhgvvlW2fdudo9eP1L0tjENW0UlRUKygDkk7yzIjeky6ZWaC3enJrgXNE8UdVRQOp z/J6wr7V4lrPJ+V/AfnPgWvsoTRRr/OGKyW8h6JUwLK5uGagcOGH6/nac5viW/v5gIJ6N+ 80aIHvQsismM06YF5IkSPTUShxQuRTnIx4I/XF/Gui0vlc64D9J9nUAXUnROPgMriCkdph 8mGX4Ba+z2pm1/DnI23ccT0c0xYJihsZ4tUdCnzrZ3VkQZ36cRzIrMbPo7XblyK5mg2lCL yuYtpwqV6UYdoEXb89izZ4mVV74DBvAaseQ81V0V2BXHVISFPAoBGRO9F5TTlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhP7h0bPDztGM for ; Thu, 26 Mar 2026 13:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 441a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 13:02:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 23d651677391 - main - libc/amd64/strrchr.S: fix rebase error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23d6516773916d8f324bea51867b0713c476f379 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 13:02:24 +0000 Message-Id: <69c52e60.441a9.66701590@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=23d6516773916d8f324bea51867b0713c476f379 commit 23d6516773916d8f324bea51867b0713c476f379 Author: Robert Clausecker AuthorDate: 2026-03-26 13:00:21 +0000 Commit: Robert Clausecker CommitDate: 2026-03-26 13:01:57 +0000 libc/amd64/strrchr.S: fix rebase error I accidentally dropped a part of the patch on squash rebase. Should be fine now. Fixes: 253f15c016ca699906f78b8e522a3f7ed675929b PR: 293915 MFC after: 1 week --- lib/libc/amd64/string/strrchr.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/amd64/string/strrchr.S b/lib/libc/amd64/string/strrchr.S index 29587456752a..a22a821a1d4d 100644 --- a/lib/libc/amd64/string/strrchr.S +++ b/lib/libc/amd64/string/strrchr.S @@ -82,8 +82,8 @@ ARCHENTRY(strrchr, scalar) not %rcx # ~(str ^ c) and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) and %r9, %rcx # matches in str, not including junk bits - cmovnz %rdi, %r11 # if match found, update match vector - cmovnz %rcx, %r10 # ... and match pointer + cmovnz %rdi, %r10 # if match found, update match vector + cmovnz %rcx, %r11 # ... and match pointer add $8, %rdi # advance to next iteration mov %rsi, %rcx @@ -104,8 +104,8 @@ ARCHENTRY(strrchr, scalar) not %rcx # ~(str ^ c) and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) and %r9, %rcx # matches in str, not including junk bits - cmovnz %rdi, %r11 # if match found, update match vector - cmovnz %rcx, %r10 # ... and match pointer + cmovnz %rdi, %r10 # if match found, update match vector + cmovnz %rcx, %r11 # ... and match pointer tzcnt %r11, %rcx # location of last match lea -1(%r10), %rax # address of last character in vector shr $3, %ecx # as byte offset