From bccca3d6d0fc23c93ea0d2827bb36c3636685876 Mon Sep 17 00:00:00 2001
From: Jamie Reece Wilson <me@reece.sx>
Date: Wed, 19 Jun 2024 13:40:00 +0100
Subject: [PATCH] [+]
 AuReadGenericLE/AuReadGenericBE/AuWriteGenericLE/AuWriteGenericBE (et al) for
 volatile pointers [*] Move AURORA_COMPILER_VOLATILE_BARRIER out of runtime

---
 Include/auROXTL/auTypeUtils.hpp | 376 ++++++++++++++++++++++++++++++++
 Include/auROXTLTypes.hpp        |   8 +-
 2 files changed, 383 insertions(+), 1 deletion(-)

diff --git a/Include/auROXTL/auTypeUtils.hpp b/Include/auROXTL/auTypeUtils.hpp
index 70b08ab..3c4331b 100644
--- a/Include/auROXTL/auTypeUtils.hpp
+++ b/Include/auROXTL/auTypeUtils.hpp
@@ -383,4 +383,380 @@ static auline void AuWriteS8(void *ptr, int offset, AuInt8 value)
 #else
     AuWriteS8BE(ptr, offset, value);
 #endif
+}
+
+template <class T>
+static auline T AuReadGenericLE(const volatile void *ptr, int offset)
+{
+#if defined(AURORA_PERMIT_ARBITRARY_REF) && ((defined(AURORA_COMPILER_CLANG) && !defined(CLANG_NOT_X86_AND_NOT_VOLATILEMS)) || defined(AURORA_COMPILER_MSVC))
+    T temp = *reinterpret_cast<const volatile T *>(reinterpret_cast<const volatile AuUInt8 *>(ptr) + offset);
+#else
+    AURORA_COMPILER_VOLATILE_BARRIER();
+
+    T temp;
+    AuMemcpy(&temp, ((const AuUInt8 *)ptr) + offset, sizeof(temp));
+#endif
+
+    if constexpr (sizeof(T) != 1)
+    {
+    #if !defined(AU_CPU_ENDIAN_LITTLE)
+        temp = AuFlipEndian(temp);
+    #endif
+    }
+
+    return temp;
+}
+
+template <class T>
+static auline T AuReadGenericBE(const volatile void *ptr, int offset)
+{
+#if defined(AURORA_PERMIT_ARBITRARY_REF) && ((defined(AURORA_COMPILER_CLANG) && !defined(CLANG_NOT_X86_AND_NOT_VOLATILEMS)) || defined(AURORA_COMPILER_MSVC))
+    T temp = *reinterpret_cast<const volatile T *>(reinterpret_cast<const volatile AuUInt8 *>(ptr) + offset);
+#else
+    AURORA_COMPILER_VOLATILE_BARRIER();
+
+    T temp;
+    AuMemcpy(&temp, ((const AuUInt8 *)ptr) + offset, sizeof(temp));
+#endif
+
+    if constexpr (sizeof(T) != 1)
+    {
+    #if defined(AU_CPU_ENDIAN_LITTLE)
+        temp = AuFlipEndian(temp);
+    #endif
+    }
+
+    return temp;
+}
+
+static auline AuUInt64 AuReadU64LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuUInt64>(ptr, offset);
+}
+
+static auline AuUInt32 AuReadU32LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuUInt32>(ptr, offset);
+}
+
+static auline AuUInt16 AuReadU16LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuUInt16>(ptr, offset);
+}
+
+static auline AuUInt8 AuReadU8LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuUInt8>(ptr, offset);
+}
+
+static auline AuInt64 AuReadS64LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuInt64>(ptr, offset);
+}
+
+static auline AuInt32 AuReadS32LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuInt32>(ptr, offset);
+}
+
+static auline AuInt16 AuReadS16LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuInt16>(ptr, offset);
+}
+
+static auline AuInt8 AuReadS8LE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericLE<AuInt8>(ptr, offset);
+}
+
+static auline AuUInt64 AuReadU64BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuUInt64>(ptr, offset);
+}
+
+static auline AuUInt32 AuReadU32BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuUInt32>(ptr, offset);
+}
+
+static auline AuUInt16 AuReadU16BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuUInt16>(ptr, offset);
+}
+
+static auline AuUInt8 AuReadU8BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuUInt8>(ptr, offset);
+}
+
+static auline AuInt64 AuReadS64BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuInt64>(ptr, offset);
+}
+
+static auline AuInt32 AuReadS32BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuInt32>(ptr, offset);
+}
+
+static auline AuInt16 AuReadS16BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuInt16>(ptr, offset);
+}
+
+static auline AuInt8 AuReadS8BE(const volatile void *ptr, int offset)
+{
+    return AuReadGenericBE<AuInt8>(ptr, offset);
+}
+
+static auline AuUInt64 AuReadU64(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadU64LE(ptr, offset);
+#else
+    return AuReadU64BE(ptr, offset);
+#endif
+}
+
+static auline AuUInt32 AuReadU32(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadU32LE(ptr, offset);
+#else
+    return AuReadU32BE(ptr, offset);
+#endif
+}
+
+static auline AuUInt16 AuReadU16(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadU16LE(ptr, offset);
+#else
+    return AuReadU16BE(ptr, offset);
+#endif
+}
+
+static auline AuUInt8 AuReadU8(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadU8LE(ptr, offset);
+#else
+    return AuReadU8BE(ptr, offset);
+#endif
+}
+
+static auline AuInt64 AuReadS64(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadS64LE(ptr, offset);
+#else
+    return AuReadS64BE(ptr, offset);
+#endif
+}
+
+static auline AuInt32 AuReadS32(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadS32LE(ptr, offset);
+#else
+    return AuReadS32BE(ptr, offset);
+#endif
+}
+
+static auline AuInt16 AuReadS16(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadS16LE(ptr, offset);
+#else
+    return AuReadS16BE(ptr, offset);
+#endif
+}
+
+static auline AuInt8 AuReadS8(const volatile void *ptr, int offset)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    return AuReadS8LE(ptr, offset);
+#else
+    return AuReadS8BE(ptr, offset);
+#endif
+}
+
+template <class T>
+static auline void AuWriteGenericLE(volatile void *ptr, int offset, T value)
+{
+#if !defined(AU_CPU_ENDIAN_LITTLE)
+    value = AuFlipEndian(value);
+#endif
+
+#if defined(AURORA_PERMIT_ARBITRARY_REF) 
+    *reinterpret_cast<volatile T *>(reinterpret_cast<volatile AuUInt8 *>(ptr) + offset) = value;
+#else
+    AuMemcpy(reinterpret_cast<AuUInt8 *>(ptr) + offset, &value, sizeof(value));
+#endif
+}
+
+template <class T>
+static auline void AuWriteGenericBE(volatile void *ptr, int offset, T value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    value = AuFlipEndian(value);
+#endif
+
+#if defined(AURORA_PERMIT_ARBITRARY_REF) 
+    *reinterpret_cast<volatile T *>(reinterpret_cast<volatile AuUInt8 *>(ptr) + offset) = value;
+#else
+    AuMemcpy(reinterpret_cast<AuUInt8 *>(ptr) + offset, &value, sizeof(value));
+#endif
+}
+
+static auline void AuWriteU64LE(volatile void *ptr, int offset, AuUInt64 value)
+{
+    AuWriteGenericLE<AuUInt64>(ptr, offset, value);
+}
+
+static auline void AuWriteU32LE(volatile void *ptr, int offset, AuUInt32 value)
+{
+    AuWriteGenericLE<AuUInt32>(ptr, offset, value);
+}
+
+static auline void AuWriteU16LE(volatile void *ptr, int offset, AuUInt16 value)
+{
+    AuWriteGenericLE<AuUInt16>(ptr, offset, value);
+}
+
+static auline void AuWriteU8LE(volatile void *ptr, int offset, AuUInt8 value)
+{
+    AuWriteGenericLE<AuUInt8>(ptr, offset, value);
+}
+
+static auline void AuWriteS64LE(volatile void *ptr, int offset, AuInt64 value)
+{
+    AuWriteGenericLE<AuInt64>(ptr, offset, value);
+}
+
+static auline void AuWriteS32LE(volatile void *ptr, int offset, AuInt32 value)
+{
+    AuWriteGenericLE<AuInt32>(ptr, offset, value);
+}
+
+static auline void AuWriteS16LE(volatile void *ptr, int offset, AuInt16 value)
+{
+    AuWriteGenericLE<AuInt16>(ptr, offset, value);
+}
+
+static auline void AuWriteS8LE(volatile void *ptr, int offset, AuInt8 value)
+{
+    AuWriteGenericLE<AuInt8>(ptr, offset, value);
+}
+
+static auline void AuWriteU64BE(volatile void *ptr, int offset, AuUInt64 value)
+{
+    AuWriteGenericBE<AuUInt64>(ptr, offset, value);
+}
+
+static auline void AuWriteU32BE(volatile void *ptr, int offset, AuUInt32 value)
+{
+    AuWriteGenericBE<AuUInt32>(ptr, offset, value);
+}
+
+static auline void AuWriteU16BE(volatile void *ptr, int offset, AuUInt16 value)
+{
+    AuWriteGenericBE<AuUInt16>(ptr, offset, value);
+}
+
+static auline void AuWriteU8BE(volatile void *ptr, int offset, AuUInt8 value)
+{
+    AuWriteGenericBE<AuUInt8>(ptr, offset, value);
+}
+
+static auline void AuWriteS64BE(volatile void *ptr, int offset, AuInt64 value)
+{
+    AuWriteGenericBE<AuInt64>(ptr, offset, value);
+}
+
+static auline void AuWriteS32BE(volatile void *ptr, int offset, AuInt32 value)
+{
+    AuWriteGenericBE<AuInt32>(ptr, offset, value);
+}
+
+static auline void AuWriteS16BE(volatile void *ptr, int offset, AuInt16 value)
+{
+    AuWriteGenericBE<AuInt16>(ptr, offset, value);
+}
+
+static auline void AuWriteS8BE(volatile void *ptr, int offset, AuInt8 value)
+{
+    AuWriteGenericBE<AuInt8>(ptr, offset, value);
+}
+
+static auline void AuWriteU64(volatile void *ptr, int offset, AuUInt64 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteU64LE(ptr, offset, value);
+#else
+    AuWriteU64BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteU32(volatile void *ptr, int offset, AuUInt32 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteU32LE(ptr, offset, value);
+#else
+    AuWriteU32BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteU16(volatile void *ptr, int offset, AuUInt16 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteU16LE(ptr, offset, value);
+#else
+    AuWriteU16BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteU8(volatile void *ptr, int offset, AuUInt8 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteU8LE(ptr, offset, value);
+#else
+    AuWriteU8BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteS64(volatile void *ptr, int offset, AuInt64 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteS64LE(ptr, offset, value);
+#else
+    AuWriteS64BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteS32(volatile void *ptr, int offset, AuInt32 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteS32LE(ptr, offset, value);
+#else
+    AuWriteS32BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteS16(volatile void *ptr, int offset, AuInt16 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteS16LE(ptr, offset, value);
+#else
+    AuWriteS16BE(ptr, offset, value);
+#endif
+}
+
+static auline void AuWriteS8(volatile void *ptr, int offset, AuInt8 value)
+{
+#if defined(AU_CPU_ENDIAN_LITTLE)
+    AuWriteS8LE(ptr, offset, value);
+#else
+    AuWriteS8BE(ptr, offset, value);
+#endif
 }
\ No newline at end of file
diff --git a/Include/auROXTLTypes.hpp b/Include/auROXTLTypes.hpp
index 8f20fcc..8ec9bae 100644
--- a/Include/auROXTLTypes.hpp
+++ b/Include/auROXTLTypes.hpp
@@ -26,7 +26,13 @@
     #endif
 #endif
 
-
+#if defined(AURORA_COMPILER_MSVC) && !defined(MemoryBarrier)
+    #define AURORA_COMPILER_VOLATILE_BARRIER() __faststorefence()
+#elif defined(MemoryBarrier)
+    #define AURORA_COMPILER_VOLATILE_BARRIER() MemoryBarrier()
+#else
+    #define AURORA_COMPILER_VOLATILE_BARRIER() asm volatile ("" : : : "memory")
+#endif
 
 #include <auROXTL/auTypes.hpp>
 #include <auROXTL/auTryConstruct.hpp>