mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig.h: expand zig_msvc_atomic_load_ into version for relaxed, acquire, and seq_cst

Browse Source
This commit is contained in:
kcbanner 2024-07-13 19:45:45 -04:00
parent 373e53d7c5
commit c318710653
2 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/zig.h
View File

@ -3636,7 +3636,7 @@ typedef int zig_memory_order;
#define zig_atomicrmw_min(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_min_ ##Type(obj, arg) #define zig_atomicrmw_min(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_min_ ##Type(obj, arg)
#define zig_atomicrmw_max(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_max_ ##Type(obj, arg) #define zig_atomicrmw_max(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_max_ ##Type(obj, arg)
#define zig_atomic_store( obj, arg, order, Type, ReprType) zig_msvc_atomic_store_ ##Type(obj, arg) #define zig_atomic_store( obj, arg, order, Type, ReprType) zig_msvc_atomic_store_ ##Type(obj, arg)
#define zig_atomic_load(res, obj, order, Type, ReprType) res = zig_msvc_atomic_load_ ##Type(obj) #define zig_atomic_load(res, obj, order, Type, ReprType) res = zig_msvc_atomic_load_ ##order##_##Type(obj)
#if _M_X64 #if _M_X64
#define zig_fence(order) __faststorefence() #define zig_fence(order) __faststorefence()
#else #else
@ -3742,7 +3742,15 @@ typedef int zig_memory_order;
static inline void zig_msvc_atomic_store_##ZigType(Type volatile* obj, Type value) { \ static inline void zig_msvc_atomic_store_##ZigType(Type volatile* obj, Type value) { \
(void)_InterlockedExchange##suffix((SigType volatile*)obj, (SigType)value); \ (void)_InterlockedExchange##suffix((SigType volatile*)obj, (SigType)value); \
} \ } \
static inline Type zig_msvc_atomic_load_##ZigType(Type volatile* obj) { \ static inline Type zig_msvc_atomic_load_zig_memory_order_relaxed_##ZigType(Type volatile* obj) { \
return __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
} \
static inline Type zig_msvc_atomic_load_zig_memory_order_acquire_##ZigType(Type volatile* obj) { \
Type val = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \
return val; \
} \
static inline Type zig_msvc_atomic_load_zig_memory_order_seq_cst_##ZigType(Type volatile* obj) { \
Type val = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \ Type val = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \ _ReadWriteBarrier(); \
return val; \ return val; \
@ -3760,7 +3768,7 @@ zig_msvc_atomics(u64, uint64_t, __int64, 64, 64)
zig_msvc_atomics(i64, int64_t, __int64, 64, 64) zig_msvc_atomics(i64, int64_t, __int64, 64, 64)
#endif #endif
#define zig_msvc_flt_atomics(Type, SigType, suffix) \ #define zig_msvc_flt_atomics(Type, SigType, suffix, iso_suffix) \
static inline bool zig_msvc_cmpxchg_##Type(zig_##Type volatile* obj, zig_##Type* expected, zig_##Type desired) { \ static inline bool zig_msvc_cmpxchg_##Type(zig_##Type volatile* obj, zig_##Type* expected, zig_##Type desired) { \
SigType exchange; \ SigType exchange; \
SigType comparand; \ SigType comparand; \
@ -3778,15 +3786,30 @@ zig_msvc_atomics(i64, int64_t, __int64, 64, 64)
memcpy(&value, &arg, sizeof(value)); \ memcpy(&value, &arg, sizeof(value)); \
(void)_InterlockedExchange##suffix((SigType volatile*)obj, value); \ (void)_InterlockedExchange##suffix((SigType volatile*)obj, value); \
} \ } \
static inline zig_##Type zig_msvc_atomic_load_##Type(zig_##Type volatile* obj) { \ static inline zig_##Type zig_msvc_atomic_load_zig_memory_order_relaxed_##Type(zig_##Type volatile* obj) { \
zig_##Type result; \ zig_##Type result; \
SigType initial = _InterlockedExchangeAdd##suffix((SigType volatile*)obj, (SigType)0); \ SigType initial = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
memcpy(&result, &initial, sizeof(result)); \ memcpy(&result, &initial, sizeof(result)); \
return result; \ return result; \
} \
static inline zig_##Type zig_msvc_atomic_load_zig_memory_order_acquire_##Type(zig_##Type volatile* obj) { \
zig_##Type result; \
SigType initial = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \
memcpy(&result, &initial, sizeof(result)); \
return result; \
} \
static inline zig_##Type zig_msvc_atomic_load_zig_memory_order_seq_cst_##Type(zig_##Type volatile* obj) { \
zig_##Type result; \
SigType initial = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \
memcpy(&result, &initial, sizeof(result)); \
return result; \
} }
zig_msvc_flt_atomics(f32, long, )
zig_msvc_flt_atomics(f32, long, , 32)
#if _M_X64 #if _M_X64
zig_msvc_flt_atomics(f64, int64_t, 64) zig_msvc_flt_atomics(f64, int64_t, 64, 64)
#endif #endif
#if _M_IX86 #if _M_IX86

