[1/3] x86-64: Move LP_SIZE definition to its own header
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
This way, we can define the pointer guard macros without including
<sysdep.h> on x86-64. Other architectures will not have such an
inclusion dependency, and the implied header file inclusion would
create a porting hazard.
---
sysdeps/x86_64/sysdep.h | 7 +------
sysdeps/x86_64/x32/sysdep.h | 6 +-----
sysdeps/x86_64/x32/x86-lp_size.h | 23 +++++++++++++++++++++++
sysdeps/x86_64/x86-lp_size.h | 23 +++++++++++++++++++++++
4 files changed, 48 insertions(+), 11 deletions(-)
create mode 100644 sysdeps/x86_64/x32/x86-lp_size.h
create mode 100644 sysdeps/x86_64/x86-lp_size.h
Comments
On 13/10/22 09:20, Florian Weimer via Libc-alpha wrote:
> This way, we can define the pointer guard macros without including
> <sysdep.h> on x86-64. Other architectures will not have such an
> inclusion dependency, and the implied header file inclusion would
> create a porting hazard.
LGTM with a minor nit below.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/x86_64/sysdep.h | 7 +------
> sysdeps/x86_64/x32/sysdep.h | 6 +-----
> sysdeps/x86_64/x32/x86-lp_size.h | 23 +++++++++++++++++++++++
> sysdeps/x86_64/x86-lp_size.h | 23 +++++++++++++++++++++++
> 4 files changed, 48 insertions(+), 11 deletions(-)
> create mode 100644 sysdeps/x86_64/x32/x86-lp_size.h
> create mode 100644 sysdeps/x86_64/x86-lp_size.h
>
> diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
> index 7f5defa4ec..d1a43dc14c 100644
> --- a/sysdeps/x86_64/sysdep.h
> +++ b/sysdeps/x86_64/sysdep.h
> @@ -20,6 +20,7 @@
> #define _X86_64_SYSDEP_H 1
>
> #include <sysdeps/x86/sysdep.h>
> +#include <x86-lp_size.h>
>
> #ifdef __ASSEMBLER__
>
> @@ -68,9 +69,6 @@ lose: \
> # define JUMPTARGET(name) name
> #endif
>
> -/* Long and pointer size in bytes. */
> -#define LP_SIZE 8
> -
> /* Instruction to operate on long and pointer. */
> #define LP_OP(insn) insn##q
>
> @@ -137,9 +135,6 @@ lose: \
>
> #else /* __ASSEMBLER__ */
>
> -/* Long and pointer size in bytes. */
> -#define LP_SIZE "8"
> -
> /* Instruction to operate on long and pointer. */
> #define LP_OP(insn) #insn "q"
>
> diff --git a/sysdeps/x86_64/x32/sysdep.h b/sysdeps/x86_64/x32/sysdep.h
> index 645ea4ae69..92d987780d 100644
> --- a/sysdeps/x86_64/x32/sysdep.h
> +++ b/sysdeps/x86_64/x32/sysdep.h
> @@ -17,8 +17,8 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <sysdeps/x86_64/sysdep.h>
> +#include <x86-lp_size.h>
>
> -#undef LP_SIZE
> #undef LP_OP
> #undef ASM_ADDR
>
> @@ -41,8 +41,6 @@
>
> #ifdef __ASSEMBLER__
>
> -# define LP_SIZE 4
> -
> # define LP_OP(insn) insn##l
>
> # define ASM_ADDR .long
> @@ -66,8 +64,6 @@
>
> #else /* __ASSEMBLER__ */
>
> -# define LP_SIZE "4"
> -
> # define LP_OP(insn) #insn "l"
>
> # define ASM_ADDR ".long"
> diff --git a/sysdeps/x86_64/x32/x86-lp_size.h b/sysdeps/x86_64/x32/x86-lp_size.h
> new file mode 100644
> index 0000000000..ad03eb66b2
> --- /dev/null
> +++ b/sysdeps/x86_64/x32/x86-lp_size.h
> @@ -0,0 +1,23 @@
> +/* Pointer size definition for x86-64 x42.
s/42/32
> + Copyright (C) 2022 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifdef __ASSEMBLER__
> +# define LP_SIZE 4
> +#else
> +# define LP_SIZE "4"
> +#endif
> diff --git a/sysdeps/x86_64/x86-lp_size.h b/sysdeps/x86_64/x86-lp_size.h
> new file mode 100644
> index 0000000000..76877240e8
> --- /dev/null
> +++ b/sysdeps/x86_64/x86-lp_size.h
> @@ -0,0 +1,23 @@
> +/* Pointer size definition for x86-64.
> + Copyright (C) 2022 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
> + <https://www.gnu.org/licenses/>. */
> +
> +#ifdef __ASSEMBLER__
> +# define LP_SIZE 8
> +#else
> +# define LP_SIZE "8"
> +#endif
@@ -20,6 +20,7 @@
#define _X86_64_SYSDEP_H 1
#include <sysdeps/x86/sysdep.h>
+#include <x86-lp_size.h>
#ifdef __ASSEMBLER__
@@ -68,9 +69,6 @@ lose: \
# define JUMPTARGET(name) name
#endif
-/* Long and pointer size in bytes. */
-#define LP_SIZE 8
-
/* Instruction to operate on long and pointer. */
#define LP_OP(insn) insn##q
@@ -137,9 +135,6 @@ lose: \
#else /* __ASSEMBLER__ */
-/* Long and pointer size in bytes. */
-#define LP_SIZE "8"
-
/* Instruction to operate on long and pointer. */
#define LP_OP(insn) #insn "q"
@@ -17,8 +17,8 @@
<https://www.gnu.org/licenses/>. */
#include <sysdeps/x86_64/sysdep.h>
+#include <x86-lp_size.h>
-#undef LP_SIZE
#undef LP_OP
#undef ASM_ADDR
@@ -41,8 +41,6 @@
#ifdef __ASSEMBLER__
-# define LP_SIZE 4
-
# define LP_OP(insn) insn##l
# define ASM_ADDR .long
@@ -66,8 +64,6 @@
#else /* __ASSEMBLER__ */
-# define LP_SIZE "4"
-
# define LP_OP(insn) #insn "l"
# define ASM_ADDR ".long"
new file mode 100644
@@ -0,0 +1,23 @@
+/* Pointer size definition for x86-64 x42.
+ Copyright (C) 2022 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifdef __ASSEMBLER__
+# define LP_SIZE 4
+#else
+# define LP_SIZE "4"
+#endif
new file mode 100644
@@ -0,0 +1,23 @@
+/* Pointer size definition for x86-64.
+ Copyright (C) 2022 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
+ <https://www.gnu.org/licenses/>. */
+
+#ifdef __ASSEMBLER__
+# define LP_SIZE 8
+#else
+# define LP_SIZE "8"
+#endif