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

Attempt to fix #9271

Browse source
This commit is contained in:
Nekotekina 2020-11-21 05:03:35 +03:00
parent 5f010c2f4c
commit 60cff6f3d4
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utilities/BEType.h
View file

@ -508,4 +508,7 @@ struct fmt_unveil<se_t<T, Se, Align>, void>
} }
}; };
static_assert(be_t<u16>(1) + be_t<u32>(2) + be_t<u64>(3) == 6);
static_assert(le_t<u16>(1) + le_t<u32>(2) + le_t<u64>(3) == 6);
#endif // BETYPE_H_GUARD #endif // BETYPE_H_GUARD

2
rpcs3/util/atomic.cpp
View file

@ -12,8 +12,6 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#include <chrono> #include <chrono>
#include <iterator>
#include <memory>
#include <cstdlib> #include <cstdlib>
#include <cstdint> #include <cstdint>
#include <array> #include <array>

29
rpcs3/util/endian.hpp
View file

@ -1,4 +1,5 @@
#pragma once #ifndef ENDIAN_HPP_GUARD
#define ENDIAN_HPP_GUARD
#include <cstdint> #include <cstdint>
#include "Utilities/types.h" #include "Utilities/types.h"
@ -13,17 +14,19 @@ namespace stx
{ {
static_assert(std::endian::native == std::endian::little || std::endian::native == std::endian::big); static_assert(std::endian::native == std::endian::little || std::endian::native == std::endian::big);
#ifdef _MSC_VER
template<class T, std::size_t... N> template<class T, std::size_t... N>
FORCE_INLINE constexpr T bswap_impl(T i, std::index_sequence<N...>) static constexpr T bswap_impl(T i, std::index_sequence<N...>)
{ {
return static_cast<T>(((((i >> (N * 8)) & T{UINT8_MAX}) << ((sizeof(T) - 1 - N) * 8)) | ...)); return static_cast<T>(((((i >> (N * 8)) & T{UINT8_MAX}) << ((sizeof(T) - 1 - N) * 8)) | ...));
}; };
template<class T, class U = typename std::make_unsigned<T>::type> template<class T, class U = typename std::make_unsigned<T>::type>
FORCE_INLINE constexpr U bswap(T i) static constexpr U bswap(T i)
{ {
return bswap_impl<U>(i, std::make_index_sequence<sizeof(T)>{}); return bswap_impl<U>(i, std::make_index_sequence<sizeof(T)>{});
} }
#endif
template <typename T, std::size_t Align = alignof(T), std::size_t Size = sizeof(T)> template <typename T, std::size_t Align = alignof(T), std::size_t Size = sizeof(T)>
struct se_storage struct se_storage
@ -51,14 +54,14 @@ namespace stx
static constexpr std::uint16_t swap(std::uint16_t src) noexcept static constexpr std::uint16_t swap(std::uint16_t src) noexcept
{ {
#if defined(__GNUG__)
return __builtin_bswap16(src);
#else
if (std::is_constant_evaluated()) if (std::is_constant_evaluated())
{ {
return stx::bswap(src); return stx::bswap(src);
} }
#if defined(__GNUG__)
return __builtin_bswap16(src);
#else
return _byteswap_ushort(src); return _byteswap_ushort(src);
#endif #endif
} }
@ -71,14 +74,14 @@ namespace stx
static constexpr std::uint32_t swap(std::uint32_t src) noexcept static constexpr std::uint32_t swap(std::uint32_t src) noexcept
{ {
#if defined(__GNUG__)
return __builtin_bswap32(src);
#else
if (std::is_constant_evaluated()) if (std::is_constant_evaluated())
{ {
return stx::bswap(src); return stx::bswap(src);
} }
#if defined(__GNUG__)
return __builtin_bswap32(src);
#else
return _byteswap_ulong(src); return _byteswap_ulong(src);
#endif #endif
} }
@ -91,14 +94,14 @@ namespace stx
static constexpr std::uint64_t swap(std::uint64_t src) noexcept static constexpr std::uint64_t swap(std::uint64_t src) noexcept
{ {
#if defined(__GNUG__)
return __builtin_bswap64(src);
#else
if (std::is_constant_evaluated()) if (std::is_constant_evaluated())
{ {
return stx::bswap(src); return stx::bswap(src);
} }
#if defined(__GNUG__)
return __builtin_bswap64(src);
#else
return _byteswap_uint64(src); return _byteswap_uint64(src);
#endif #endif
} }
@ -489,3 +492,5 @@ public:
} }
}; };
} }
#endif // ENDIAN_HPP_GUARD