]> sourceware.org Git - glibc.git/commitdiff
x86: Merge i386/x86_64 atomic-machine.h
authorH.J. Lu <hjl.tools@gmail.com>
Tue, 18 Dec 2018 12:25:12 +0000 (04:25 -0800)
committerH.J. Lu <hjl.tools@gmail.com>
Tue, 18 Dec 2018 12:25:26 +0000 (04:25 -0800)
Merge i386 and x86_64 atomic-machine.h to x86 atomic-machine.h.

Tested on i686 and x86_64 as well as with build-many-glibcs.py.

* sysdeps/i386/atomic-machine.h: Merged with ...
* sysdeps/x86_64/atomic-machine.h: To ...
* sysdeps/x86/atomic-machine.h: This.  New file.

ChangeLog
sysdeps/i386/atomic-machine.h [deleted file]
sysdeps/x86/atomic-machine.h [moved from sysdeps/x86_64/atomic-machine.h with 70% similarity]

index 6702a39f6cfa5de1cf348b7faf28efd33a071699..a7f7e0cae65d06d6c0a2995c2c38912da138011b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/atomic-machine.h: Merged with ...
+       * sysdeps/x86_64/atomic-machine.h: To ...
+       * sysdeps/x86/atomic-machine.h: This.  New file.
+
 2018-12-18  Florian Weimer  <fweimer@redhat.com>
 
        Rewrite locale/gen-translit.pl in Python.
