mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memmove-vec-unaligned-erms.S

Browse Source 
__mempcpy_erms and __memmove_erms can't be placed between __memmove_chk
and __memmove it breaks __memmove_chk.

Don't check source == destination first since it is less common.

	* sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:
	(__mempcpy_erms, __memmove_erms): Moved before __mempcpy_chk
	with unaligned_erms.
	(__memmove_erms): Skip if source == destination.
	(__memmove_unaligned_erms): Don't check source == destination
	first.
This commit is contained in:
H.J. Lu 2016-04-03 12:38:25 -07:00
parent 27d3ce1467
commit ea2785e96f
2 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2016-04-03 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:
(__mempcpy_erms, __memmove_erms): Moved before __mempcpy_chk
with unaligned_erms.
(__memmove_erms): Skip if source == destination.
(__memmove_unaligned_erms): Don't check source == destination
first.
2016-04-01 H.J. Lu <hongjiu.lu@intel.com> 2016-04-01 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86/cpu-features.c (init_cpu_features): Don't set * sysdeps/x86/cpu-features.c (init_cpu_features): Don't set

74
sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S
View File

@ -95,6 +95,42 @@ L(start):
ret ret
END (MEMMOVE_SYMBOL (__memmove, unaligned_2)) END (MEMMOVE_SYMBOL (__memmove, unaligned_2))
# if VEC_SIZE == 16
/* Only used to measure performance of REP MOVSB. */
# ifdef SHARED
ENTRY (__mempcpy_erms)
movq %rdi, %rax
addq %rdx, %rax
jmp L(start_movsb)
END (__mempcpy_erms)
# endif
ENTRY (__memmove_erms)
movq %rdi, %rax
L(start_movsb):
movq %rdx, %rcx
cmpq %rsi, %rdi
jb 1f
/* Source == destination is less common. */
je 2f
leaq (%rsi,%rcx), %rdx
cmpq %rdx, %rdi
jb L(movsb_backward)
1:
rep movsb
2:
ret
L(movsb_backward):
leaq -1(%rdi,%rcx), %rdi
leaq -1(%rsi,%rcx), %rsi
std
rep movsb
cld
ret
END (__memmove_erms)
strong_alias (__memmove_erms, __memcpy_erms)
# endif
# ifdef SHARED # ifdef SHARED
ENTRY (MEMMOVE_SYMBOL (__mempcpy_chk, unaligned_erms)) ENTRY (MEMMOVE_SYMBOL (__mempcpy_chk, unaligned_erms))
cmpq %rdx, %rcx cmpq %rdx, %rcx
@ -115,38 +151,6 @@ ENTRY (MEMMOVE_SYMBOL (__memmove_chk, unaligned_erms))
END (MEMMOVE_SYMBOL (__memmove_chk, unaligned_erms)) END (MEMMOVE_SYMBOL (__memmove_chk, unaligned_erms))
# endif # endif
# if VEC_SIZE == 16
/* Only used to measure performance of REP MOVSB. */
# ifdef SHARED
ENTRY (__mempcpy_erms)
movq %rdi, %rax
addq %rdx, %rax
jmp L(movsb)
END (__mempcpy_erms)
# endif
ENTRY (__memmove_erms)
movq %rdi, %rax
movq %rdx, %rcx
cmpq %rsi, %rdi
jbe 1f
leaq (%rsi,%rcx), %rdx
cmpq %rdx, %rdi
jb L(movsb_backward)
1:
rep movsb
ret
L(movsb_backward):
leaq -1(%rdi,%rcx), %rdi
leaq -1(%rsi,%rcx), %rsi
std
rep movsb
cld
ret
END (__memmove_erms)
strong_alias (__memmove_erms, __memcpy_erms)
# endif
ENTRY (MEMMOVE_SYMBOL (__memmove, unaligned_erms)) ENTRY (MEMMOVE_SYMBOL (__memmove, unaligned_erms))
movq %rdi, %rax movq %rdi, %rax
L(start_erms): L(start_erms):
@ -166,8 +170,9 @@ L(return):
L(movsb): L(movsb):
cmpq %rsi, %rdi cmpq %rsi, %rdi
je L(nop)
jb 1f jb 1f
/* Source == destination is less common. */
je L(nop)
leaq (%rsi,%rdx), %r9 leaq (%rsi,%rdx), %r9
cmpq %r9, %rdi cmpq %r9, %rdi
/* Avoid slow backward REP MOVSB. */ /* Avoid slow backward REP MOVSB. */
@ -191,8 +196,9 @@ L(movsb_more_2x_vec):
L(more_2x_vec): L(more_2x_vec):
/* More than 2 * VEC. */ /* More than 2 * VEC. */
cmpq %rsi, %rdi cmpq %rsi, %rdi
je L(nop)
jb L(copy_forward) jb L(copy_forward)
/* Source == destination is less common. */
je L(nop)
leaq (%rsi,%rdx), %rcx leaq (%rsi,%rdx), %rcx
cmpq %rcx, %rdi cmpq %rcx, %rdi
jb L(more_2x_vec_overlap) jb L(more_2x_vec_overlap)