X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=compat_arch_x86.c;h=3e73f9c75953a8e967afe9064e3c79609dc0d2d5;hp=692417ee5067607293ef3c9129f34f8a8b7bb739;hb=7be759d1adf95b168f09e513232ea26de15e1eaf;hpb=bf33aaea06cbf8257cc49c38abca6d26c0c31c78 diff --git a/compat_arch_x86.c b/compat_arch_x86.c index 692417e..3e73f9c 100644 --- a/compat_arch_x86.c +++ b/compat_arch_x86.c @@ -24,7 +24,15 @@ #include #include #include -#include +#include + +/* + * Using attribute "weak" for __rcu_cas_avail and + * __urcu_x86_compat_mutex. Those are globally visible by the entire + * program, even though many shared objects may have their own version. + * The first version that gets loaded will be used by the entire + * program (executable and all shared objects). + */ /* * It does not really matter if the constructor is called before using @@ -38,9 +46,11 @@ int __attribute__((constructor)) __rcu_cas_init(void); * 1: available * 0: unavailable */ +__attribute__((weak)) int __rcu_cas_avail = -1; -static pthread_mutex_t compat_mutex = PTHREAD_MUTEX_INITIALIZER; +__attribute__((weak)) +pthread_mutex_t __urcu_x86_compat_mutex = PTHREAD_MUTEX_INITIALIZER; /* * get_eflags/set_eflags/compare_and_swap_is_available imported from glibc @@ -80,11 +90,11 @@ static void mutex_lock_signal_save(pthread_mutex_t *mutex, sigset_t *oldmask) int ret; /* Disable signals */ - ret = sigemptyset(&newmask); + ret = sigfillset(&newmask); assert(!ret); - ret = pthread_sigmask(SIG_SETMASK, &newmask, oldmask); + ret = pthread_sigmask(SIG_BLOCK, &newmask, oldmask); assert(!ret); - ret = pthread_mutex_lock(&compat_mutex); + ret = pthread_mutex_lock(&__urcu_x86_compat_mutex); assert(!ret); } @@ -92,7 +102,7 @@ static void mutex_lock_signal_restore(pthread_mutex_t *mutex, sigset_t *oldmask) { int ret; - ret = pthread_mutex_unlock(&compat_mutex); + ret = pthread_mutex_unlock(&__urcu_x86_compat_mutex); assert(!ret); ret = pthread_sigmask(SIG_SETMASK, oldmask, NULL); assert(!ret); @@ -103,7 +113,7 @@ unsigned long _compat_uatomic_set(void *addr, unsigned long _new, int len) sigset_t mask; unsigned long result; - mutex_lock_signal_save(&compat_mutex, &mask); + mutex_lock_signal_save(&__urcu_x86_compat_mutex, &mask); switch (len) { case 1: *(unsigned char *)addr = (unsigned char)_new; @@ -122,10 +132,11 @@ unsigned long _compat_uatomic_set(void *addr, unsigned long _new, int len) * generate an illegal instruction. Cannot catch this with * linker tricks when optimizations are disabled. */ + result = 0; __asm__ __volatile__("ud2"); } - mutex_lock_signal_restore(&compat_mutex, &mask); - return _new; + mutex_lock_signal_restore(&__urcu_x86_compat_mutex, &mask); + return result; } unsigned long _compat_uatomic_xchg(void *addr, unsigned long _new, int len) @@ -133,7 +144,7 @@ unsigned long _compat_uatomic_xchg(void *addr, unsigned long _new, int len) sigset_t mask; unsigned long retval; - mutex_lock_signal_save(&compat_mutex, &mask); + mutex_lock_signal_save(&__urcu_x86_compat_mutex, &mask); switch (len) { case 1: retval = *(unsigned char *)addr; @@ -152,9 +163,10 @@ unsigned long _compat_uatomic_xchg(void *addr, unsigned long _new, int len) * generate an illegal instruction. Cannot catch this with * linker tricks when optimizations are disabled. */ + retval = 0; /* silence gcc warnings */ __asm__ __volatile__("ud2"); } - mutex_lock_signal_restore(&compat_mutex, &mask); + mutex_lock_signal_restore(&__urcu_x86_compat_mutex, &mask); return retval; } @@ -164,7 +176,7 @@ unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old, unsigned long retval; sigset_t mask; - mutex_lock_signal_save(&compat_mutex, &mask); + mutex_lock_signal_save(&__urcu_x86_compat_mutex, &mask); switch (len) { case 1: { @@ -195,9 +207,10 @@ unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old, * generate an illegal instruction. Cannot catch this with * linker tricks when optimizations are disabled. */ + retval = 0; /* silence gcc warnings */ __asm__ __volatile__("ud2"); } - mutex_lock_signal_restore(&compat_mutex, &mask); + mutex_lock_signal_restore(&__urcu_x86_compat_mutex, &mask); return retval; } @@ -205,7 +218,7 @@ void _compat_uatomic_or(void *addr, unsigned long v, int len) { sigset_t mask; - mutex_lock_signal_save(&compat_mutex, &mask); + mutex_lock_signal_save(&__urcu_x86_compat_mutex, &mask); switch (len) { case 1: *(unsigned char *)addr |= (unsigned char)v; @@ -223,14 +236,14 @@ void _compat_uatomic_or(void *addr, unsigned long v, int len) */ __asm__ __volatile__("ud2"); } - mutex_lock_signal_restore(&compat_mutex, &mask); + mutex_lock_signal_restore(&__urcu_x86_compat_mutex, &mask); } void _compat_uatomic_and(void *addr, unsigned long v, int len) { sigset_t mask; - mutex_lock_signal_save(&compat_mutex, &mask); + mutex_lock_signal_save(&__urcu_x86_compat_mutex, &mask); switch (len) { case 1: *(unsigned char *)addr &= (unsigned char)v; @@ -248,7 +261,7 @@ void _compat_uatomic_and(void *addr, unsigned long v, int len) */ __asm__ __volatile__("ud2"); } - mutex_lock_signal_restore(&compat_mutex, &mask); + mutex_lock_signal_restore(&__urcu_x86_compat_mutex, &mask); } unsigned long _compat_uatomic_add_return(void *addr, unsigned long v, int len) @@ -256,7 +269,7 @@ unsigned long _compat_uatomic_add_return(void *addr, unsigned long v, int len) sigset_t mask; unsigned long result; - mutex_lock_signal_save(&compat_mutex, &mask); + mutex_lock_signal_save(&__urcu_x86_compat_mutex, &mask); switch (len) { case 1: *(unsigned char *)addr += (unsigned char)v; @@ -275,9 +288,10 @@ unsigned long _compat_uatomic_add_return(void *addr, unsigned long v, int len) * generate an illegal instruction. Cannot catch this with * linker tricks when optimizations are disabled. */ + result = 0; /* silence gcc warnings */ __asm__ __volatile__("ud2"); } - mutex_lock_signal_restore(&compat_mutex, &mask); + mutex_lock_signal_restore(&__urcu_x86_compat_mutex, &mask); return result; }