2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00

common/alignment: Upgrade to use constraints instead of static asserts

This commit is contained in:
ReinUsesLisp 2021-01-15 04:05:22 -03:00
parent fe494a0ccd
commit 89c15dd115

View file

@ -9,8 +9,7 @@
namespace Common { namespace Common {
template <typename T> template <typename T>
[[nodiscard]] constexpr T AlignUp(T value, std::size_t size) { requires std::is_unsigned_v<T>[[nodiscard]] constexpr T AlignUp(T value, size_t size) {
static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
auto mod{static_cast<T>(value % size)}; auto mod{static_cast<T>(value % size)};
value -= mod; value -= mod;
return static_cast<T>(mod == T{0} ? value : value + size); return static_cast<T>(mod == T{0} ? value : value + size);
@ -22,36 +21,33 @@ requires std::is_unsigned_v<T>[[nodiscard]] constexpr T AlignUpLog2(T value, siz
} }
template <typename T> template <typename T>
[[nodiscard]] constexpr T AlignDown(T value, std::size_t size) { requires std::is_unsigned_v<T>[[nodiscard]] constexpr T AlignDown(T value, size_t size) {
static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
return static_cast<T>(value - value % size); return static_cast<T>(value - value % size);
} }
template <typename T> template <typename T>
[[nodiscard]] constexpr bool Is4KBAligned(T value) { requires std::is_unsigned_v<T>[[nodiscard]] constexpr bool Is4KBAligned(T value) {
static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
return (value & 0xFFF) == 0; return (value & 0xFFF) == 0;
} }
template <typename T> template <typename T>
[[nodiscard]] constexpr bool IsWordAligned(T value) { requires std::is_unsigned_v<T>[[nodiscard]] constexpr bool IsWordAligned(T value) {
static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
return (value & 0b11) == 0; return (value & 0b11) == 0;
} }
template <typename T> template <typename T>
[[nodiscard]] constexpr bool IsAligned(T value, std::size_t alignment) { requires std::is_integral_v<T>[[nodiscard]] constexpr bool IsAligned(T value, size_t alignment) {
using U = typename std::make_unsigned<T>::type; using U = typename std::make_unsigned_t<T>;
const U mask = static_cast<U>(alignment - 1); const U mask = static_cast<U>(alignment - 1);
return (value & mask) == 0; return (value & mask) == 0;
} }
template <typename T, std::size_t Align = 16> template <typename T, size_t Align = 16>
class AlignmentAllocator { class AlignmentAllocator {
public: public:
using value_type = T; using value_type = T;
using size_type = std::size_t; using size_type = size_t;
using difference_type = std::ptrdiff_t; using difference_type = ptrdiff_t;
using propagate_on_container_copy_assignment = std::true_type; using propagate_on_container_copy_assignment = std::true_type;
using propagate_on_container_move_assignment = std::true_type; using propagate_on_container_move_assignment = std::true_type;