37
stage1/zig.h
View File

@ -3636,7 +3636,7 @@ typedef int zig_memory_order;
#define zig_atomicrmw_min(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_min_ ##Type(obj, arg) #define zig_atomicrmw_min(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_min_ ##Type(obj, arg)
#define zig_atomicrmw_max(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_max_ ##Type(obj, arg) #define zig_atomicrmw_max(res, obj, arg, order, Type, ReprType) res = zig_msvc_atomicrmw_max_ ##Type(obj, arg)
#define zig_atomic_store( obj, arg, order, Type, ReprType) zig_msvc_atomic_store_ ##Type(obj, arg) #define zig_atomic_store( obj, arg, order, Type, ReprType) zig_msvc_atomic_store_ ##Type(obj, arg)
#define zig_atomic_load(res, obj, order, Type, ReprType) res = zig_msvc_atomic_load_ ##Type(obj) #define zig_atomic_load(res, obj, order, Type, ReprType) res = zig_msvc_atomic_load_ ##order##_##Type(obj)
#if _M_X64 #if _M_X64
#define zig_fence(order) __faststorefence() #define zig_fence(order) __faststorefence()
#else #else
@ -3742,7 +3742,15 @@ typedef int zig_memory_order;
static inline void zig_msvc_atomic_store_##ZigType(Type volatile* obj, Type value) { \ static inline void zig_msvc_atomic_store_##ZigType(Type volatile* obj, Type value) { \
(void)_InterlockedExchange##suffix((SigType volatile*)obj, (SigType)value); \ (void)_InterlockedExchange##suffix((SigType volatile*)obj, (SigType)value); \
} \ } \
static inline Type zig_msvc_atomic_load_##ZigType(Type volatile* obj) { \ static inline Type zig_msvc_atomic_load_zig_memory_order_relaxed_##ZigType(Type volatile* obj) { \
return __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
} \
static inline Type zig_msvc_atomic_load_zig_memory_order_acquire_##ZigType(Type volatile* obj) { \
Type val = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \
return val; \
} \
static inline Type zig_msvc_atomic_load_zig_memory_order_seq_cst_##ZigType(Type volatile* obj) { \
Type val = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \ Type val = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \ _ReadWriteBarrier(); \
return val; \ return val; \
@ -3760,7 +3768,7 @@ zig_msvc_atomics(u64, uint64_t, __int64, 64, 64)
zig_msvc_atomics(i64, int64_t, __int64, 64, 64) zig_msvc_atomics(i64, int64_t, __int64, 64, 64)
#endif #endif
#define zig_msvc_flt_atomics(Type, SigType, suffix) \ #define zig_msvc_flt_atomics(Type, SigType, suffix, iso_suffix) \
static inline bool zig_msvc_cmpxchg_##Type(zig_##Type volatile* obj, zig_##Type* expected, zig_##Type desired) { \ static inline bool zig_msvc_cmpxchg_##Type(zig_##Type volatile* obj, zig_##Type* expected, zig_##Type desired) { \
SigType exchange; \ SigType exchange; \
SigType comparand; \ SigType comparand; \
@ -3778,15 +3786,30 @@ zig_msvc_atomics(i64, int64_t, __int64, 64, 64)
memcpy(&value, &arg, sizeof(value)); \ memcpy(&value, &arg, sizeof(value)); \
(void)_InterlockedExchange##suffix((SigType volatile*)obj, value); \ (void)_InterlockedExchange##suffix((SigType volatile*)obj, value); \
} \ } \
static inline zig_##Type zig_msvc_atomic_load_##Type(zig_##Type volatile* obj) { \ static inline zig_##Type zig_msvc_atomic_load_zig_memory_order_relaxed_##Type(zig_##Type volatile* obj) { \
zig_##Type result; \ zig_##Type result; \
SigType initial = _InterlockedExchangeAdd##suffix((SigType volatile*)obj, (SigType)0); \ SigType initial = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
memcpy(&result, &initial, sizeof(result)); \ memcpy(&result, &initial, sizeof(result)); \
return result; \ return result; \
} \
static inline zig_##Type zig_msvc_atomic_load_zig_memory_order_acquire_##Type(zig_##Type volatile* obj) { \
zig_##Type result; \
SigType initial = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \
memcpy(&result, &initial, sizeof(result)); \
return result; \
} \
static inline zig_##Type zig_msvc_atomic_load_zig_memory_order_seq_cst_##Type(zig_##Type volatile* obj) { \
zig_##Type result; \
SigType initial = __iso_volatile_load##iso_suffix((SigType volatile*)obj); \
_ReadWriteBarrier(); \
memcpy(&result, &initial, sizeof(result)); \
return result; \
} }
zig_msvc_flt_atomics(f32, long, )
zig_msvc_flt_atomics(f32, long, , 32)
#if _M_X64 #if _M_X64
zig_msvc_flt_atomics(f64, int64_t, 64) zig_msvc_flt_atomics(f64, int64_t, 64, 64)
#endif #endif
#if _M_IX86 #if _M_IX86