diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-12-10 23:02:33 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-12-10 23:02:33 +0000 |
commit | c776b3d717593ee3fdd2120f80217f0abe0dec74 (patch) | |
tree | 48e533ed0c7fd5ed1064c2872567493eccd5a82e /nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h | |
parent | 26b30508e02c05d506295954d453d797e0c23cb5 (diff) | |
download | glibc-c776b3d717593ee3fdd2120f80217f0abe0dec74.tar.gz glibc-c776b3d717593ee3fdd2120f80217f0abe0dec74.tar.xz glibc-c776b3d717593ee3fdd2120f80217f0abe0dec74.zip |
Update.
2003-12-02 David Mosberger <davidm@hpl.hp.com> * sysdeps/ia64/elf/initfini.c: Add unwind info. * sysdeps/ia64/dl-machine.h (elf_machine_matches_host): Mark with attribute "unused". (elf_machine_dynamic): Mark with attributes "unused" and "const". (elf_machine_runtime_setup): Likewise. * sysdeps/generic/dl-fptr.c (make_fptr_table): Mark with attribute "always_inline". * sysdeps/ia64/dl-machine.h (__ia64_init_bootstrap_fdesc_table): Likewise. * configure.in: Check whether compiler has libunwind support. * config.make.in (have-cc-with-libunwind): New variable. * config.h.in (HAVE_CC_WITH_LIBUNWIND): New macro. * Makeconfig (gnulib): If have-cc-withh-libunwind is "yes", also mention -lunwind. 003-11-12 David Mosberger <davidm@hpl.hp.com> * sysdeps/unix/sysv/linux/ia64/sysdep.h: Define DO_CALL_VIA_BREAK. Redefine DO_CALL to use vdso if supported, otherwise DO_CALL_VIA_BREAK. Likewise for DO_INLINE_SYSCALL. Make INTERNAL_SYSCALL use DO_INLINE_SYSCALL. * sysdeps/unix/sysv/linux/ia64/vfork.S: Use DO_CALL_VIA_BREAK() instead of DO_CALL(). * sysdeps/unix/sysv/linux/ia64/clone2.S: Use break directly instead of DO_CALL(). * sysdeps/unix/sysv/linux/ia64/brk.S (__curbrk): Restructure it to take advantage of DO_CALL() macro. * sysdeps/unix/sysv/linux/ia64/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/ia64/getcontext.S: Likewise. * elf/rtld.c (dl_main): Restrict dl_sysinfo_dso check to first program header. On ia64, the check failed previously because there are two program headers. * sysdeps/generic/s_nexttowardf.c: Likewise. * math/bug-nexttoward.c: New file.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h | 182 |
1 files changed, 59 insertions, 123 deletions
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)) |