[PATCH v8 01/17] Parameterize op_t from memcopy.h
Richard Henderson
richard.henderson@linaro.org
Fri Jan 13 18:27:17 GMT 2023
From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
It moves the op_t definition out to an specific header, adds
the attribute 'may-alias', and cleanup its duplicated definitions.
Checked with a build and check with run-built-tests=no for all major
Linux ABIs.
Message-Id: <20230111204558.2402155-2-adhemerval.zanella@linaro.org>
---
sysdeps/generic/memcopy.h | 6 ++----
sysdeps/generic/string-optype.h | 24 ++++++++++++++++++++++++
sysdeps/x86_64/x32/string-optype.h | 24 ++++++++++++++++++++++++
string/memcmp.c | 1 -
4 files changed, 50 insertions(+), 5 deletions(-)
create mode 100644 sysdeps/generic/string-optype.h
create mode 100644 sysdeps/x86_64/x32/string-optype.h
diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index 9f3ffb5d30..b5ffa4d114 100644
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -55,10 +55,8 @@
[I fail to understand. I feel stupid. --roland]
*/
-/* Type to use for aligned memory operations.
- This should normally be the biggest type supported by a single load
- and store. */
-#define op_t unsigned long int
+/* Type to use for aligned memory operations. */
+#include <string-optype.h>
#define OPSIZ (sizeof (op_t))
/* Type to use for unaligned operations. */
diff --git a/sysdeps/generic/string-optype.h b/sysdeps/generic/string-optype.h
new file mode 100644
index 0000000000..42bdd2a145
--- /dev/null
+++ b/sysdeps/generic/string-optype.h
@@ -0,0 +1,24 @@
+/* Define a type to use for word access. Generic version.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STRING_OPTYPE_H
+#define _STRING_OPTYPE_H 1
+
+typedef unsigned long int __attribute__ ((__may_alias__)) op_t;
+
+#endif /* string-optype.h */
diff --git a/sysdeps/x86_64/x32/string-optype.h b/sysdeps/x86_64/x32/string-optype.h
new file mode 100644
index 0000000000..e7679f934f
--- /dev/null
+++ b/sysdeps/x86_64/x32/string-optype.h
@@ -0,0 +1,24 @@
+/* Define a type to use for word access. Generic version.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STRING_OPTYPE_H
+#define _STRING_OPTYPE_H 1
+
+typedef unsigned long long int __attribute__ ((__may_alias__)) op_t;
+
+#endif /* string-optype.h */
diff --git a/string/memcmp.c b/string/memcmp.c
index 067b2e6a42..ea0fa03e1c 100644
--- a/string/memcmp.c
+++ b/string/memcmp.c
@@ -46,7 +46,6 @@
/* Type to use for aligned memory operations.
This should normally be the biggest type supported by a single load
and store. Must be an unsigned type. */
-# define op_t unsigned long int
# define OPSIZ (sizeof (op_t))
/* Threshold value for when to enter the unrolled loops. */
--
2.34.1
More information about the Libc-alpha
mailing list