diff options
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h | 64 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h | 182 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/pt-vfork.S | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h | 80 |
4 files changed, 205 insertions, 123 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h new file mode 100644 index 0000000000..e499be1e49 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h @@ -0,0 +1,64 @@ +/* System-specific settings for dynamic linker code. IA-64 version. + Copyright (C) 2003 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 _DL_SYSDEP_H +#define _DL_SYSDEP_H 1 + +/* This macro must be defined to either 0 or 1. + + If 1, then an errno global variable hidden in ld.so will work right with + all the errno-using libc code compiled for ld.so, and there is never a + need to share the errno location with libc. This is appropriate only if + all the libc functions that ld.so uses are called without PLT and always + get the versions linked into ld.so rather than the libc ones. */ + +#ifdef IS_IN_rtld +# define RTLD_PRIVATE_ERRNO 1 +#else +# define RTLD_PRIVATE_ERRNO 0 +#endif + +/* Traditionally system calls have been made using break 0x100000. A + second method was introduced which, if possible, will use the EPC + instruction. To signal the presence and where to find the code the + kernel passes an AT_SYSINFO_EHDR pointer in the auxiliary vector to + the application. */ +#define NEED_DL_SYSINFO 1 +#define USE_DL_SYSINFO 1 + +#if defined NEED_DL_SYSINFO && !defined __ASSEMBLER__ +/* Don't declare this as a function---we want it's entry-point, not + it's function descriptor... */ +extern int _dl_sysinfo_break attribute_hidden; +# define DL_SYSINFO_DEFAULT ((uintptr_t) &_dl_sysinfo_break) +# define DL_SYSINFO_IMPLEMENTATION \ + asm (".text\n\t" \ + ".hidden _dl_sysinfo_break\n\t" \ + ".proc _dl_sysinfo_break\n\t" \ + "_dl_sysinfo_break:\n\t" \ + ".prologue\n\t" \ + ".altrp b6\n\t" \ + ".body\n\t" \ + "break 0x100000;\n\t" \ + "br.ret.sptk.many b6;\n\t" \ + ".endp _dl_sysinfo_break" \ + ".previous"); +#endif + +#endif /* dl-sysdep.h */ diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h index d068b06894..e462776c02 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h @@ -26,7 +26,7 @@ #include <ia64intrin.h> #include <atomic.h> -#define SYS_futex 1230 +#define __NR_futex 1230 #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 #define FUTEX_REQUEUE 3 @@ -34,112 +34,52 @@ /* Initializer for compatibility lock. */ #define LLL_MUTEX_LOCK_INITIALIZER (0) -#define lll_futex_clobbers \ - "out5", "out6", "out7", \ - /* Non-stacked integer registers, minus r8, r10, r15. */ \ - "r2", "r3", "r9", "r11", "r12", "r13", "r14", "r16", "r17", "r18", \ - "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", \ - "r28", "r29", "r30", "r31", \ - /* Predicate registers. */ \ - "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", \ - /* Non-rotating fp registers. */ \ - "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ - /* Branch registers. */ \ - "b6", "b7", \ - "memory" - #define lll_futex_wait(futex, val) lll_futex_timed_wait (futex, val, 0) -#define lll_futex_timed_wait(futex, val, timespec) \ - ({ \ - register long int __o0 asm ("out0") = (long int) (futex); \ - register long int __o1 asm ("out1") = FUTEX_WAIT; \ - register int __o2 asm ("out2") = (int) (val); \ - register long int __o3 asm ("out3") = (long int) (timespec); \ - register long int __r8 asm ("r8"); \ - register long int __r10 asm ("r10"); \ - register long int __r15 asm ("r15") = SYS_futex; \ - \ - __asm __volatile ("break %7;;" \ - : "=r" (__r8), "=r" (__r10), "=r" (__r15), \ - "=r" (__o0), "=r" (__o1), "=r" (__o2), "=r" (__o3) \ - : "i" (0x100000), "2" (__r15), "3" (__o0), "4" (__o1), \ - "5" (__o2), "6" (__o3) \ - : "out4", lll_futex_clobbers); \ - __r10 == -1 ? -__r8 : __r8; \ - }) - - -#define lll_futex_wake(futex, nr) \ - ({ \ - register long int __o0 asm ("out0") = (long int) (futex); \ - register long int __o1 asm ("out1") = FUTEX_WAKE; \ - register int __o2 asm ("out2") = (int) (nr); \ - register long int __r8 asm ("r8"); \ - register long int __r10 asm ("r10"); \ - register long int __r15 asm ("r15") = SYS_futex; \ - \ - __asm __volatile ("break %6;;" \ - : "=r" (__r8), "=r" (__r10), "=r" (__r15), \ - "=r" (__o0), "=r" (__o1), "=r" (__o2) \ - : "i" (0x100000), "2" (__r15), "3" (__o0), "4" (__o1), \ - "5" (__o2) \ - : "out3", "out4", lll_futex_clobbers); \ - __r10 == -1 ? -__r8 : __r8; \ - }) - - -#define lll_futex_requeue(futex, nr_wake, nr_move, mutex) \ - ({ \ - register long int __o0 asm ("out0") = (long int) (futex); \ - register long int __o1 asm ("out1") = FUTEX_REQUEUE; \ - register int __o2 asm ("out2") = (int) (nr_wake); \ - register int __o3 asm ("out3") = (int) (nr_move); \ - register long int __o4 asm ("out4") = (long int) (mutex); \ - register long int __r8 asm ("r8"); \ - register long int __r10 asm ("r10"); \ - register long int __r15 asm ("r15") = SYS_futex; \ - \ - __asm __volatile ("break %8;;" \ - : "=r" (__r8), "=r" (__r10), "=r" (__r15), \ - "=r" (__o0), "=r" (__o1), "=r" (__o2), "=r" (__o3), \ - "=r" (__o4) \ - : "i" (0x100000), "2" (__r15), "3" (__o0), "4" (__o1), \ - "5" (__o2), "6" (__o3), "7" (__o4) \ - : lll_futex_clobbers); \ - __r10 == -1 ? -__r8 : __r8; \ - }) - - -static inline int -__attribute__ ((always_inline)) -__lll_mutex_trylock (int *futex) -{ - return atomic_compare_and_exchange_val_acq (futex, 1, 0) != 0; -} +#define lll_futex_timed_wait(ftx, val, timespec) \ +({ \ + DO_INLINE_SYSCALL(futex, 4, (long) (ftx), FUTEX_WAIT, (int) (val), \ + (long) (timespec)); \ + _r10 == -1 ? -_retval : _retval; \ +}) + +#define lll_futex_wake(ftx, nr) \ +({ \ + DO_INLINE_SYSCALL(futex, 3, (long) (ftx), FUTEX_WAKE, (int) (nr)); \ + _r10 == -1 ? -_retval : _retval; \ +}) + +#define lll_futex_requeue(ftx, nr_wake, nr_move, mutex) \ +({ \ + DO_INLINE_SYSCALL(futex, 5, (long) (ftx), FUTEX_REQUEUE, (int) (nr_wake), \ + (int) (nr_move), (long) (mutex)); \ + _r10 == -1 ? -_retval : _retval; \ +}) + + +#define __lll_mutex_trylock(futex) \ + (atomic_compare_and_exchange_val_acq (futex, 1, 0) != 0) #define lll_mutex_trylock(futex) __lll_mutex_trylock (&(futex)) extern void __lll_lock_wait (int *futex) attribute_hidden; -static inline void -__attribute__ ((always_inline)) -__lll_mutex_lock (int *futex) -{ - if (atomic_compare_and_exchange_bool_acq (futex, 1, 0) != 0) - __lll_lock_wait (futex); -} +#define __lll_mutex_lock(futex) \ + ((void) ({ \ + int *__futex = (futex); \ + if (atomic_compare_and_exchange_bool_acq (__futex, 1, 0) != 0) \ + __lll_lock_wait (__futex); \ + })) #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex)) -static inline void -__attribute__ ((always_inline)) -__lll_mutex_cond_lock (int *futex) -{ - if (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0) - __lll_lock_wait (futex); -} +#define __lll_mutex_cond_lock(futex) \ + ((void) ({ \ + int *__futex = (futex); \ + if (atomic_compare_and_exchange_bool_acq (__futex, 2, 0) != 0) \ + __lll_lock_wait (__futex); \ + })) #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) @@ -147,41 +87,37 @@ extern int __lll_timedlock_wait (int *futex, const struct timespec *) attribute_hidden; -static inline int -__attribute__ ((always_inline)) -__lll_mutex_timedlock (int *futex, const struct timespec *abstime) -{ - int result = 0; - - if (atomic_compare_and_exchange_bool_acq (futex, 1, 0) != 0) - result = __lll_timedlock_wait (futex, abstime); - - return result; -} +#define __lll_mutex_timedlock(futex, abstime) \ + ({ \ + int *__futex = (futex); \ + int __val = 0; \ + \ + if (atomic_compare_and_exchange_bool_acq (__futex, 1, 0) != 0) \ + __val = __lll_timedlock_wait (__futex, abstime); \ + __val; \ + }) #define lll_mutex_timedlock(futex, abstime) \ __lll_mutex_timedlock (&(futex), abstime) -static inline void -__attribute__ ((always_inline)) -__lll_mutex_unlock (int *futex) -{ - int val = atomic_exchange_rel (futex, 0); - - if (__builtin_expect (val > 1, 0)) - lll_futex_wake (futex, 1); -} +#define __lll_mutex_unlock(futex) \ + ((void) ({ \ + int *__futex = (futex); \ + int __val = atomic_exchange_rel (__futex, 0); \ + \ + if (__builtin_expect (__val > 1, 0)) \ + lll_futex_wake (__futex, 1); \ + })) #define lll_mutex_unlock(futex) \ __lll_mutex_unlock(&(futex)) -static inline void -__attribute__ ((always_inline)) -__lll_mutex_unlock_force (int *futex) -{ - (void) atomic_exchange_rel (futex, 0); - lll_futex_wake (futex, 1); -} +#define __lll_mutex_unlock_force(futex) \ + ((void) ({ \ + int *__futex = (futex); \ + (void) atomic_exchange_rel (__futex, 0); \ + lll_futex_wake (__futex, 1); \ + })) #define lll_mutex_unlock_force(futex) \ __lll_mutex_unlock_force(&(futex)) diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/ia64/pt-vfork.S index 7be80e9033..a8e2e492d3 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/pt-vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/ia64/pt-vfork.S @@ -30,6 +30,8 @@ /* Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0) */ ENTRY(__vfork) + .prologue // work around a GAS bug which triggers if + .body // first .prologue is not at the beginning of proc. alloc r2=ar.pfs,0,0,2,0 mov out0=CLONE_VM+CLONE_VFORK+SIGCHLD mov out1=0 /* Standard sp value. */ diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index 45270c1e25..2fe1c6ad45 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -26,6 +26,9 @@ #if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt # undef PSEUDO + +#ifndef USE_DL_SYSINFO + # define PSEUDO(name, syscall_name, args) \ .text; \ ENTRY (name) \ @@ -88,6 +91,83 @@ __syscall_error_##args: \ mov r8 = -1; \ mov ar.pfs = loc0 +#else /* USE_DL_SYSINFO */ + +# define PSEUDO(name, syscall_name, args) \ +.text; \ +ENTRY (name) \ + .prologue; \ + adds r2 = SYSINFO_OFFSET, r13; \ + adds r14 = MULTIPLE_THREADS_OFFSET, r13; \ + .save ar.pfs, r11; \ + mov r11 = ar.pfs;; \ + .body; \ + ld4 r14 = [r14]; \ + ld8 r2 = [r2]; \ + mov r15 = SYS_ify(syscall_name);; \ + cmp4.ne p6, p7 = 0, r14; \ + mov b7 = r2; \ +(p6) br.cond.spnt .Lpseudo_cancel; \ + br.call.sptk.many b6 = b7;; \ + mov ar.pfs = r11; \ + cmp.eq p6,p0 = -1, r10; \ +(p6) br.cond.spnt.few __syscall_error; \ + ret;; \ + .endp name; \ + .proc __GC_##name; \ + .globl __GC_##name; \ + .hidden __GC_##name; \ +__GC_##name: \ +.Lpseudo_cancel: \ + .prologue; \ + .regstk args, 5, args, 0; \ + .save ar.pfs, loc0; \ + alloc loc0 = ar.pfs, args, 5, args, 0; \ + adds loc4 = SYSINFO_OFFSET, r13; \ + .save rp, loc1; \ + mov loc1 = rp;; \ + .body; \ + ld8 loc4 = [loc4]; \ + CENABLE;; \ + mov loc2 = r8; \ + mov b7 = loc4; \ + COPY_ARGS_##args \ + mov r15 = SYS_ify(syscall_name); \ + br.call.sptk.many b6 = b7;; \ + mov loc3 = r8; \ + mov loc4 = r10; \ + mov out0 = loc2; \ + CDISABLE;; \ + cmp.eq p6,p0=-1,loc4; \ +(p6) br.cond.spnt.few __syscall_error_##args; \ + mov r8 = loc3; \ + mov rp = loc1; \ + mov ar.pfs = loc0; \ +.Lpseudo_end: \ + ret; \ + .endp __GC_##name; \ +.section .gnu.linkonce.t.__syscall_error_##args, "ax"; \ + .align 32; \ + .proc __syscall_error_##args; \ + .global __syscall_error_##args; \ + .hidden __syscall_error_##args; \ + .size __syscall_error_##args, 64; \ +__syscall_error_##args: \ + .prologue; \ + .regstk args, 5, args, 0; \ + .save ar.pfs, loc0; \ + .save rp, loc1; \ + .body; \ + mov loc4 = r1;; \ + br.call.sptk.many b0 = __errno_location;; \ + st4 [r8] = loc3; \ + mov r1 = loc4; \ + mov rp = loc1; \ + mov r8 = -1; \ + mov ar.pfs = loc0 + +#endif /* USE_DL_SYSINFO */ + #undef PSEUDO_END #define PSEUDO_END(name) .endp |