From 45b1e17e9150dbd9ac2d578579063fbfa8e1b327 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Thu, 17 Dec 2020 10:03:05 +0000 Subject: aarch64: use PTR_ARG and SIZE_ARG instead of DELOUSE 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/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 +- 8 files changed, 31 insertions(+), 31 deletions(-) (limited to 'sysdeps/aarch64/multiarch') 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 -- cgit 1.4.1