xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / i386 / atomic.h

diff --git a/osfmk/i386/atomic.h b/osfmk/i386/atomic.h
index ef4652d5cd5244da0f64c4f3bd7fef09df678298..bd2a0c703ce2e2cec27d48a9f36a933c6ace3ffd 100644 (file)
--- a/osfmk/i386/atomic.h
+++ b/osfmk/i386/atomic.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2015-2018 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,59 +22,17 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
-#ifndef _I386_ATOMIC_H_
-#define _I386_ATOMIC_H_
-
-#include <i386/smp.h>
-
-#if    __SMP__
-
-#define memory_order_consume_smp memory_order_consume
-#define memory_order_acquire_smp memory_order_acquire
-#define memory_order_release_smp memory_order_release
-#define memory_order_acq_rel_smp memory_order_acq_rel
-#define memory_order_seq_cst_smp memory_order_seq_cst
-
-#else
-
-#define memory_order_consume_smp memory_order_relaxed
-#define memory_order_acquire_smp memory_order_relaxed
-#define memory_order_release_smp memory_order_relaxed
-#define memory_order_acq_rel_smp memory_order_relaxed
-#define memory_order_seq_cst_smp memory_order_relaxed
-
+#ifndef _MACHINE_ATOMIC_H
+#error "Do not include <i386/atomic.h> directly, use <machine/atomic.h>"
 #endif
 
-#ifdef ATOMIC_PRIVATE
-
-static boolean_t
-atomic_compare_exchange(uintptr_t *target, uintptr_t oldval, uintptr_t newval,
-                       enum memory_order ord, boolean_t wait)
-{
-       (void)wait;
-       return __c11_atomic_compare_exchange_strong((_Atomic uintptr_t *)target, &oldval, newval, ord, memory_order_relaxed);
-}
-
-#endif // ATOMIC_PRIVATE
-
-#define os_atomic_rmw_loop(p, ov, nv, m, ...)  ({ \
-               bool _result = false; \
-               typeof(p) _p = (p); \
-               ov = atomic_load_explicit(_p, memory_order_relaxed); \
-               do { \
-                       __VA_ARGS__; \
-                       typeof(ov) _r = (ov); \
-                       _result = atomic_compare_exchange_weak_explicit(_p, &_r, nv, \
-                                       memory_order_##m, memory_order_relaxed); \
-                       (ov) = _r; \
-               } while (__builtin_expect(!_result, 0)); \
-               _result; \
-       })
+#ifndef _I386_ATOMIC_H_
+#define _I386_ATOMIC_H_
 
-#define os_atomic_rmw_loop_give_up(expr) ({ expr; __builtin_trap(); })
+/* No special configuration for Intel */
 
 #endif // _I386_ATOMIC_H_