RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

bs_t<>: create BitSetEnum concept

Browse Source 
Try concepts instead of SFINAE.
This commit is contained in:
Nekotekina 2021-04-17 16:32:15 +03:00
parent d623720f4d
commit fb26da1cb0
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Utilities/bit_set.h
View File

@ -26,10 +26,16 @@ Intersection (&) and symmetric difference (^) is also available.
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
template <typename T> template <typename T>
concept BitSetEnum = std::is_enum_v<T> && requires(T x)
{
T::__bitset_enum_max;
};
template <BitSetEnum T>
class atomic_bs_t; class atomic_bs_t;
// Bitset type for enum class with available bits [0, T::__bitset_enum_max) // Bitset type for enum class with available bits [0, T::__bitset_enum_max)
template <typename T> template <BitSetEnum T>
class bs_t final class bs_t final
{ {
public: public:
@ -165,70 +171,70 @@ public:
}; };
// Unary '+' operator: promote plain enum value to bitset value // Unary '+' operator: promote plain enum value to bitset value
template <typename T, typename = decltype(T::__bitset_enum_max)> template <BitSetEnum T>
constexpr bs_t<T> operator +(T bit) constexpr bs_t<T> operator +(T bit)
{ {
return bs_t<T>(bit); return bs_t<T>(bit);
} }
// Binary '+' operator: bitset union // Binary '+' operator: bitset union
template <typename T, typename U, typename = decltype(T::__bitset_enum_max)> template <BitSetEnum T, typename U> requires (std::is_constructible_v<bs_t<T>, U>)
constexpr std::enable_if_t<std::is_constructible_v<bs_t<T>, U>, bs_t<T>> operator +(T lhs, const U& rhs) constexpr bs_t<T> operator +(T lhs, const U& rhs)
{ {
return bs_t<T>(lhs) + bs_t<T>(rhs); return bs_t<T>(lhs) + bs_t<T>(rhs);
} }
// Binary '+' operator: bitset union // Binary '+' operator: bitset union
template <typename U, typename T, typename = decltype(T::__bitset_enum_max)> template <typename U, BitSetEnum T> requires (std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>)
constexpr std::enable_if_t<(std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>), bs_t<T>> operator +(const U& lhs, T rhs) constexpr bs_t<T> operator +(const U& lhs, T rhs)
{ {
return bs_t<T>(lhs) + bs_t<T>(rhs); return bs_t<T>(lhs) + bs_t<T>(rhs);
} }
// Binary '-' operator: bitset difference // Binary '-' operator: bitset difference
template <typename T, typename U, typename = decltype(T::__bitset_enum_max)> template <BitSetEnum T, typename U> requires (std::is_constructible_v<bs_t<T>, U>)
constexpr std::enable_if_t<std::is_constructible_v<bs_t<T>, U>, bs_t<T>> operator -(T lhs, const U& rhs) constexpr bs_t<T> operator -(T lhs, const U& rhs)
{ {
return bs_t<T>(lhs) - bs_t<T>(rhs); return bs_t<T>(lhs) - bs_t<T>(rhs);
} }
// Binary '-' operator: bitset difference // Binary '-' operator: bitset difference
template <typename U, typename T, typename = decltype(T::__bitset_enum_max)> template <typename U, BitSetEnum T> requires (std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>)
constexpr std::enable_if_t<(std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>), bs_t<T>> operator -(const U& lhs, T rhs) constexpr bs_t<T> operator -(const U& lhs, T rhs)
{ {
return bs_t<T>(lhs) - bs_t<T>(rhs); return bs_t<T>(lhs) - bs_t<T>(rhs);
} }
// Binary '&' operator: bitset intersection // Binary '&' operator: bitset intersection
template <typename T, typename U, typename = decltype(T::__bitset_enum_max)> template <BitSetEnum T, typename U> requires (std::is_constructible_v<bs_t<T>, U>)
constexpr std::enable_if_t<std::is_constructible_v<bs_t<T>, U>, bs_t<T>> operator &(T lhs, const U& rhs) constexpr bs_t<T> operator &(T lhs, const U& rhs)
{ {
return bs_t<T>(lhs) & bs_t<T>(rhs); return bs_t<T>(lhs) & bs_t<T>(rhs);
} }
// Binary '&' operator: bitset intersection // Binary '&' operator: bitset intersection
template <typename U, typename T, typename = decltype(T::__bitset_enum_max)> template <typename U, BitSetEnum T> requires (std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>)
constexpr std::enable_if_t<(std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>), bs_t<T>> operator &(const U& lhs, T rhs) constexpr bs_t<T> operator &(const U& lhs, T rhs)
{ {
return bs_t<T>(lhs) & bs_t<T>(rhs); return bs_t<T>(lhs) & bs_t<T>(rhs);
} }
// Binary '^' operator: bitset symmetric difference // Binary '^' operator: bitset symmetric difference
template <typename T, typename U, typename = decltype(T::__bitset_enum_max)> template <BitSetEnum T, typename U> requires (std::is_constructible_v<bs_t<T>, U>)
constexpr std::enable_if_t<std::is_constructible_v<bs_t<T>, U>, bs_t<T>> operator ^(T lhs, const U& rhs) constexpr bs_t<T> operator ^(T lhs, const U& rhs)
{ {
return bs_t<T>(lhs) ^ bs_t<T>(rhs); return bs_t<T>(lhs) ^ bs_t<T>(rhs);
} }
// Binary '^' operator: bitset symmetric difference // Binary '^' operator: bitset symmetric difference
template <typename U, typename T, typename = decltype(T::__bitset_enum_max)> template <typename U, BitSetEnum T> requires (std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>)
constexpr std::enable_if_t<(std::is_constructible_v<bs_t<T>, U> && !std::is_enum_v<U>), bs_t<T>> operator ^(const U& lhs, T rhs) constexpr bs_t<T> operator ^(const U& lhs, T rhs)
{ {
return bs_t<T>(lhs) ^ bs_t<T>(rhs); return bs_t<T>(lhs) ^ bs_t<T>(rhs);
} }
// Atomic bitset specialization with optimized operations // Atomic bitset specialization with optimized operations
template <typename T> template <BitSetEnum T>
class atomic_bs_t : public atomic_t<::bs_t<T>> class atomic_bs_t : public atomic_t<::bs_t<T>>
{ {
// Corresponding bitset type // Corresponding bitset type

4
rpcs3/cmake_modules/ConfigureCompiler.cmake
View File

@ -27,6 +27,10 @@ else()
add_compile_options(-fstack-protector) add_compile_options(-fstack-protector)
add_compile_options(-msse -msse2 -mcx16) add_compile_options(-msse -msse2 -mcx16)
if ((${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.1))
add_compile_options(-fconcepts)
endif()
add_compile_options(-Werror=old-style-cast) add_compile_options(-Werror=old-style-cast)
add_compile_options(-Werror=sign-compare) add_compile_options(-Werror=sign-compare)
add_compile_options(-Werror=reorder) add_compile_options(-Werror=reorder)