Move Atomic.h to <mstd_atomic>

`mbed::Atomic<T>` becomes `mstd::atomic<T>`, alongside the other
standard C++ library lookalikes.

Author: kjbracey

TESTS/mbed_platform/atomic/main.cpp

@@ -18,6 +18,8 @@
 #include "unity/unity.h"
 #include "utest/utest.h"
 
+#include <mstd_atomic>
+
 #if !MBED_CONF_RTOS_PRESENT
 #error [NOT_SUPPORTED] test not supported
 #endif
@@ -28,6 +30,8 @@ using utest::v1::Case;
 
 namespace {
 
+using mstd::atomic;
+
 /* Lock-free operations will be much faster - keep runtime down */
 #define ADD_UNLOCKED_ITERATIONS (SystemCoreClock / 1000)
 #define ADD_LOCKED_ITERATIONS   (SystemCoreClock / 8000)
@@ -53,7 +57,7 @@ struct add_release_incrementer {
     static void op(A *ptr)
     {
         for (long i = add_iterations(*ptr); i > 0; i--) {
-            ptr->fetch_add(1, mbed::memory_order_release);
+            ptr->fetch_add(1, mstd::memory_order_release);
         }
     }
 };
@@ -120,8 +124,8 @@ void test_atomic_add()
 {
     struct  {
         volatile T nonatomic1;
-        Atomic<T> atomic1;
-        volatile Atomic<T> atomic2; // use volatile just to exercise the templates' volatile methods
+        atomic<T> atomic1;
+        volatile atomic<T> atomic2; // use volatile just to exercise the templates' volatile methods
         volatile T nonatomic2;
     } data = { 0, { 0 }, { 1 }, 0 }; // test initialisation
 
@@ -201,17 +205,17 @@ void struct_incrementer_b(A *data)
 template<typename T, size_t N>
 void test_atomic_struct()
 {
-    TEST_ASSERT_EQUAL(N, sizeof(Atomic<T>));
+    TEST_ASSERT_EQUAL(N, sizeof(atomic<T>));
 
     // Small structures don't have value constructor implemented;
-    Atomic<T> data;
+    atomic<T> data;
     atomic_init(&data, T{0, 0, 0});
 
     Thread t1(osPriorityNormal, THREAD_STACK);
     Thread t2(osPriorityNormal, THREAD_STACK);
 
-    TEST_ASSERT_EQUAL(osOK, t1.start(callback(struct_incrementer_a<Atomic<T> >, &data)));
-    TEST_ASSERT_EQUAL(osOK, t2.start(callback(struct_incrementer_b<Atomic<T> >, &data)));
+    TEST_ASSERT_EQUAL(osOK, t1.start(callback(struct_incrementer_a<atomic<T> >, &data)));
+    TEST_ASSERT_EQUAL(osOK, t2.start(callback(struct_incrementer_b<atomic<T> >, &data)));
 
     for (long i = add_iterations(data); i > 0; i--) {
         T curval = data, newval;

mbed.h

@@ -89,7 +89,7 @@
 #include "platform/mbed_wait_api.h"
 #include "platform/mbed_thread.h"
 #include "hal/sleep_api.h"
-#include "platform/Atomic.h"
+#include "platform/mbed_atomic.h"
 #include "platform/mbed_power_mgmt.h"
 #include "platform/mbed_rtc_time.h"
 #include "platform/mbed_poll.h"

platform/cxxsupport/TOOLCHAIN_ARMC5/atomic

@@ -0,0 +1,62 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __atomic
+#define __atomic
+
+// Just go straight to the main file
+#include <mstd_atomic>
+
+#define ATOMIC_VAR_INIT(x) { x }
+#define ATOMIC_FLAG_INIT MSTD_ATOMIC_FLAG_INIT
+
+// And then pull it all into our std
+namespace std {
+using mstd::atomic;
+using mstd::atomic_is_lock_free;
+using mstd::atomic_store;
+using mstd::atomic_store_explicit;
+using mstd::atomic_load;
+using mstd::atomic_load_explicit;
+using mstd::atomic_exchange;
+using mstd::atomic_exchange_explicit;
+using mstd::atomic_compare_exchange_weak;
+using mstd::atomic_compare_exchange_weak_explicit;
+using mstd::atomic_compare_exchange_strong;
+using mstd::atomic_compare_exchange_strong_explicit;
+using mstd::atomic_fetch_add;
+using mstd::atomic_fetch_add_explicit;
+using mstd::atomic_fetch_sub;
+using mstd::atomic_fetch_sub_explicit;
+using mstd::atomic_fetch_and;
+using mstd::atomic_fetch_and_explicit;
+using mstd::atomic_fetch_or;
+using mstd::atomic_fetch_or_explicit;
+using mstd::atomic_fetch_xor;
+using mstd::atomic_fetch_xor_explicit;
+using mstd::atomic_flag;
+using mstd::atomic_flag_test_and_set;
+using mstd::atomic_flag_test_and_set_explicit;
+using mstd::atomic_flag_clear;
+using mstd::atomic_flag_clear_explicit;
+using mstd::atomic_init;
+using mstd::memory_order;
+using mstd::kill_dependency;
+using mstd::atomic_thread_fence;
+using mstd::atomic_signal_fence;
+}
+
+#endif /* __atomic */