Merge pull request #9707 from JosJuice/remove-atomic-header

Remove Atomic.h

Source/Core/Core/HW/MMIO.h

@@ -5,11 +5,13 @@
 #pragma once
 
 #include <array>
+#include <atomic>
 #include <string>
 #include <tuple>
 #include <type_traits>
 
 #include "Common/Assert.h"
+#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/MMIOHandlers.h"
@@ -79,17 +81,19 @@ inline u16* LowPart(u32* ptr)
 {
   return (u16*)ptr;
 }
-inline u16* LowPart(volatile u32* ptr)
+inline u16* LowPart(std::atomic<u32>* ptr)
 {
-  return (u16*)ptr;
+  static_assert(std::atomic<u32>::is_always_lock_free && sizeof(std::atomic<u32>) == sizeof(u32));
+  return LowPart(Common::BitCast<u32*>(ptr));
 }
 inline u16* HighPart(u32* ptr)
 {
   return LowPart(ptr) + 1;
 }
-inline u16* HighPart(volatile u32* ptr)
+inline u16* HighPart(std::atomic<u32>* ptr)
 {
-  return LowPart(ptr) + 1;
+  static_assert(std::atomic<u32>::is_always_lock_free && sizeof(std::atomic<u32>) == sizeof(u32));
+  return HighPart(Common::BitCast<u32*>(ptr));
 }
 }  // namespace Utils
 

Source/Core/Core/HW/SystemTimers.cpp

@@ -49,7 +49,6 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule:
 #include <cmath>
 #include <cstdlib>
 
-#include "Common/Atomic.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"