diff --git a/sysdeps/i386/atomic-machine.h b/sysdeps/i386/atomic-machine.h
deleted file mode 100644 (file)
index 272da5d..0000000
+++ /dev/null
@@ -1,545 +0,0 @@
-/* Copyright (C) 2002-2018 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-   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 <stdint.h>
-#include <tls.h>       /* For tcbhead_t.  */
-
-
-typedef int8_t atomic8_t;
-typedef uint8_t uatomic8_t;
-typedef int_fast8_t atomic_fast8_t;
-typedef uint_fast8_t uatomic_fast8_t;
-
-typedef int16_t atomic16_t;
-typedef uint16_t uatomic16_t;
-typedef int_fast16_t atomic_fast16_t;
-typedef uint_fast16_t uatomic_fast16_t;
-
-typedef int32_t atomic32_t;
-typedef uint32_t uatomic32_t;
-typedef int_fast32_t atomic_fast32_t;
-typedef uint_fast32_t uatomic_fast32_t;
-
-typedef int64_t atomic64_t;
-typedef uint64_t uatomic64_t;
-typedef int_fast64_t atomic_fast64_t;
-typedef uint_fast64_t uatomic_fast64_t;
-
-typedef intptr_t atomicptr_t;
-typedef uintptr_t uatomicptr_t;
-typedef intmax_t atomic_max_t;
-typedef uintmax_t uatomic_max_t;
-
-
-#ifndef LOCK_PREFIX
-# ifdef UP
-#  define LOCK_PREFIX  /* nothing */
-# else
-#  define LOCK_PREFIX "lock;"
-# endif
-#endif
-
-#define __HAVE_64B_ATOMICS 0
-#define USE_ATOMIC_COMPILER_BUILTINS 0
-#define ATOMIC_EXCHANGE_USES_CAS 0
-
-
-#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
-  __sync_val_compare_and_swap (mem, oldval, newval)
-#define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
-  (! __sync_bool_compare_and_swap (mem, oldval, newval))
-
-
-#define __arch_c_compare_and_exchange_val_8_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile ("cmpl $0, %%gs:%P5\n\t"                                \
-                       "je 0f\n\t"                                            \
-                       "lock\n"                                               \
-                       "0:\tcmpxchgb %b2, %1"                                \
-                      : "=a" (ret), "=m" (*mem)                              \
-                      : "q" (newval), "m" (*mem), "0" (oldval),              \
-                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
-     ret; })
-
-#define __arch_c_compare_and_exchange_val_16_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile ("cmpl $0, %%gs:%P5\n\t"                                \
-                       "je 0f\n\t"                                            \
-                       "lock\n"                                               \
-                       "0:\tcmpxchgw %w2, %1"                                \
-                      : "=a" (ret), "=m" (*mem)                              \
-                      : "r" (newval), "m" (*mem), "0" (oldval),              \
-                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
-     ret; })
-
-#define __arch_c_compare_and_exchange_val_32_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile ("cmpl $0, %%gs:%P5\n\t"                                \
-                       "je 0f\n\t"                                            \
-                       "lock\n"                                               \
-                       "0:\tcmpxchgl %2, %1"                                 \
-                      : "=a" (ret), "=m" (*mem)                              \
-                      : "r" (newval), "m" (*mem), "0" (oldval),              \
-                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
-     ret; })
-
-/* XXX We do not really need 64-bit compare-and-exchange.  At least
-   not in the moment.  Using it would mean causing portability
-   problems since not many other 32-bit architectures have support for
-   such an operation.  So don't define any code for now.  If it is
-   really going to be used the code below can be used on Intel Pentium
-   and later, but NOT on i486.  */
-#if 1
-# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval)         \
-  ({ __typeof (*mem) ret = *(mem);                                           \
-     abort ();                                                               \
-     ret = (newval);                                                         \
-     ret = (oldval);                                                         \
-     ret; })
-# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval)       \
-  ({ __typeof (*mem) ret = *(mem);                                           \
-     abort ();                                                               \
-     ret = (newval);                                                         \
-     ret = (oldval);                                                         \
-     ret; })
-#else
-# ifdef __PIC__
-#  define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile ("xchgl %2, %%ebx\n\t"                                 \
-                      LOCK_PREFIX "cmpxchg8b %1\n\t"                         \
-                      "xchgl %2, %%ebx"                                      \
-                      : "=A" (ret), "=m" (*mem)                              \
-                      : "DS" (((unsigned long long int) (newval))            \
-                              & 0xffffffff),                                 \
-                        "c" (((unsigned long long int) (newval)) >> 32),     \
-                        "m" (*mem), "a" (((unsigned long long int) (oldval)) \
-                                         & 0xffffffff),                      \
-                        "d" (((unsigned long long int) (oldval)) >> 32));    \
-     ret; })
-
-#  define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile ("xchgl %2, %%ebx\n\t"                                 \
-                      "cmpl $0, %%gs:%P7\n\t"                                \
-                      "je 0f\n\t"                                            \
-                      "lock\n"                                               \
-                      "0:\tcmpxchg8b %1\n\t"                                 \
-                      "xchgl %2, %%ebx"                                      \
-                      : "=A" (ret), "=m" (*mem)                              \
-                      : "DS" (((unsigned long long int) (newval))            \
-                              & 0xffffffff),                                 \
-                        "c" (((unsigned long long int) (newval)) >> 32),     \
-                        "m" (*mem), "a" (((unsigned long long int) (oldval)) \
-                                         & 0xffffffff),                      \
-                        "d" (((unsigned long long int) (oldval)) >> 32),     \
-                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
-     ret; })
-# else
-#  define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile (LOCK_PREFIX "cmpxchg8b %1"                            \
-                      : "=A" (ret), "=m" (*mem)                              \
-                      : "b" (((unsigned long long int) (newval))             \
-                             & 0xffffffff),                                  \
-                        "c" (((unsigned long long int) (newval)) >> 32),     \
-                        "m" (*mem), "a" (((unsigned long long int) (oldval)) \
-                                         & 0xffffffff),                      \
-                        "d" (((unsigned long long int) (oldval)) >> 32));    \
-     ret; })
-
-#  define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
-  ({ __typeof (*mem) ret;                                                    \
-     __asm __volatile ("cmpl $0, %%gs:%P7\n\t"                               \
-                      "je 0f\n\t"                                            \
-                      "lock\n"                                               \
-                      "0:\tcmpxchg8b %1"                                     \
-                      : "=A" (ret), "=m" (*mem)                              \
-                      : "b" (((unsigned long long int) (newval))             \
-                             & 0xffffffff),                                  \
-                        "c" (((unsigned long long int) (newval)) >> 32),     \
-                        "m" (*mem), "a" (((unsigned long long int) (oldval)) \
-                                         & 0xffffffff),                      \
-                        "d" (((unsigned long long int) (oldval)) >> 32),     \
-                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
-     ret; })
-# endif
-#endif
-
-
-/* Note that we need no lock prefix.  */
-#define atomic_exchange_acq(mem, newvalue) \
-  ({ __typeof (*mem) result;                                                 \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile ("xchgb %b0, %1"                                     \
-                        : "=q" (result), "=m" (*mem)                         \
-                        : "0" (newvalue), "m" (*mem));                       \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile ("xchgw %w0, %1"                                     \
-                        : "=r" (result), "=m" (*mem)                         \
-                        : "0" (newvalue), "m" (*mem));                       \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile ("xchgl %0, %1"                                              \
-                        : "=r" (result), "=m" (*mem)                         \
-                        : "0" (newvalue), "m" (*mem));                       \
-     else                                                                    \
-       {                                                                     \
-        result = 0;                                                          \
-        abort ();                                                            \
-       }                                                                     \
-     result; })
-
-
-#define __arch_exchange_and_add_body(lock, pfx, mem, value) \
-  ({ __typeof (*mem) __result;                                               \
-     __typeof (value) __addval = (value);                                    \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (lock "xaddb %b0, %1"                                \
-                        : "=q" (__result), "=m" (*mem)                       \
-                        : "0" (__addval), "m" (*mem),                        \
-                          "i" (offsetof (tcbhead_t, multiple_threads)));     \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (lock "xaddw %w0, %1"                                \
-                        : "=r" (__result), "=m" (*mem)                       \
-                        : "0" (__addval), "m" (*mem),                        \
-                          "i" (offsetof (tcbhead_t, multiple_threads)));     \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile (lock "xaddl %0, %1"                                 \
-                        : "=r" (__result), "=m" (*mem)                       \
-                        : "0" (__addval), "m" (*mem),                        \
-                          "i" (offsetof (tcbhead_t, multiple_threads)));     \
-     else                                                                    \
-       {                                                                     \
-        __typeof (mem) __memp = (mem);                                       \
-        __typeof (*mem) __tmpval;                                            \
-        __result = *__memp;                                                  \
-        do                                                                   \
-          __tmpval = __result;                                               \
-        while ((__result = pfx##_compare_and_exchange_val_64_acq             \
-                (__memp, __result + __addval, __result)) == __tmpval);       \
-       }                                                                     \
-     __result; })
-
-#define atomic_exchange_and_add(mem, value) \
-  __sync_fetch_and_add (mem, value)
-
-#define __arch_exchange_and_add_cprefix \
-  "cmpl $0, %%gs:%P4\n\tje 0f\n\tlock\n0:\t"
-
-#define catomic_exchange_and_add(mem, value) \
-  __arch_exchange_and_add_body (__arch_exchange_and_add_cprefix, __arch_c,    \
-                               mem, value)
-
-
-#define __arch_add_body(lock, pfx, mem, value) \
-  do {                                                                       \
-    if (__builtin_constant_p (value) && (value) == 1)                        \
-      atomic_increment (mem);                                                \
-    else if (__builtin_constant_p (value) && (value) == -1)                  \
-      atomic_decrement (mem);                                                \
-    else if (sizeof (*mem) == 1)                                             \
-      __asm __volatile (lock "addb %b1, %0"                                  \
-                       : "=m" (*mem)                                         \
-                       : "iq" (value), "m" (*mem),                           \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 2)                                             \
-      __asm __volatile (lock "addw %w1, %0"                                  \
-                       : "=m" (*mem)                                         \
-                       : "ir" (value), "m" (*mem),                           \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 4)                                             \
-      __asm __volatile (lock "addl %1, %0"                                   \
-                       : "=m" (*mem)                                         \
-                       : "ir" (value), "m" (*mem),                           \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
-      {                                                                              \
-       __typeof (value) __addval = (value);                                  \
-       __typeof (mem) __memp = (mem);                                        \
-       __typeof (*mem) __oldval = *__memp;                                   \
-       __typeof (*mem) __tmpval;                                             \
-       do                                                                    \
-         __tmpval = __oldval;                                                \
-       while ((__oldval = pfx##_compare_and_exchange_val_64_acq              \
-               (__memp, __oldval + __addval, __oldval)) == __tmpval);        \
-      }                                                                              \
-  } while (0)
-
-#define atomic_add(mem, value) \
-  __arch_add_body (LOCK_PREFIX, __arch, mem, value)
-
-#define __arch_add_cprefix \
-  "cmpl $0, %%gs:%P3\n\tje 0f\n\tlock\n0:\t"
-
-#define catomic_add(mem, value) \
-  __arch_add_body (__arch_add_cprefix, __arch_c, mem, value)
-
-
-#define atomic_add_negative(mem, value) \
-  ({ unsigned char __result;                                                 \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (LOCK_PREFIX "addb %b2, %0; sets %1"                 \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "iq" (value), "m" (*mem));                         \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (LOCK_PREFIX "addw %w2, %0; sets %1"                 \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "ir" (value), "m" (*mem));                         \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile (LOCK_PREFIX "addl %2, %0; sets %1"                  \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "ir" (value), "m" (*mem));                         \
-     else                                                                    \
-       abort ();                                                             \
-     __result; })
-
-
-#define atomic_add_zero(mem, value) \
-  ({ unsigned char __result;                                                 \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (LOCK_PREFIX "addb %b2, %0; setz %1"                 \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "iq" (value), "m" (*mem));                         \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (LOCK_PREFIX "addw %w2, %0; setz %1"                 \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "ir" (value), "m" (*mem));                         \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile (LOCK_PREFIX "addl %2, %0; setz %1"                  \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "ir" (value), "m" (*mem));                         \
-     else                                                                    \
-       abort ();                                                             \
-     __result; })
-
-
-#define __arch_increment_body(lock,  pfx, mem) \
-  do {                                                                       \
-    if (sizeof (*mem) == 1)                                                  \
-      __asm __volatile (lock "incb %b0"                                              \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem),                                         \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 2)                                             \
-      __asm __volatile (lock "incw %w0"                                              \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem),                                         \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 4)                                             \
-      __asm __volatile (lock "incl %0"                                       \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem),                                         \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
-      {                                                                              \
-       __typeof (mem) __memp = (mem);                                        \
-       __typeof (*mem) __oldval = *__memp;                                   \
-       __typeof (*mem) __tmpval;                                             \
-       do                                                                    \
-         __tmpval = __oldval;                                                \
-       while ((__oldval = pfx##_compare_and_exchange_val_64_acq              \
-               (__memp, __oldval + 1, __oldval)) == __tmpval);               \
-      }                                                                              \
-  } while (0)
-
-#define atomic_increment(mem) __arch_increment_body (LOCK_PREFIX, __arch, mem)
-
-#define __arch_increment_cprefix \
-  "cmpl $0, %%gs:%P2\n\tje 0f\n\tlock\n0:\t"
-
-#define catomic_increment(mem) \
-  __arch_increment_body (__arch_increment_cprefix, __arch_c, mem)
-
-
-#define atomic_increment_and_test(mem) \
-  ({ unsigned char __result;                                                 \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (LOCK_PREFIX "incb %0; sete %b1"                     \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "m" (*mem));                                       \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (LOCK_PREFIX "incw %0; sete %w1"                     \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "m" (*mem));                                       \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile (LOCK_PREFIX "incl %0; sete %1"                              \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "m" (*mem));                                       \
-     else                                                                    \
-       abort ();                                                             \
-     __result; })
-
-
-#define __arch_decrement_body(lock, pfx, mem) \
-  do {                                                                       \
-    if (sizeof (*mem) == 1)                                                  \
-      __asm __volatile (lock "decb %b0"                                              \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem),                                         \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 2)                                             \
-      __asm __volatile (lock "decw %w0"                                              \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem),                                         \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 4)                                             \
-      __asm __volatile (lock "decl %0"                                       \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem),                                         \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
-      {                                                                              \
-       __typeof (mem) __memp = (mem);                                        \
-       __typeof (*mem) __oldval = *__memp;                                   \
-       __typeof (*mem) __tmpval;                                             \
-       do                                                                    \
-         __tmpval = __oldval;                                                \
-       while ((__oldval = pfx##_compare_and_exchange_val_64_acq              \
-               (__memp, __oldval - 1, __oldval)) == __tmpval);               \
-      }                                                                              \
-  } while (0)
-
-#define atomic_decrement(mem) __arch_decrement_body (LOCK_PREFIX, __arch, mem)
-
-#define __arch_decrement_cprefix \
-  "cmpl $0, %%gs:%P2\n\tje 0f\n\tlock\n0:\t"
-
-#define catomic_decrement(mem) \
-  __arch_decrement_body (__arch_decrement_cprefix, __arch_c, mem)
-
-
-#define atomic_decrement_and_test(mem) \
-  ({ unsigned char __result;                                                 \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (LOCK_PREFIX "decb %b0; sete %1"                     \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "m" (*mem));                                       \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (LOCK_PREFIX "decw %w0; sete %1"                     \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "m" (*mem));                                       \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile (LOCK_PREFIX "decl %0; sete %1"                              \
-                        : "=m" (*mem), "=qm" (__result)                      \
-                        : "m" (*mem));                                       \
-     else                                                                    \
-       abort ();                                                             \
-     __result; })
-
-
-#define atomic_bit_set(mem, bit) \
-  do {                                                                       \
-    if (sizeof (*mem) == 1)                                                  \
-      __asm __volatile (LOCK_PREFIX "orb %b2, %0"                            \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem), "iq" (1 << (bit)));                     \
-    else if (sizeof (*mem) == 2)                                             \
-      __asm __volatile (LOCK_PREFIX "orw %w2, %0"                            \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem), "ir" (1 << (bit)));                     \
-    else if (sizeof (*mem) == 4)                                             \
-      __asm __volatile (LOCK_PREFIX "orl %2, %0"                             \
-                       : "=m" (*mem)                                         \
-                       : "m" (*mem), "ir" (1 << (bit)));                     \
-    else                                                                     \
-      abort ();                                                                      \
-  } while (0)
-
-
-#define atomic_bit_test_set(mem, bit) \
-  ({ unsigned char __result;                                                 \
-     if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (LOCK_PREFIX "btsb %3, %1; setc %0"                  \
-                        : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "ir" (bit));                           \
-     else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (LOCK_PREFIX "btsw %3, %1; setc %0"                  \
-                        : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "ir" (bit));                           \
-     else if (sizeof (*mem) == 4)                                            \
-       __asm __volatile (LOCK_PREFIX "btsl %3, %1; setc %0"                  \
-                        : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "ir" (bit));                           \
-     else                                                                    \
-       abort ();                                                             \
-     __result; })
-
-
-#define atomic_spin_nop() asm ("rep; nop")
-
-
-#define __arch_and_body(lock, mem, mask) \
-  do {                                                                       \
-    if (sizeof (*mem) == 1)                                                  \
-      __asm __volatile (lock "andb %b1, %0"                                  \
-                       : "=m" (*mem)                                         \
-                       : "iq" (mask), "m" (*mem),                            \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 2)                                             \
-      __asm __volatile (lock "andw %w1, %0"                                  \
-                       : "=m" (*mem)                                         \
-                       : "ir" (mask), "m" (*mem),                            \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 4)                                             \
-      __asm __volatile (lock "andl %1, %0"                                   \
-                       : "=m" (*mem)                                         \
-                       : "ir" (mask), "m" (*mem),                            \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
-      abort ();                                                                      \
-  } while (0)
-
-#define __arch_cprefix \
-  "cmpl $0, %%gs:%P3\n\tje 0f\n\tlock\n0:\t"
-
-#define atomic_and(mem, mask) __arch_and_body (LOCK_PREFIX, mem, mask)
-
-#define catomic_and(mem, mask) __arch_and_body (__arch_cprefix, mem, mask)
-
-
-#define __arch_or_body(lock, mem, mask) \
-  do {                                                                       \
-    if (sizeof (*mem) == 1)                                                  \
-      __asm __volatile (lock "orb %b1, %0"                                   \
-                       : "=m" (*mem)                                         \
-                       : "iq" (mask), "m" (*mem),                            \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 2)                                             \
-      __asm __volatile (lock "orw %w1, %0"                                   \
-                       : "=m" (*mem)                                         \
-                       : "ir" (mask), "m" (*mem),                            \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else if (sizeof (*mem) == 4)                                             \
-      __asm __volatile (lock "orl %1, %0"                                    \
-                       : "=m" (*mem)                                         \
-                       : "ir" (mask), "m" (*mem),                            \
-                         "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
-      abort ();                                                                      \
-  } while (0)
-
-#define atomic_or(mem, mask) __arch_or_body (LOCK_PREFIX, mem, mask)
-
-#define catomic_or(mem, mask) __arch_or_body (__arch_cprefix, mem, mask)
-
-/* We don't use mfence because it is supposedly slower due to having to
-   provide stronger guarantees (e.g., regarding self-modifying code).  */
-#define atomic_full_barrier() \
-    __asm __volatile (LOCK_PREFIX "orl $0, (%%esp)" ::: "memory")
-#define atomic_read_barrier() __asm ("" ::: "memory")
-#define atomic_write_barrier() __asm ("" ::: "memory")
similarity index 70%
rename from sysdeps/x86_64/atomic-machine.h
rename to sysdeps/x86/atomic-machine.h
index 9d31c649623ba76785b795a80f70957671753df9..b06de5819086f96da9b5837960b64f6ccd09ef6b 100644 (file)
@@ -1,6 +1,6 @@
-/* Copyright (C) 2002-2018 Free Software Foundation, Inc.
+/* Atomic operations.  X86 version.
+   Copyright (C) 2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
    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 along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _X86_64_ATOMIC_MACHINE_H
-#define _X86_64_ATOMIC_MACHINE_H 1
+#ifndef _X86_ATOMIC_MACHINE_H
+#define _X86_ATOMIC_MACHINE_H 1
 
 #include <stdint.h>
-#include <tls.h>                   /* For tcbhead_t.  */
-#include <libc-pointer-arith.h>    /* For cast_to_integer.  */
+#include <tls.h>                       /* For tcbhead_t.  */
+#include <libc-pointer-arith.h>                /* For cast_to_integer.  */
 
 typedef int8_t atomic8_t;
 typedef uint8_t uatomic8_t;
@@ -57,9 +57,22 @@ typedef uintmax_t uatomic_max_t;
 # endif
 #endif
 
-#define __HAVE_64B_ATOMICS 1
-#define USE_ATOMIC_COMPILER_BUILTINS 1
-#define ATOMIC_EXCHANGE_USES_CAS 0
+#define USE_ATOMIC_COMPILER_BUILTINS   1
+
+#ifdef __x86_64__
+# define __HAVE_64B_ATOMICS            1
+# define SP_REG                                "rsp"
+# define SEG_REG                       "fs"
+# define BR_CONSTRAINT                 "q"
+# define IBR_CONSTRAINT                        "iq"
+#else
+# define __HAVE_64B_ATOMICS            0
+# define SP_REG                                "esp"
+# define SEG_REG                       "gs"
+# define BR_CONSTRAINT                 "r"
+# define IBR_CONSTRAINT                        "ir"
+#endif
+#define ATOMIC_EXCHANGE_USES_CAS       0
 
 #define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
   __sync_val_compare_and_swap (mem, oldval, newval)
@@ -69,38 +82,39 @@ typedef uintmax_t uatomic_max_t;
 
 #define __arch_c_compare_and_exchange_val_8_acq(mem, newval, oldval) \
   ({ __typeof (*mem) ret;                                                    \
-    __asm __volatile ("cmpl $0, %%fs:%P5\n\t"                                \
-                     "je 0f\n\t"                                             \
-                     "lock\n"                                                \
+     __asm __volatile ("cmpl $0, %%" SEG_REG ":%P5\n\t"                              \
+                      "je 0f\n\t"                                            \
+                      "lock\n"                                               \
                       "0:\tcmpxchgb %b2, %1"                                 \
                       : "=a" (ret), "=m" (*mem)                              \
-                      : "q" (newval), "m" (*mem), "0" (oldval),              \
+                      : BR_CONSTRAINT (newval), "m" (*mem), "0" (oldval),    \
                         "i" (offsetof (tcbhead_t, multiple_threads)));       \
      ret; })
 
 #define __arch_c_compare_and_exchange_val_16_acq(mem, newval, oldval) \
   ({ __typeof (*mem) ret;                                                    \
-    __asm __volatile ("cmpl $0, %%fs:%P5\n\t"                                \
-                     "je 0f\n\t"                                             \
-                     "lock\n"                                                \
+     __asm __volatile ("cmpl $0, %%" SEG_REG ":%P5\n\t"                              \
+                      "je 0f\n\t"                                            \
+                      "lock\n"                                               \
                       "0:\tcmpxchgw %w2, %1"                                 \
                       : "=a" (ret), "=m" (*mem)                              \
-                      : "q" (newval), "m" (*mem), "0" (oldval),              \
+                      : BR_CONSTRAINT (newval), "m" (*mem), "0" (oldval),    \
                         "i" (offsetof (tcbhead_t, multiple_threads)));       \
      ret; })
 
 #define __arch_c_compare_and_exchange_val_32_acq(mem, newval, oldval) \
   ({ __typeof (*mem) ret;                                                    \
-    __asm __volatile ("cmpl $0, %%fs:%P5\n\t"                                \
-                     "je 0f\n\t"                                             \
-                     "lock\n"                                                \
+     __asm __volatile ("cmpl $0, %%" SEG_REG ":%P5\n\t"                              \
+                      "je 0f\n\t"                                            \
+                      "lock\n"                                               \
                       "0:\tcmpxchgl %2, %1"                                  \
                       : "=a" (ret), "=m" (*mem)                              \
-                      : "q" (newval), "m" (*mem), "0" (oldval),              \
-                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
+                      : BR_CONSTRAINT (newval), "m" (*mem), "0" (oldval),    \
+                        "i" (offsetof (tcbhead_t, multiple_threads)));       \
      ret; })
 
-#define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+#ifdef __x86_64__
+# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
   ({ __typeof (*mem) ret;                                                    \
      __asm __volatile ("cmpl $0, %%fs:%P5\n\t"                               \
                       "je 0f\n\t"                                            \
@@ -112,6 +126,53 @@ typedef uintmax_t uatomic_max_t;
                         "0" ((atomic64_t) cast_to_integer (oldval)),         \
                         "i" (offsetof (tcbhead_t, multiple_threads)));       \
      ret; })
+# define do_exchange_and_add_val_64_acq(pfx, mem, value) 0
+# define do_add_val_64_acq(pfx, mem, value) do { } while (0)
+#else
+/* XXX We do not really need 64-bit compare-and-exchange.  At least
+   not in the moment.  Using it would mean causing portability
+   problems since not many other 32-bit architectures have support for
+   such an operation.  So don't define any code for now.  If it is
+   really going to be used the code below can be used on Intel Pentium
+   and later, but NOT on i486.  */
+# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+  ({ __typeof (*mem) ret = *(mem);                                           \
+     __atomic_link_error ();                                                 \
+     ret = (newval);                                                         \
+     ret = (oldval);                                                         \
+     ret; })
+
+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval)         \
+  ({ __typeof (*mem) ret = *(mem);                                           \
+     __atomic_link_error ();                                                 \
+     ret = (newval);                                                         \
+     ret = (oldval);                                                         \
+     ret; })
+
+# define do_exchange_and_add_val_64_acq(pfx, mem, value) \
+  ({ __typeof (value) __addval = (value);                                    \
+     __typeof (*mem) __result;                                               \
+     __typeof (mem) __memp = (mem);                                          \
+     __typeof (*mem) __tmpval;                                               \
+     __result = *__memp;                                                     \
+     do                                                                              \
+       __tmpval = __result;                                                  \
+     while ((__result = pfx##_compare_and_exchange_val_64_acq                \
+            (__memp, __result + __addval, __result)) == __tmpval);           \
+     __result; })
+
+# define do_add_val_64_acq(pfx, mem, value) \
+  {                                                                          \
+    __typeof (value) __addval = (value);                                     \
+    __typeof (mem) __memp = (mem);                                           \
+    __typeof (*mem) __oldval = *__memp;                                              \
+    __typeof (*mem) __tmpval;                                                \
+    do                                                                       \
+      __tmpval = __oldval;                                                   \
+    while ((__oldval = pfx##_compare_and_exchange_val_64_acq                 \
+           (__memp, __oldval + __addval, __oldval)) == __tmpval);            \
+  }
+#endif
 
 
 /* Note that we need no lock prefix.  */
@@ -129,50 +190,59 @@ typedef uintmax_t uatomic_max_t;
        __asm __volatile ("xchgl %0, %1"                                              \
                         : "=r" (result), "=m" (*mem)                         \
                         : "0" (newvalue), "m" (*mem));                       \
-     else                                                                    \
+     else if (__HAVE_64B_ATOMICS)                                            \
        __asm __volatile ("xchgq %q0, %1"                                     \
                         : "=r" (result), "=m" (*mem)                         \
                         : "0" ((atomic64_t) cast_to_integer (newvalue)),     \
                           "m" (*mem));                                       \
+     else                                                                    \
+       {                                                                     \
+        result = 0;                                                          \
+        __atomic_link_error ();                                              \
+       }                                                                     \
      result; })
 
 
-#define __arch_exchange_and_add_body(lock, mem, value)                       \
-  ({ __typeof (*mem) result;                                                 \
+#define __arch_exchange_and_add_body(lock, pfx, mem, value) \
+  ({ __typeof (*mem) __result;                                               \
+     __typeof (value) __addval = (value);                                    \
      if (sizeof (*mem) == 1)                                                 \
        __asm __volatile (lock "xaddb %b0, %1"                                \
-                        : "=q" (result), "=m" (*mem)                         \
-                        : "0" (value), "m" (*mem),                           \
+                        : "=q" (__result), "=m" (*mem)                       \
+                        : "0" (__addval), "m" (*mem),                        \
                           "i" (offsetof (tcbhead_t, multiple_threads)));     \
      else if (sizeof (*mem) == 2)                                            \
        __asm __volatile (lock "xaddw %w0, %1"                                \
-                        : "=r" (result), "=m" (*mem)                         \
-                        : "0" (value), "m" (*mem),                           \
+                        : "=r" (__result), "=m" (*mem)                       \
+                        : "0" (__addval), "m" (*mem),                        \
                           "i" (offsetof (tcbhead_t, multiple_threads)));     \
      else if (sizeof (*mem) == 4)                                            \
        __asm __volatile (lock "xaddl %0, %1"                                 \
-                        : "=r" (result), "=m" (*mem)                         \
-                        : "0" (value), "m" (*mem),                           \
+                        : "=r" (__result), "=m" (*mem)                       \
+                        : "0" (__addval), "m" (*mem),                        \
                           "i" (offsetof (tcbhead_t, multiple_threads)));     \
-     else                                                                    \
+     else if (__HAVE_64B_ATOMICS)                                            \
        __asm __volatile (lock "xaddq %q0, %1"                                \
-                        : "=r" (result), "=m" (*mem)                         \
-                        : "0" ((atomic64_t) cast_to_integer (value)),        \
+                        : "=r" (__result), "=m" (*mem)                       \
+                        : "0" ((atomic64_t) cast_to_integer (__addval)),     \
                           "m" (*mem),                                        \
                           "i" (offsetof (tcbhead_t, multiple_threads)));     \
-     result; })
+     else                                                                    \
+       __result = do_exchange_and_add_val_64_acq (pfx, (mem), __addval);      \
+     __result; })
 
 #define atomic_exchange_and_add(mem, value) \
   __sync_fetch_and_add (mem, value)
 
 #define __arch_exchange_and_add_cprefix \
-  "cmpl $0, %%fs:%P4\n\tje 0f\n\tlock\n0:\t"
+  "cmpl $0, %%" SEG_REG ":%P4\n\tje 0f\n\tlock\n0:\t"
 
 #define catomic_exchange_and_add(mem, value) \
-  __arch_exchange_and_add_body (__arch_exchange_and_add_cprefix, mem, value)
+  __arch_exchange_and_add_body (__arch_exchange_and_add_cprefix, __arch_c,    \
+                               mem, value)
 
 
-#define __arch_add_body(lock, pfx, mem, value)                               \
+#define __arch_add_body(lock, pfx, apfx, mem, value) \
   do {                                                                       \
     if (__builtin_constant_p (value) && (value) == 1)                        \
       pfx##_increment (mem);                                                 \
@@ -181,7 +251,7 @@ typedef uintmax_t uatomic_max_t;
     else if (sizeof (*mem) == 1)                                             \
       __asm __volatile (lock "addb %b1, %0"                                  \
                        : "=m" (*mem)                                         \
-                       : "iq" (value), "m" (*mem),                           \
+                       : IBR_CONSTRAINT (value), "m" (*mem),                 \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
     else if (sizeof (*mem) == 2)                                             \
       __asm __volatile (lock "addw %w1, %0"                                  \
@@ -193,22 +263,24 @@ typedef uintmax_t uatomic_max_t;
                        : "=m" (*mem)                                         \
                        : "ir" (value), "m" (*mem),                           \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
+    else if (__HAVE_64B_ATOMICS)                                             \
       __asm __volatile (lock "addq %q1, %0"                                  \
                        : "=m" (*mem)                                         \
                        : "ir" ((atomic64_t) cast_to_integer (value)),        \
                          "m" (*mem),                                         \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
+    else                                                                     \
+      do_add_val_64_acq (apfx, (mem), (value));                                      \
   } while (0)
 
-#define atomic_add(mem, value) \
-  __arch_add_body (LOCK_PREFIX, atomic, mem, value)
+# define atomic_add(mem, value) \
+  __arch_add_body (LOCK_PREFIX, atomic, __arch, mem, value)
 
 #define __arch_add_cprefix \
-  "cmpl $0, %%fs:%P3\n\tje 0f\n\tlock\n0:\t"
+  "cmpl $0, %%" SEG_REG ":%P3\n\tje 0f\n\tlock\n0:\t"
 
 #define catomic_add(mem, value) \
-  __arch_add_body (__arch_add_cprefix, catomic, mem, value)
+  __arch_add_body (__arch_add_cprefix, atomic, __arch_c, mem, value)
 
 
 #define atomic_add_negative(mem, value) \
@@ -216,7 +288,7 @@ typedef uintmax_t uatomic_max_t;
      if (sizeof (*mem) == 1)                                                 \
        __asm __volatile (LOCK_PREFIX "addb %b2, %0; sets %1"                 \
                         : "=m" (*mem), "=qm" (__result)                      \
-                        : "iq" (value), "m" (*mem));                         \
+                        : IBR_CONSTRAINT (value), "m" (*mem));               \
      else if (sizeof (*mem) == 2)                                            \
        __asm __volatile (LOCK_PREFIX "addw %w2, %0; sets %1"                 \
                         : "=m" (*mem), "=qm" (__result)                      \
@@ -225,11 +297,13 @@ typedef uintmax_t uatomic_max_t;
        __asm __volatile (LOCK_PREFIX "addl %2, %0; sets %1"                  \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "ir" (value), "m" (*mem));                         \
-     else                                                                    \
+     else if (__HAVE_64B_ATOMICS)                                            \
        __asm __volatile (LOCK_PREFIX "addq %q2, %0; sets %1"                 \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "ir" ((atomic64_t) cast_to_integer (value)),       \
                           "m" (*mem));                                       \
+     else                                                                    \
+       __atomic_link_error ();                                               \
      __result; })
 
 
@@ -238,7 +312,7 @@ typedef uintmax_t uatomic_max_t;
      if (sizeof (*mem) == 1)                                                 \
        __asm __volatile (LOCK_PREFIX "addb %b2, %0; setz %1"                 \
                         : "=m" (*mem), "=qm" (__result)                      \
-                        : "iq" (value), "m" (*mem));                         \
+                        : IBR_CONSTRAINT (value), "m" (*mem));               \
      else if (sizeof (*mem) == 2)                                            \
        __asm __volatile (LOCK_PREFIX "addw %w2, %0; setz %1"                 \
                         : "=m" (*mem), "=qm" (__result)                      \
@@ -247,15 +321,17 @@ typedef uintmax_t uatomic_max_t;
        __asm __volatile (LOCK_PREFIX "addl %2, %0; setz %1"                  \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "ir" (value), "m" (*mem));                         \
-     else                                                                    \
+     else if (__HAVE_64B_ATOMICS)                                            \
        __asm __volatile (LOCK_PREFIX "addq %q2, %0; setz %1"                 \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "ir" ((atomic64_t) cast_to_integer (value)),       \
                           "m" (*mem));                                       \
+     else                                                                    \
+       __atomic_link_error ();                                       \
      __result; })
 
 
