archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix -Wstring-aliasing (gcc)

Browse source
This commit is contained in:
Nekotekina 2021-02-18 19:38:22 +03:00
parent c8fefc4434
commit e76d8eb046
2 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/cmake_modules/ConfigureCompiler.cmake
View file

@ -49,7 +49,6 @@ else()
add_compile_options(-Wno-delete-non-virtual-dtor) add_compile_options(-Wno-delete-non-virtual-dtor)
add_compile_options(-Wno-unused-command-line-argument) add_compile_options(-Wno-unused-command-line-argument)
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX)
add_compile_options(-Wno-strict-aliasing)
add_compile_options(-Wno-class-memaccess) add_compile_options(-Wno-class-memaccess)
endif() endif()

45
rpcs3/util/atomic.hpp
View file

@ -348,29 +348,48 @@ struct atomic_storage
static constexpr int s_hle_rel = __ATOMIC_SEQ_CST; static constexpr int s_hle_rel = __ATOMIC_SEQ_CST;
#endif #endif
// clang often thinks atomics are misaligned, GCC doesn't like reinterpret_cast for breaking strict aliasing
#ifdef __clang__
#define MAYBE_CAST(...) (reinterpret_cast<type*>(__VA_ARGS__))
#else
#define MAYBE_CAST(...) (__VA_ARGS__)
#endif
static inline bool compare_exchange(T& dest, T& comp, T exch) static inline bool compare_exchange(T& dest, T& comp, T exch)
{ {
return __atomic_compare_exchange(reinterpret_cast<type*>(&dest), reinterpret_cast<type*>(&comp), reinterpret_cast<type*>(&exch), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); return __atomic_compare_exchange(MAYBE_CAST(&dest), MAYBE_CAST(&comp), MAYBE_CAST(&exch), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
} }
static inline bool compare_exchange_hle_acq(T& dest, T& comp, T exch) static inline bool compare_exchange_hle_acq(T& dest, T& comp, T exch)
{ {
static_assert(sizeof(T) == 4 || sizeof(T) == 8); static_assert(sizeof(T) == 4 || sizeof(T) == 8);
return __atomic_compare_exchange(reinterpret_cast<type*>(&dest), reinterpret_cast<type*>(&comp), reinterpret_cast<type*>(&exch), false, s_hle_ack, s_hle_ack); return __atomic_compare_exchange(MAYBE_CAST(&dest), MAYBE_CAST(&comp), MAYBE_CAST(&exch), false, s_hle_ack, s_hle_ack);
} }
static inline T load(const T& dest) static inline T load(const T& dest)
{ {
T result; #ifdef __clang__
__atomic_load(reinterpret_cast<const type*>(&dest), reinterpret_cast<type*>(&result), __ATOMIC_SEQ_CST); type result;
__atomic_load(reinterpret_cast<const type*>(&dest), MAYBE_CAST(&result), __ATOMIC_SEQ_CST);
return std::bit_cast<T>(result);
#else
alignas(sizeof(T)) T result;
__atomic_load(&dest, &result, __ATOMIC_SEQ_CST);
return result; return result;
#endif
} }
static inline T observe(const T& dest) static inline T observe(const T& dest)
{ {
T result; #ifdef __clang__
__atomic_load(reinterpret_cast<const type*>(&dest), reinterpret_cast<type*>(&result), __ATOMIC_RELAXED); type result;
__atomic_load(reinterpret_cast<const type*>(&dest), MAYBE_CAST(&result), __ATOMIC_RELAXED);
return std::bit_cast<T>(result);
#else
alignas(sizeof(T)) T result;
__atomic_load(&dest, &result, __ATOMIC_RELAXED);
return result; return result;
#endif
} }
static inline void store(T& dest, T value) static inline void store(T& dest, T value)
@ -380,13 +399,13 @@ struct atomic_storage
static inline void release(T& dest, T value) static inline void release(T& dest, T value)
{ {
__atomic_store(reinterpret_cast<type*>(&dest), reinterpret_cast<type*>(&value), __ATOMIC_RELEASE); __atomic_store(MAYBE_CAST(&dest), MAYBE_CAST(&value), __ATOMIC_RELEASE);
} }
static inline T exchange(T& dest, T value) static inline T exchange(T& dest, T value)
{ {
T result; alignas(sizeof(T)) T result;
__atomic_exchange(reinterpret_cast<type*>(&dest), reinterpret_cast<type*>(&value), reinterpret_cast<type*>(&result), __ATOMIC_SEQ_CST); __atomic_exchange(MAYBE_CAST(&dest), MAYBE_CAST(&value), MAYBE_CAST(&result), __ATOMIC_SEQ_CST);
return result; return result;
} }
@ -479,6 +498,7 @@ struct atomic_storage
{ {
return atomic_storage<T>::fetch_xor(dest, value) ^ value; return atomic_storage<T>::fetch_xor(dest, value) ^ value;
} }
#undef MAYBE_CAST
#endif #endif
/* Third part: fallbacks, may be hidden by subsequent atomic_storage<> specializations */ /* Third part: fallbacks, may be hidden by subsequent atomic_storage<> specializations */
@ -974,7 +994,7 @@ struct atomic_storage<T, 16> : atomic_storage<T, 0>
#else #else
static inline T load(const T& dest) static inline T load(const T& dest)
{ {
T r; alignas(16) T r;
#ifdef __AVX__ #ifdef __AVX__
__asm__ volatile("vmovdqa %1, %0;" : "=x" (r) : "m" (dest) : "memory"); __asm__ volatile("vmovdqa %1, %0;" : "=x" (r) : "m" (dest) : "memory");
#else #else
@ -1047,10 +1067,11 @@ struct atomic_storage<T, 16> : atomic_storage<T, 0>
static inline void release(T& dest, T value) static inline void release(T& dest, T value)
{ {
u128 val = std::bit_cast<u128>(value);
#ifdef __AVX__ #ifdef __AVX__
__asm__ volatile("vmovdqa %0, %1;" :: "x" (reinterpret_cast<u128&>(value)), "m" (dest) : "memory"); __asm__ volatile("vmovdqa %0, %1;" :: "x" (val), "m" (dest) : "memory");
#else #else
__asm__ volatile("movdqa %0, %1;" :: "x" (reinterpret_cast<u128&>(value)), "m" (dest) : "memory"); __asm__ volatile("movdqa %0, %1;" :: "x" (val), "m" (dest) : "memory");
#endif #endif
} }
#endif #endif