mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
* sysdeps/unix/sysv/linux/powerpc/dl-vdso.c: Move to...
* sysdeps/unix/sysv/linux/dl-vdso.c: ...here. * sysdeps/unix/sysv/linux/powerpc/dl-vdso.h: Move to... * sysdeps/unix/sysv/linux/dl-vdso.h: ...here. * csu/libc-start.c: Pretty printing. Use VDSO_SETUP if defined. * sysdeps/unix/sysv/linux/powerpc/libc-start.c: Define VDSO_SETUP and let generic code call into _libc_vdso_platform_setup. * sysdeps/unix/sysv/linux/x86_64/libc-start.c: New file. * sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h: New file. * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Pretty printing. Define INLINE_VSYSCALL and INTERNAL_VSYSCALL. * sysdeps/unix/sysv/linux/x86_64/Versions: Export __vdso_clock_gettime for GLIBC_PRIVATE. * sysdeps/unix/sysv/linux/x86_64/Makefile [subdir=elf] (sysdep_rountines): Add dl-vdso. * sysdeps/unix/sysv/linux/powerpc/Makefile: Use sysdep_routines instead of routines. * sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h: Add attribute_hidden to __vdso_gettimeofday prototype.
This commit is contained in:
parent
f47e262624
commit
75fb247e69
25
ChangeLog
25
ChangeLog
@ -1,3 +1,28 @@
|
|||||||
|
2007-08-12 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/dl-vdso.c: Move to...
|
||||||
|
* sysdeps/unix/sysv/linux/dl-vdso.c: ...here.
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/dl-vdso.h: Move to...
|
||||||
|
* sysdeps/unix/sysv/linux/dl-vdso.h: ...here.
|
||||||
|
* csu/libc-start.c: Pretty printing.
|
||||||
|
Use VDSO_SETUP if defined.
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/libc-start.c: Define VDSO_SETUP
|
||||||
|
and let generic code call into _libc_vdso_platform_setup.
|
||||||
|
* sysdeps/unix/sysv/linux/x86_64/libc-start.c: New file.
|
||||||
|
* sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h: New file.
|
||||||
|
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Pretty printing.
|
||||||
|
Define INLINE_VSYSCALL and INTERNAL_VSYSCALL.
|
||||||
|
* sysdeps/unix/sysv/linux/x86_64/Versions: Export __vdso_clock_gettime
|
||||||
|
for GLIBC_PRIVATE.
|
||||||
|
* sysdeps/unix/sysv/linux/x86_64/Makefile [subdir=elf]
|
||||||
|
(sysdep_rountines): Add dl-vdso.
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/Makefile: Use sysdep_routines instead
|
||||||
|
of routines.
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h: Add
|
||||||
|
attribute_hidden to __vdso_gettimeofday prototype.
|
||||||
|
|
||||||
2007-08-12 Roland McGrath <roland@redhat.com>
|
2007-08-12 Roland McGrath <roland@redhat.com>
|
||||||
|
|
||||||
* manual/stdio.texi (Variable Arguments Output): Fix xref to gcc manual.
|
* manual/stdio.texi (Variable Arguments Output): Fix xref to gcc manual.
|
||||||
|
@ -138,9 +138,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
|
|||||||
functions are using thread functions if these are available and
|
functions are using thread functions if these are available and
|
||||||
we need to setup errno. */
|
we need to setup errno. */
|
||||||
__pthread_initialize_minimal ();
|
__pthread_initialize_minimal ();
|
||||||
#endif
|
|
||||||
|
|
||||||
# ifndef SHARED
|
|
||||||
/* Set up the stack checker's canary. */
|
/* Set up the stack checker's canary. */
|
||||||
uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
|
uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
|
||||||
# ifdef THREAD_SET_STACK_GUARD
|
# ifdef THREAD_SET_STACK_GUARD
|
||||||
@ -150,6 +148,10 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef VDSO_SETUP
|
||||||
|
VDSO_SETUP ();
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Register the destructor of the dynamic linker if there is any. */
|
/* Register the destructor of the dynamic linker if there is any. */
|
||||||
if (__builtin_expect (rtld_fini != NULL, 1))
|
if (__builtin_expect (rtld_fini != NULL, 1))
|
||||||
__cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL);
|
__cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL);
|
||||||
|
@ -8,5 +8,5 @@ gen-as-const-headers += ucontext_i.sym
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(subdir),elf)
|
ifeq ($(subdir),elf)
|
||||||
routines += dl-vdso
|
sysdep_routines += dl-vdso
|
||||||
endif
|
endif
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#ifdef SHARED
|
#ifdef SHARED
|
||||||
|
|
||||||
extern void *__vdso_gettimeofday;
|
extern void *__vdso_gettimeofday attribute_hidden;
|
||||||
|
|
||||||
extern void *__vdso_clock_gettime;
|
extern void *__vdso_clock_gettime;
|
||||||
|
|
||||||
|
@ -24,23 +24,6 @@
|
|||||||
#include <bp-start.h>
|
#include <bp-start.h>
|
||||||
#include <bp-sym.h>
|
#include <bp-sym.h>
|
||||||
|
|
||||||
int __cache_line_size attribute_hidden;
|
|
||||||
/* The main work is done in the generic function. */
|
|
||||||
#define LIBC_START_MAIN generic_start_main
|
|
||||||
#define LIBC_START_DISABLE_INLINE
|
|
||||||
#define LIBC_START_MAIN_AUXVEC_ARG
|
|
||||||
#define MAIN_AUXVEC_ARG
|
|
||||||
#define INIT_MAIN_ARGS
|
|
||||||
#include <csu/libc-start.c>
|
|
||||||
|
|
||||||
struct startup_info
|
|
||||||
{
|
|
||||||
void *__unbounded sda_base;
|
|
||||||
int (*main) (int, char **, char **, void *);
|
|
||||||
int (*init) (int, char **, char **, void *);
|
|
||||||
void (*fini) (void);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef SHARED
|
#ifdef SHARED
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
@ -69,8 +52,28 @@ static inline void _libc_vdso_platform_setup (void)
|
|||||||
__vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq",
|
__vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq",
|
||||||
"LINUX_2.6.15");
|
"LINUX_2.6.15");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# define VDSO_SETUP _libc_vdso_platform_setup
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
int __cache_line_size attribute_hidden;
|
||||||
|
/* The main work is done in the generic function. */
|
||||||
|
#define LIBC_START_MAIN generic_start_main
|
||||||
|
#define LIBC_START_DISABLE_INLINE
|
||||||
|
#define LIBC_START_MAIN_AUXVEC_ARG
|
||||||
|
#define MAIN_AUXVEC_ARG
|
||||||
|
#define INIT_MAIN_ARGS
|
||||||
|
#include <csu/libc-start.c>
|
||||||
|
|
||||||
|
struct startup_info
|
||||||
|
{
|
||||||
|
void *__unbounded sda_base;
|
||||||
|
int (*main) (int, char **, char **, void *);
|
||||||
|
int (*init) (int, char **, char **, void *);
|
||||||
|
void (*fini) (void);
|
||||||
|
};
|
||||||
|
|
||||||
int
|
int
|
||||||
/* GKM FIXME: GCC: this should get __BP_ prefix by virtue of the
|
/* GKM FIXME: GCC: this should get __BP_ prefix by virtue of the
|
||||||
BPs in the arglist of startup_info.main and startup_info.init. */
|
BPs in the arglist of startup_info.main and startup_info.init. */
|
||||||
@ -117,10 +120,7 @@ int
|
|||||||
__cache_line_size = av->a_un.a_val;
|
__cache_line_size = av->a_un.a_val;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#ifdef SHARED
|
|
||||||
/* Resolve and initialize function pointers for VDSO functions. */
|
|
||||||
_libc_vdso_platform_setup ();
|
|
||||||
#endif
|
|
||||||
return generic_start_main (stinfo->main, argc, ubp_av, auxvec,
|
return generic_start_main (stinfo->main, argc, ubp_av, auxvec,
|
||||||
stinfo->init, stinfo->fini, rtld_fini,
|
stinfo->init, stinfo->fini, rtld_fini,
|
||||||
stack_on_entry);
|
stack_on_entry);
|
||||||
|
@ -13,3 +13,7 @@ endif
|
|||||||
ifeq ($(subdir),csu)
|
ifeq ($(subdir),csu)
|
||||||
gen-as-const-headers += ucontext_i.sym
|
gen-as-const-headers += ucontext_i.sym
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(subdir),elf)
|
||||||
|
sysdep_routines += dl-vdso
|
||||||
|
endif
|
||||||
|
@ -6,4 +6,7 @@ libc {
|
|||||||
|
|
||||||
modify_ldt;
|
modify_ldt;
|
||||||
}
|
}
|
||||||
|
GLIBC_PRIVATE {
|
||||||
|
__vdso_clock_gettime;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
35
sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
Normal file
35
sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/* Resolve function pointers to VDSO functions.
|
||||||
|
Copyright (C) 2005, 2007 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, write to the Free
|
||||||
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#ifndef _LIBC_VDSO_H
|
||||||
|
#define _LIBC_VDSO_H
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
|
||||||
|
#ifdef SHARED
|
||||||
|
|
||||||
|
extern int (*__vdso_gettimeofday) (struct timeval *, void *)
|
||||||
|
attribute_hidden;
|
||||||
|
|
||||||
|
extern int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _LIBC_VDSO_H */
|
39
sysdeps/unix/sysv/linux/x86_64/libc-start.c
Normal file
39
sysdeps/unix/sysv/linux/x86_64/libc-start.c
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/* Copyright (C) 2007 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, write to the Free
|
||||||
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#ifdef SHARED
|
||||||
|
# include <dl-vdso.h>
|
||||||
|
# include <bits/libc-vdso.h>
|
||||||
|
|
||||||
|
int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
|
||||||
|
|
||||||
|
int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
|
||||||
|
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
_libc_vdso_platform_setup (void)
|
||||||
|
{
|
||||||
|
__vdso_gettimeofday = _dl_vdso_vsym ("gettimeofday", "LINUX_2.6");
|
||||||
|
|
||||||
|
__vdso_clock_gettime = _dl_vdso_vsym ("clock_gettime", "LINUX_2.6");
|
||||||
|
}
|
||||||
|
|
||||||
|
# define VDSO_SETUP _libc_vdso_platform_setup
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <csu/libc-start.c>
|
@ -68,14 +68,14 @@
|
|||||||
|
|
||||||
/* We don't want the label for the error handle to be global when we define
|
/* We don't want the label for the error handle to be global when we define
|
||||||
it here. */
|
it here. */
|
||||||
#ifdef PIC
|
# ifdef PIC
|
||||||
# define SYSCALL_ERROR_LABEL 0f
|
# define SYSCALL_ERROR_LABEL 0f
|
||||||
#else
|
# else
|
||||||
# define SYSCALL_ERROR_LABEL syscall_error
|
# define SYSCALL_ERROR_LABEL syscall_error
|
||||||
#endif
|
# endif
|
||||||
|
|
||||||
#undef PSEUDO
|
# undef PSEUDO
|
||||||
#define PSEUDO(name, syscall_name, args) \
|
# define PSEUDO(name, syscall_name, args) \
|
||||||
.text; \
|
.text; \
|
||||||
ENTRY (name) \
|
ENTRY (name) \
|
||||||
DO_CALL (syscall_name, args); \
|
DO_CALL (syscall_name, args); \
|
||||||
@ -83,39 +83,39 @@
|
|||||||
jae SYSCALL_ERROR_LABEL; \
|
jae SYSCALL_ERROR_LABEL; \
|
||||||
L(pseudo_end):
|
L(pseudo_end):
|
||||||
|
|
||||||
#undef PSEUDO_END
|
# undef PSEUDO_END
|
||||||
#define PSEUDO_END(name) \
|
# define PSEUDO_END(name) \
|
||||||
SYSCALL_ERROR_HANDLER \
|
SYSCALL_ERROR_HANDLER \
|
||||||
END (name)
|
END (name)
|
||||||
|
|
||||||
#undef PSEUDO_NOERRNO
|
# undef PSEUDO_NOERRNO
|
||||||
#define PSEUDO_NOERRNO(name, syscall_name, args) \
|
# define PSEUDO_NOERRNO(name, syscall_name, args) \
|
||||||
.text; \
|
.text; \
|
||||||
ENTRY (name) \
|
ENTRY (name) \
|
||||||
DO_CALL (syscall_name, args)
|
DO_CALL (syscall_name, args)
|
||||||
|
|
||||||
#undef PSEUDO_END_NOERRNO
|
# undef PSEUDO_END_NOERRNO
|
||||||
#define PSEUDO_END_NOERRNO(name) \
|
# define PSEUDO_END_NOERRNO(name) \
|
||||||
END (name)
|
END (name)
|
||||||
|
|
||||||
#define ret_NOERRNO ret
|
# define ret_NOERRNO ret
|
||||||
|
|
||||||
#undef PSEUDO_ERRVAL
|
# undef PSEUDO_ERRVAL
|
||||||
#define PSEUDO_ERRVAL(name, syscall_name, args) \
|
# define PSEUDO_ERRVAL(name, syscall_name, args) \
|
||||||
.text; \
|
.text; \
|
||||||
ENTRY (name) \
|
ENTRY (name) \
|
||||||
DO_CALL (syscall_name, args); \
|
DO_CALL (syscall_name, args); \
|
||||||
negq %rax
|
negq %rax
|
||||||
|
|
||||||
#undef PSEUDO_END_ERRVAL
|
# undef PSEUDO_END_ERRVAL
|
||||||
#define PSEUDO_END_ERRVAL(name) \
|
# define PSEUDO_END_ERRVAL(name) \
|
||||||
END (name)
|
END (name)
|
||||||
|
|
||||||
#define ret_ERRVAL ret
|
# define ret_ERRVAL ret
|
||||||
|
|
||||||
#ifndef PIC
|
# ifndef PIC
|
||||||
#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
|
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
|
||||||
#elif RTLD_PRIVATE_ERRNO
|
# elif RTLD_PRIVATE_ERRNO
|
||||||
# define SYSCALL_ERROR_HANDLER \
|
# define SYSCALL_ERROR_HANDLER \
|
||||||
0: \
|
0: \
|
||||||
leaq rtld_errno(%rip), %rcx; \
|
leaq rtld_errno(%rip), %rcx; \
|
||||||
@ -124,7 +124,7 @@
|
|||||||
movl %edx, (%rcx); \
|
movl %edx, (%rcx); \
|
||||||
orq $-1, %rax; \
|
orq $-1, %rax; \
|
||||||
jmp L(pseudo_end);
|
jmp L(pseudo_end);
|
||||||
#elif USE___THREAD
|
# elif USE___THREAD
|
||||||
# ifndef NOT_IN_libc
|
# ifndef NOT_IN_libc
|
||||||
# define SYSCALL_ERROR_ERRNO __libc_errno
|
# define SYSCALL_ERROR_ERRNO __libc_errno
|
||||||
# else
|
# else
|
||||||
@ -138,7 +138,7 @@
|
|||||||
movl %edx, %fs:(%rcx); \
|
movl %edx, %fs:(%rcx); \
|
||||||
orq $-1, %rax; \
|
orq $-1, %rax; \
|
||||||
jmp L(pseudo_end);
|
jmp L(pseudo_end);
|
||||||
#elif defined _LIBC_REENTRANT
|
# elif defined _LIBC_REENTRANT
|
||||||
/* Store (- %rax) into errno through the GOT.
|
/* Store (- %rax) into errno through the GOT.
|
||||||
Note that errno occupies only 4 bytes. */
|
Note that errno occupies only 4 bytes. */
|
||||||
# define SYSCALL_ERROR_HANDLER \
|
# define SYSCALL_ERROR_HANDLER \
|
||||||
@ -158,7 +158,7 @@
|
|||||||
|
|
||||||
/* A quick note: it is assumed that the call to `__errno_location' does
|
/* A quick note: it is assumed that the call to `__errno_location' does
|
||||||
not modify the stack! */
|
not modify the stack! */
|
||||||
#else /* Not _LIBC_REENTRANT. */
|
# else /* Not _LIBC_REENTRANT. */
|
||||||
# define SYSCALL_ERROR_HANDLER \
|
# define SYSCALL_ERROR_HANDLER \
|
||||||
0:movq errno@GOTPCREL(%RIP), %rcx; \
|
0:movq errno@GOTPCREL(%RIP), %rcx; \
|
||||||
xorl %edx, %edx; \
|
xorl %edx, %edx; \
|
||||||
@ -166,7 +166,7 @@
|
|||||||
movl %edx, (%rcx); \
|
movl %edx, (%rcx); \
|
||||||
orq $-1, %rax; \
|
orq $-1, %rax; \
|
||||||
jmp L(pseudo_end);
|
jmp L(pseudo_end);
|
||||||
#endif /* PIC */
|
# endif /* PIC */
|
||||||
|
|
||||||
/* The Linux/x86-64 kernel expects the system call parameters in
|
/* The Linux/x86-64 kernel expects the system call parameters in
|
||||||
registers according to the following table:
|
registers according to the following table:
|
||||||
@ -204,25 +204,25 @@
|
|||||||
|
|
||||||
Syscalls of more than 6 arguments are not supported. */
|
Syscalls of more than 6 arguments are not supported. */
|
||||||
|
|
||||||
#undef DO_CALL
|
# undef DO_CALL
|
||||||
#define DO_CALL(syscall_name, args) \
|
# define DO_CALL(syscall_name, args) \
|
||||||
DOARGS_##args \
|
DOARGS_##args \
|
||||||
movl $SYS_ify (syscall_name), %eax; \
|
movl $SYS_ify (syscall_name), %eax; \
|
||||||
syscall;
|
syscall;
|
||||||
|
|
||||||
#define DOARGS_0 /* nothing */
|
# define DOARGS_0 /* nothing */
|
||||||
#define DOARGS_1 /* nothing */
|
# define DOARGS_1 /* nothing */
|
||||||
#define DOARGS_2 /* nothing */
|
# define DOARGS_2 /* nothing */
|
||||||
#define DOARGS_3 /* nothing */
|
# define DOARGS_3 /* nothing */
|
||||||
#define DOARGS_4 movq %rcx, %r10;
|
# define DOARGS_4 movq %rcx, %r10;
|
||||||
#define DOARGS_5 DOARGS_4
|
# define DOARGS_5 DOARGS_4
|
||||||
#define DOARGS_6 DOARGS_5
|
# define DOARGS_6 DOARGS_5
|
||||||
|
|
||||||
#else /* !__ASSEMBLER__ */
|
#else /* !__ASSEMBLER__ */
|
||||||
/* Define a macro which expands inline into the wrapper code for a system
|
/* Define a macro which expands inline into the wrapper code for a system
|
||||||
call. */
|
call. */
|
||||||
#undef INLINE_SYSCALL
|
# undef INLINE_SYSCALL
|
||||||
#define INLINE_SYSCALL(name, nr, args...) \
|
# define INLINE_SYSCALL(name, nr, args...) \
|
||||||
({ \
|
({ \
|
||||||
unsigned long resultvar = INTERNAL_SYSCALL (name, , nr, args); \
|
unsigned long resultvar = INTERNAL_SYSCALL (name, , nr, args); \
|
||||||
if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (resultvar, ), 0)) \
|
if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (resultvar, ), 0)) \
|
||||||
@ -232,10 +232,10 @@
|
|||||||
} \
|
} \
|
||||||
(long) resultvar; })
|
(long) resultvar; })
|
||||||
|
|
||||||
#undef INTERNAL_SYSCALL_DECL
|
# undef INTERNAL_SYSCALL_DECL
|
||||||
#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
|
# define INTERNAL_SYSCALL_DECL(err) do { } while (0)
|
||||||
|
|
||||||
#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
|
# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
|
||||||
({ \
|
({ \
|
||||||
unsigned long resultvar; \
|
unsigned long resultvar; \
|
||||||
LOAD_ARGS_##nr (args) \
|
LOAD_ARGS_##nr (args) \
|
||||||
@ -245,68 +245,122 @@
|
|||||||
: "=a" (resultvar) \
|
: "=a" (resultvar) \
|
||||||
: "0" (name) ASM_ARGS_##nr : "memory", "cc", "r11", "cx"); \
|
: "0" (name) ASM_ARGS_##nr : "memory", "cc", "r11", "cx"); \
|
||||||
(long) resultvar; })
|
(long) resultvar; })
|
||||||
#undef INTERNAL_SYSCALL
|
# undef INTERNAL_SYSCALL
|
||||||
#define INTERNAL_SYSCALL(name, err, nr, args...) \
|
# define INTERNAL_SYSCALL(name, err, nr, args...) \
|
||||||
INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args)
|
INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args)
|
||||||
|
|
||||||
#undef INTERNAL_SYSCALL_ERROR_P
|
# undef INTERNAL_SYSCALL_ERROR_P
|
||||||
#define INTERNAL_SYSCALL_ERROR_P(val, err) \
|
# define INTERNAL_SYSCALL_ERROR_P(val, err) \
|
||||||
((unsigned long) (val) >= -4095L)
|
((unsigned long) (val) >= -4095L)
|
||||||
|
|
||||||
#undef INTERNAL_SYSCALL_ERRNO
|
# undef INTERNAL_SYSCALL_ERRNO
|
||||||
#define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
|
# define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
|
||||||
|
|
||||||
#define LOAD_ARGS_0()
|
# ifdef SHARED
|
||||||
#define LOAD_REGS_0
|
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||||
#define ASM_ARGS_0
|
({ \
|
||||||
|
__label__ out; \
|
||||||
|
__label__ iserr; \
|
||||||
|
INTERNAL_SYSCALL_DECL (sc_err); \
|
||||||
|
long int sc_ret; \
|
||||||
|
\
|
||||||
|
if (__vdso_##name != NULL) \
|
||||||
|
{ \
|
||||||
|
sc_ret = __vdso_##name (args); \
|
||||||
|
if (!INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
||||||
|
goto out; \
|
||||||
|
if (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err) != ENOSYS) \
|
||||||
|
goto iserr; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
sc_ret = INTERNAL_SYSCALL (name, sc_err, nr, ##args); \
|
||||||
|
if (INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
||||||
|
{ \
|
||||||
|
iserr: \
|
||||||
|
__set_errno (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err)); \
|
||||||
|
sc_ret = -1L; \
|
||||||
|
} \
|
||||||
|
out: \
|
||||||
|
sc_ret; \
|
||||||
|
})
|
||||||
|
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||||
|
({ \
|
||||||
|
__label__ out; \
|
||||||
|
long int v_ret; \
|
||||||
|
\
|
||||||
|
if (__vdso_##name != NULL) \
|
||||||
|
{ \
|
||||||
|
v_ret = __vdso_##name (args); \
|
||||||
|
if (!INTERNAL_SYSCALL_ERROR_P (v_ret, err) \
|
||||||
|
|| INTERNAL_SYSCALL_ERRNO (v_ret, err) != ENOSYS) \
|
||||||
|
goto out; \
|
||||||
|
} \
|
||||||
|
v_ret = INTERNAL_SYSCALL (name, err, nr, ##args); \
|
||||||
|
out: \
|
||||||
|
v_ret; \
|
||||||
|
})
|
||||||
|
|
||||||
#define LOAD_ARGS_1(a1) \
|
/* List of system calls which are supported as vsyscalls. */
|
||||||
|
# define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
||||||
|
|
||||||
|
# else
|
||||||
|
# define INLINE_VSYSCALL(name, nr, args...) \
|
||||||
|
INLINE_SYSCALL (name, nr, ##args)
|
||||||
|
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
|
||||||
|
INTERNAL_SYSCALL (name, err, nr, ##args)
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# define LOAD_ARGS_0()
|
||||||
|
# define LOAD_REGS_0
|
||||||
|
# define ASM_ARGS_0
|
||||||
|
|
||||||
|
# define LOAD_ARGS_1(a1) \
|
||||||
long int __arg1 = (long) (a1); \
|
long int __arg1 = (long) (a1); \
|
||||||
LOAD_ARGS_0 ()
|
LOAD_ARGS_0 ()
|
||||||
#define LOAD_REGS_1 \
|
# define LOAD_REGS_1 \
|
||||||
register long int _a1 asm ("rdi") = __arg1; \
|
register long int _a1 asm ("rdi") = __arg1; \
|
||||||
LOAD_REGS_0
|
LOAD_REGS_0
|
||||||
#define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1)
|
# define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1)
|
||||||
|
|
||||||
#define LOAD_ARGS_2(a1, a2) \
|
# define LOAD_ARGS_2(a1, a2) \
|
||||||
long int __arg2 = (long) (a2); \
|
long int __arg2 = (long) (a2); \
|
||||||
LOAD_ARGS_1 (a1)
|
LOAD_ARGS_1 (a1)
|
||||||
#define LOAD_REGS_2 \
|
# define LOAD_REGS_2 \
|
||||||
register long int _a2 asm ("rsi") = __arg2; \
|
register long int _a2 asm ("rsi") = __arg2; \
|
||||||
LOAD_REGS_1
|
LOAD_REGS_1
|
||||||
#define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2)
|
# define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2)
|
||||||
|
|
||||||
#define LOAD_ARGS_3(a1, a2, a3) \
|
# define LOAD_ARGS_3(a1, a2, a3) \
|
||||||
long int __arg3 = (long) (a3); \
|
long int __arg3 = (long) (a3); \
|
||||||
LOAD_ARGS_2 (a1, a2)
|
LOAD_ARGS_2 (a1, a2)
|
||||||
#define LOAD_REGS_3 \
|
# define LOAD_REGS_3 \
|
||||||
register long int _a3 asm ("rdx") = __arg3; \
|
register long int _a3 asm ("rdx") = __arg3; \
|
||||||
LOAD_REGS_2
|
LOAD_REGS_2
|
||||||
#define ASM_ARGS_3 ASM_ARGS_2, "r" (_a3)
|
# define ASM_ARGS_3 ASM_ARGS_2, "r" (_a3)
|
||||||
|
|
||||||
#define LOAD_ARGS_4(a1, a2, a3, a4) \
|
# define LOAD_ARGS_4(a1, a2, a3, a4) \
|
||||||
long int __arg4 = (long) (a4); \
|
long int __arg4 = (long) (a4); \
|
||||||
LOAD_ARGS_3 (a1, a2, a3)
|
LOAD_ARGS_3 (a1, a2, a3)
|
||||||
#define LOAD_REGS_4 \
|
# define LOAD_REGS_4 \
|
||||||
register long int _a4 asm ("r10") = __arg4; \
|
register long int _a4 asm ("r10") = __arg4; \
|
||||||
LOAD_REGS_3
|
LOAD_REGS_3
|
||||||
#define ASM_ARGS_4 ASM_ARGS_3, "r" (_a4)
|
# define ASM_ARGS_4 ASM_ARGS_3, "r" (_a4)
|
||||||
|
|
||||||
#define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
|
# define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
|
||||||
long int __arg5 = (long) (a5); \
|
long int __arg5 = (long) (a5); \
|
||||||
LOAD_ARGS_4 (a1, a2, a3, a4)
|
LOAD_ARGS_4 (a1, a2, a3, a4)
|
||||||
#define LOAD_REGS_5 \
|
# define LOAD_REGS_5 \
|
||||||
register long int _a5 asm ("r8") = __arg5; \
|
register long int _a5 asm ("r8") = __arg5; \
|
||||||
LOAD_REGS_4
|
LOAD_REGS_4
|
||||||
#define ASM_ARGS_5 ASM_ARGS_4, "r" (_a5)
|
# define ASM_ARGS_5 ASM_ARGS_4, "r" (_a5)
|
||||||
|
|
||||||
#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \
|
# define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \
|
||||||
long int __arg6 = (long) (a6); \
|
long int __arg6 = (long) (a6); \
|
||||||
LOAD_ARGS_5 (a1, a2, a3, a4, a5)
|
LOAD_ARGS_5 (a1, a2, a3, a4, a5)
|
||||||
#define LOAD_REGS_6 \
|
# define LOAD_REGS_6 \
|
||||||
register long int _a6 asm ("r9") = __arg6; \
|
register long int _a6 asm ("r9") = __arg6; \
|
||||||
LOAD_REGS_5
|
LOAD_REGS_5
|
||||||
#define ASM_ARGS_6 ASM_ARGS_5, "r" (_a6)
|
# define ASM_ARGS_6 ASM_ARGS_5, "r" (_a6)
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__ */
|
#endif /* __ASSEMBLER__ */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user