This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: PATCH: Add Linux/x32 sysdep.h

On Wed, May 16, 2012 at 9:49 AM, Roland McGrath <roland@hack.frob.com> wrote:
> That looks like it could pretty much all be done just by using R*_LP et al
> macros in the existing linux/x86_64/sysdep.h macros. ?That would avoid the
> duplication.
>
> Leave the SYSCALL_RETURN_INT64 hack out until you're doing the llseek
> change that actually requires it. ?Then we can look at it in context and
> decide what is the cleanest way to handle the special case.
>

Here is a patch.  I only need to set SYSCALL_SET_ERROR_RETURN
in x32 llseek.S. X32 uses the same lseek system call as x86-64.

Tested on Linux/x32.  There are no differences in generated llseek object files.
OK to install?  Thanks.


-- 
H.J.
---
2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>

	* sysdeps/unix/sysv/linux/x86_64/sysdep.h
	(SYSCALL_SET_ERROR_RETURN):  New.
	(SYSCALL_ERROR_HANDLER): Use R*LP on long and pointer
	Use SYSCALL_SET_ERROR_RETURN to set error return.

	* sysdeps/unix/sysv/linux/x86_64/x32/llseek.S: New file.
	* sysdeps/unix/sysv/linux/x86_64/x32/sysdep.h: Likewis.e

diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index aae4cb0..f8032ba 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -112,16 +112,19 @@

 # define ret_ERRVAL ret

+/* Set error return value.  */
+# define SYSCALL_SET_ERROR_RETURN or $-1, %RAX_LP
+
 # ifndef PIC
 #  define SYSCALL_ERROR_HANDLER	/* Nothing here; code in sysdep.S is used.  */
 # elif RTLD_PRIVATE_ERRNO
 #  define SYSCALL_ERROR_HANDLER			\
 0:						\
-  leaq rtld_errno(%rip), %rcx;			\
+  lea rtld_errno(%rip), %RCX_LP;		\
   xorl %edx, %edx;				\
-  subq %rax, %rdx;				\
+  sub %RAX_LP, %RDX_LP;				\
   movl %edx, (%rcx);				\
-  orq $-1, %rax;				\
+  SYSCALL_SET_ERROR_RETURN;			\
   jmp L(pseudo_end);
 # else
 #  ifndef NOT_IN_libc
@@ -133,9 +136,9 @@
 0:						\
   movq SYSCALL_ERROR_ERRNO@GOTTPOFF(%rip), %rcx;\
   xorl %edx, %edx;				\
-  subq %rax, %rdx;				\
+  sub %RAX_LP, %RDX_LP;				\
   movl %edx, %fs:(%rcx);			\
-  orq $-1, %rax;				\
+  SYSCALL_SET_ERROR_RETURN;			\
   jmp L(pseudo_end);
 # endif	/* PIC */

diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/llseek.S
b/sysdeps/unix/sysv/linux/x86_64/x32/llseek.S
new file mode 100644
index 0000000..4727cf2
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/llseek.S
@@ -0,0 +1,34 @@
+/* Copyright (C) 2012 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/>.  */
+
+#include <sysdep.h>
+
+#undef SYSCALL_SET_ERROR_RETURN
+#define SYSCALL_SET_ERROR_RETURN or $-1, %rax
+
+#define SYSCALL_NAME lseek
+#define SYSCALL_NARGS 3
+#define SYSCALL_SYMBOL __libc_lseek64
+#define SYSCALL_CANCELLABLE 1
+#include <syscall-template.S>
+weak_alias (__libc_lseek64, __lseek64)
+libc_hidden_weak (__lseek64)
+weak_alias (__libc_lseek64, lseek64)
+libc_hidden_weak (lseek64)
+weak_alias (__libc_lseek64, __lseek)
+libc_hidden_weak (__lseek)
+weak_alias (__libc_lseek64, lseek)
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sysdep.h
b/sysdeps/unix/sysv/linux/x86_64/x32/sysdep.h
new file mode 100644
index 0000000..35e4c84
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/sysdep.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2012 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 _LINUX_X32_SYSDEP_H
+#define _LINUX_X32_SYSDEP_H 1
+
+/* There is some commonality.  */
+#include <sysdeps/unix/sysv/linux/x86_64/sysdep.h>
+#include <sysdeps/x86_64/x32/sysdep.h>
+
+#endif /* linux/x86_64/x32/sysdep.h */
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]