Date: Thu, 26 Mar 2026 13:02:24 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 23d651677391 - main - libc/amd64/strrchr.S: fix rebase error Message-ID: <69c52e60.441a9.66701590@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=23d6516773916d8f324bea51867b0713c476f379 commit 23d6516773916d8f324bea51867b0713c476f379 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-03-26 13:00:21 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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 offsethome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c52e60.441a9.66701590>