-#define __arch_increment_body(lock, mem) \
+#define __arch_increment_body(lock, pfx, mem) \
   do {                                                                       \
     if (sizeof (*mem) == 1)                                                  \
       __asm __volatile (lock "incb %b0"                                              \
@@ -272,44 +348,48 @@ typedef uintmax_t uatomic_max_t;
                        : "=m" (*mem)                                         \
                        : "m" (*mem),                                         \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
+    else if (__HAVE_64B_ATOMICS)                                             \
       __asm __volatile (lock "incq %q0"                                              \
                        : "=m" (*mem)                                         \
                        : "m" (*mem),                                         \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
+    else                                                                     \
+      do_add_val_64_acq (pfx, mem, 1);                                       \
   } while (0)
 
-#define atomic_increment(mem) __arch_increment_body (LOCK_PREFIX, mem)
+#define atomic_increment(mem) __arch_increment_body (LOCK_PREFIX, __arch, mem)
 
 #define __arch_increment_cprefix \
-  "cmpl $0, %%fs:%P2\n\tje 0f\n\tlock\n0:\t"
+  "cmpl $0, %%" SEG_REG ":%P2\n\tje 0f\n\tlock\n0:\t"
 
 #define catomic_increment(mem) \
-  __arch_increment_body (__arch_increment_cprefix, mem)
+  __arch_increment_body (__arch_increment_cprefix, __arch_c, mem)
 
 
 #define atomic_increment_and_test(mem) \
   ({ unsigned char __result;                                                 \
      if (sizeof (*mem) == 1)                                                 \
-       __asm __volatile (LOCK_PREFIX "incb %b0; sete %1"                     \
+       __asm __volatile (LOCK_PREFIX "incb %b0; sete %b1"                    \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "m" (*mem));                                       \
      else if (sizeof (*mem) == 2)                                            \
-       __asm __volatile (LOCK_PREFIX "incw %w0; sete %1"                     \
+       __asm __volatile (LOCK_PREFIX "incw %w0; sete %w1"                    \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "m" (*mem));                                       \
      else if (sizeof (*mem) == 4)                                            \
        __asm __volatile (LOCK_PREFIX "incl %0; sete %1"                              \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "m" (*mem));                                       \
-     else                                                                    \
+     else if (__HAVE_64B_ATOMICS)                                            \
        __asm __volatile (LOCK_PREFIX "incq %q0; sete %1"                     \
                         : "=m" (*mem), "=qm" (__result)                      \
                         : "m" (*mem));                                       \
+     else                                                                    \
+       __atomic_link_error ();                                       \
      __result; })
 
 
-#define __arch_decrement_body(lock, mem) \
+#define __arch_decrement_body(lock, pfx, mem) \
   do {                                                                       \
     if (sizeof (*mem) == 1)                                                  \
       __asm __volatile (lock "decb %b0"                                              \
@@ -326,20 +406,22 @@ typedef uintmax_t uatomic_max_t;
                        : "=m" (*mem)                                         \
                        : "m" (*mem),                                         \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
+    else if (__HAVE_64B_ATOMICS)                                             \
       __asm __volatile (lock "decq %q0"                                              \
                        : "=m" (*mem)                                         \
                        : "m" (*mem),                                         \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
+    else                                                                     \
+      do_add_val_64_acq (pfx, mem, -1);                                              \
   } while (0)
 
-#define atomic_decrement(mem) __arch_decrement_body (LOCK_PREFIX, mem)
+#define atomic_decrement(mem) __arch_decrement_body (LOCK_PREFIX, __arch, mem)
 
 #define __arch_decrement_cprefix \
-  "cmpl $0, %%fs:%P2\n\tje 0f\n\tlock\n0:\t"
+  "cmpl $0, %%" SEG_REG ":%P2\n\tje 0f\n\tlock\n0:\t"
 
 #define catomic_decrement(mem) \
-  __arch_decrement_body (__arch_decrement_cprefix, mem)
+  __arch_decrement_body (__arch_decrement_cprefix, __arch_c, mem)
 
 
 #define atomic_decrement_and_test(mem) \
@@ -368,7 +450,7 @@ typedef uintmax_t uatomic_max_t;
     if (sizeof (*mem) == 1)                                                  \
       __asm __volatile (LOCK_PREFIX "orb %b2, %0"                            \
                        : "=m" (*mem)                                         \
-                       : "m" (*mem), "iq" (1L << (bit)));                    \
+                       : "m" (*mem), IBR_CONSTRAINT (1L << (bit)));          \
     else if (sizeof (*mem) == 2)                                             \
       __asm __volatile (LOCK_PREFIX "orw %w2, %0"                            \
                        : "=m" (*mem)                                         \
@@ -381,10 +463,12 @@ typedef uintmax_t uatomic_max_t;
       __asm __volatile (LOCK_PREFIX "orq %2, %0"                             \
                        : "=m" (*mem)                                         \
                        : "m" (*mem), "i" (1L << (bit)));                     \
-    else                                                                     \
+    else if (__HAVE_64B_ATOMICS)                                             \
       __asm __volatile (LOCK_PREFIX "orq %q2, %0"                            \
                        : "=m" (*mem)                                         \
                        : "m" (*mem), "r" (1UL << (bit)));                    \
+    else                                                                     \
+      __atomic_link_error ();                                                \
   } while (0)
 
 
@@ -393,7 +477,7 @@ typedef uintmax_t uatomic_max_t;
      if (sizeof (*mem) == 1)                                                 \
        __asm __volatile (LOCK_PREFIX "btsb %3, %1; setc %0"                  \
                         : "=q" (__result), "=m" (*mem)                       \
-                        : "m" (*mem), "iq" (bit));                           \
+                        : "m" (*mem), IBR_CONSTRAINT (bit));                 \
      else if (sizeof (*mem) == 2)                                            \
        __asm __volatile (LOCK_PREFIX "btsw %3, %1; setc %0"                  \
                         : "=q" (__result), "=m" (*mem)                       \
@@ -402,22 +486,21 @@ typedef uintmax_t uatomic_max_t;
        __asm __volatile (LOCK_PREFIX "btsl %3, %1; setc %0"                  \
                         : "=q" (__result), "=m" (*mem)                       \
                         : "m" (*mem), "ir" (bit));                           \
-     else                                                                    \
+     else if (__HAVE_64B_ATOMICS)                                            \
        __asm __volatile (LOCK_PREFIX "btsq %3, %1; setc %0"                  \
                         : "=q" (__result), "=m" (*mem)                       \
                         : "m" (*mem), "ir" (bit));                           \
+     else                                                                    \
+       __atomic_link_error ();                                       \
      __result; })
 
 
-#define atomic_spin_nop() asm ("rep; nop")
-
-
 #define __arch_and_body(lock, mem, mask) \
   do {                                                                       \
     if (sizeof (*mem) == 1)                                                  \
       __asm __volatile (lock "andb %b1, %0"                                  \
                        : "=m" (*mem)                                         \
-                       : "iq" (mask), "m" (*mem),                            \
+                       : IBR_CONSTRAINT (mask), "m" (*mem),                  \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
     else if (sizeof (*mem) == 2)                                             \
       __asm __volatile (lock "andw %w1, %0"                                  \
@@ -429,27 +512,29 @@ typedef uintmax_t uatomic_max_t;
                        : "=m" (*mem)                                         \
                        : "ir" (mask), "m" (*mem),                            \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
+    else if (__HAVE_64B_ATOMICS)                                             \
       __asm __volatile (lock "andq %q1, %0"                                  \
                        : "=m" (*mem)                                         \
                        : "ir" (mask), "m" (*mem),                            \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
+    else                                                                     \
+      __atomic_link_error ();                                                \
   } while (0)
 
 #define __arch_cprefix \
-  "cmpl $0, %%fs:%P3\n\tje 0f\n\tlock\n0:\t"
+  "cmpl $0, %%" SEG_REG ":%P3\n\tje 0f\n\tlock\n0:\t"
 
 #define atomic_and(mem, mask) __arch_and_body (LOCK_PREFIX, mem, mask)
 
 #define catomic_and(mem, mask) __arch_and_body (__arch_cprefix, mem, mask)
 
 
-#define __arch_or_body(lock, mem, mask)                                              \
+#define __arch_or_body(lock, mem, mask) \
   do {                                                                       \
     if (sizeof (*mem) == 1)                                                  \
       __asm __volatile (lock "orb %b1, %0"                                   \
                        : "=m" (*mem)                                         \
-                       : "iq" (mask), "m" (*mem),                            \
+                       : IBR_CONSTRAINT (mask), "m" (*mem),                  \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
     else if (sizeof (*mem) == 2)                                             \
       __asm __volatile (lock "orw %w1, %0"                                   \
@@ -461,11 +546,13 @@ typedef uintmax_t uatomic_max_t;
                        : "=m" (*mem)                                         \
                        : "ir" (mask), "m" (*mem),                            \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
-    else                                                                     \
+    else if (__HAVE_64B_ATOMICS)                                             \
       __asm __volatile (lock "orq %q1, %0"                                   \
                        : "=m" (*mem)                                         \
                        : "ir" (mask), "m" (*mem),                            \
                          "i" (offsetof (tcbhead_t, multiple_threads)));      \
+    else                                                                     \
+      __atomic_link_error ();                                                \
   } while (0)
 
 #define atomic_or(mem, mask) __arch_or_body (LOCK_PREFIX, mem, mask)
@@ -475,8 +562,10 @@ typedef uintmax_t uatomic_max_t;
 /* We don't use mfence because it is supposedly slower due to having to
    provide stronger guarantees (e.g., regarding self-modifying code).  */
 #define atomic_full_barrier() \
-    __asm __volatile (LOCK_PREFIX "orl $0, (%%rsp)" ::: "memory")
+    __asm __volatile (LOCK_PREFIX "orl $0, (%%" SP_REG ")" ::: "memory")
 #define atomic_read_barrier() __asm ("" ::: "memory")
 #define atomic_write_barrier() __asm ("" ::: "memory")
 
+#define atomic_spin_nop() __asm ("pause")
+
 #endif /* atomic-machine.h */
This page took 0.500797 seconds and 5 git commands to generate.