From d534b746e9f1c8aee9180a216066c4abfb24caed Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Thu, 8 Mar 2012 10:08:08 +0100
Subject: Fix implementation with ddrb barriers

---
 erts/lib_src/utils/make_atomics_api | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'erts/lib_src/utils')

diff --git a/erts/lib_src/utils/make_atomics_api b/erts/lib_src/utils/make_atomics_api
index 75e88f8a7e..74736c5a2d 100755
--- a/erts/lib_src/utils/make_atomics_api
+++ b/erts/lib_src/utils/make_atomics_api
@@ -805,7 +805,7 @@ rtchk_fallback_call(Return, #atomic_context{dw = DW,
 non_native_barrier(B) ->
     lists:member(B, ?NON_NATIVE_BARRIERS).
 
-non_native_barrier_impl(AC, Type, Op, B) ->
+non_native_barrier_impl(AC, inline_implementation = Type, Op, B) ->
     ["
 ", func_header(AC, Type, false, Op, B), "
 {",
@@ -817,6 +817,29 @@ non_native_barrier_impl(AC, Type, Op, B) ->
 #else
     ", func_call(AC, Type, Op, rb, true), "
 #endif
+"
+	     ]
+     end,
+     "}
+"
+    ];
+non_native_barrier_impl(#atomic_context{have_native_atomic_ops = HaveNative} = AC,
+			implementation = Type,
+			Op,
+			B) ->
+    ["
+", func_header(AC, Type, false, Op, B), "
+{",
+     case B of
+	 ddrb ->
+	     ["
+#if defined(", HaveNative, ")
+    ", func_call(AC, Type, Op, B, true), "
+#elif defined(ETHR_ORDERED_READ_DEPEND)
+    ", func_call(AC, symbol_implementation, Op, none, true), "
+#else
+    ", func_call(AC, symbol_implementation, Op, rb, true), "
+#endif
 "
 	     ]
      end,
@@ -827,6 +850,8 @@ non_native_barrier_impl(AC, Type, Op, B) ->
 func_call(#atomic_context{'ATMC' = ATMC} = AC, inline_implementation, Op, B, RetStatement) ->
     func_call(AC, Op, ["ETHR_", ATMC, "_FUNC__(", opstr(Op), op_barrier_ext(B), ")"], RetStatement);
 func_call(#atomic_context{atomic = Atomic} = AC, implementation, Op, B, RetStatement) ->
+    func_call(AC, Op, [Atomic, "_", opstr(Op), op_barrier_ext(B), "__"], RetStatement);
+func_call(#atomic_context{atomic = Atomic} = AC, symbol_implementation, Op, B, RetStatement) ->
     func_call(AC, Op, [Atomic, "_", opstr(Op), op_barrier_ext(B)], RetStatement).
 
 func_call(#atomic_context{dw = DW, arg1 = Arg1, arg2 = Arg2, arg3 = Arg3} = AC, Op, Func, true) ->
-- 
cgit v1.2.3