VERY experimental Nintendo Switch 2 emulator
C++
Move to Clang Format 15
Levi Behunin2ff6c44168b0
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.shindex 225bbc9726..25b0718f02 100755--- a/.ci/scripts/format/script.sh+++ b/.ci/scripts/format/script.sh@@ -10,7 +10,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* disfi# Default clang-format points to default 3.5 version one-CLANG_FORMAT=${CLANG_FORMAT:-clang-format-12}+CLANG_FORMAT=${CLANG_FORMAT:-clang-format-15}$CLANG_FORMAT --versionif [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; thendiff --git a/src/common/address_space.h b/src/common/address_space.hindex 9222b2fdc6..8683c23c39 100644--- a/src/common/address_space.h+++ b/src/common/address_space.h@@ -12,7 +12,8 @@namespace Common {template <typename VaType, size_t AddressSpaceBits>-concept AddressSpaceValid = std::is_unsigned_v<VaType> && sizeof(VaType) * 8 >= AddressSpaceBits;+concept AddressSpaceValid = std::is_unsigned_v<VaType> && sizeof(VaType) * 8 >=+AddressSpaceBits;struct EmptyStruct {};@@ -21,7 +22,7 @@ struct EmptyStruct {};*/template <typename VaType, VaType UnmappedVa, typename PaType, PaType UnmappedPa,bool PaContigSplit, size_t AddressSpaceBits, typename ExtraBlockInfo = EmptyStruct>-requires AddressSpaceValid<VaType, AddressSpaceBits>+ requires AddressSpaceValid<VaType, AddressSpaceBits>class FlatAddressSpaceMap {public:/// The maximum VA that this AS can technically reach@@ -109,7 +110,7 @@ private:* initial, fast linear pass and a subsequent slower pass that iterates until it finds a free block*/template <typename VaType, VaType UnmappedVa, size_t AddressSpaceBits>-requires AddressSpaceValid<VaType, AddressSpaceBits>+ requires AddressSpaceValid<VaType, AddressSpaceBits>class FlatAllocator: public FlatAddressSpaceMap<VaType, UnmappedVa, bool, false, false, AddressSpaceBits> {private:diff --git a/src/common/alignment.h b/src/common/alignment.hindex 7e897334be..fa715d4975 100644--- a/src/common/alignment.h+++ b/src/common/alignment.h@@ -10,7 +10,7 @@namespace Common {template <typename T>-requires std::is_unsigned_v<T>+ requires std::is_unsigned_v<T>[[nodiscard]] constexpr T AlignUp(T value, size_t size) {auto mod{static_cast<T>(value % size)};value -= mod;@@ -18,31 +18,31 @@ requires std::is_unsigned_v<T>}template <typename T>-requires std::is_unsigned_v<T>+ requires std::is_unsigned_v<T>[[nodiscard]] constexpr T AlignUpLog2(T value, size_t align_log2) {return static_cast<T>((value + ((1ULL << align_log2) - 1)) >> align_log2 << align_log2);}template <typename T>-requires std::is_unsigned_v<T>+ requires std::is_unsigned_v<T>[[nodiscard]] constexpr T AlignDown(T value, size_t size) {return static_cast<T>(value - value % size);}template <typename T>-requires std::is_unsigned_v<T>+ requires std::is_unsigned_v<T>[[nodiscard]] constexpr bool Is4KBAligned(T value) {return (value & 0xFFF) == 0;}template <typename T>-requires std::is_unsigned_v<T>+ requires std::is_unsigned_v<T>[[nodiscard]] constexpr bool IsWordAligned(T value) {return (value & 0b11) == 0;}template <typename T>-requires std::is_integral_v<T>+ requires std::is_integral_v<T>[[nodiscard]] constexpr bool IsAligned(T value, size_t alignment) {using U = typename std::make_unsigned_t<T>;const U mask = static_cast<U>(alignment - 1);@@ -50,7 +50,7 @@ requires std::is_integral_v<T>}template <typename T, typename U>-requires std::is_integral_v<T>+ requires std::is_integral_v<T>[[nodiscard]] constexpr T DivideUp(T x, U y) {return (x + (y - 1)) / y;}@@ -73,11 +73,11 @@ public:constexpr AlignmentAllocator(const AlignmentAllocator<T2, Align>&) noexcept {}[[nodiscard]] T* allocate(size_type n) {- return static_cast<T*>(::operator new (n * sizeof(T), std::align_val_t{Align}));+ return static_cast<T*>(::operator new(n * sizeof(T), std::align_val_t{Align}));}void deallocate(T* p, size_type n) {- ::operator delete (p, n * sizeof(T), std::align_val_t{Align});+ ::operator delete(p, n * sizeof(T), std::align_val_t{Align});}template <typename T2>diff --git a/src/common/atomic_helpers.h b/src/common/atomic_helpers.hindex aef3b66a4c..d997f10bac 100644--- a/src/common/atomic_helpers.h+++ b/src/common/atomic_helpers.h@@ -75,7 +75,7 @@ extern "C" void AnnotateHappensAfter(const char*, int, void*);#if defined(AE_VCPP) || defined(AE_ICC)#define AE_FORCEINLINE __forceinline#elif defined(AE_GCC)-//#define AE_FORCEINLINE __attribute__((always_inline))+// #define AE_FORCEINLINE __attribute__((always_inline))#define AE_FORCEINLINE inline#else#define AE_FORCEINLINE inlinediff --git a/src/common/bit_util.h b/src/common/bit_util.hindex e4e6287f3d..13368b4392 100644--- a/src/common/bit_util.h+++ b/src/common/bit_util.h@@ -45,19 +45,19 @@ template <typename T>}template <typename T>-requires std::is_unsigned_v<T>+ requires std::is_unsigned_v<T>[[nodiscard]] constexpr bool IsPow2(T value) {return std::has_single_bit(value);}template <typename T>-requires std::is_integral_v<T>+ requires std::is_integral_v<T>[[nodiscard]] T NextPow2(T value) {return static_cast<T>(1ULL << ((8U * sizeof(T)) - std::countl_zero(value - 1U)));}template <size_t bit_index, typename T>-requires std::is_integral_v<T>+ requires std::is_integral_v<T>[[nodiscard]] constexpr bool Bit(const T value) {static_assert(bit_index < BitSize<T>(), "bit_index must be smaller than size of T");return ((value >> bit_index) & T(1)) == T(1);diff --git a/src/common/concepts.h b/src/common/concepts.hindex a9acff3e79..61df1d32a2 100644--- a/src/common/concepts.h+++ b/src/common/concepts.h@@ -16,9 +16,9 @@ concept IsContiguousContainer = std::contiguous_iterator<typename T::iterator>;// is available on all supported platforms.template <typename Derived, typename Base>concept DerivedFrom = requires {- std::is_base_of_v<Base, Derived>;- std::is_convertible_v<const volatile Derived*, const volatile Base*>;-};+ std::is_base_of_v<Base, Derived>;+ std::is_convertible_v<const volatile Derived*, const volatile Base*>;+ };// TODO: Replace with std::convertible_to when libc++ implements it.template <typename From, typename To>diff --git a/src/common/div_ceil.h b/src/common/div_ceil.hindex eebc279c27..c12477d42e 100644--- a/src/common/div_ceil.h+++ b/src/common/div_ceil.h@@ -10,14 +10,14 @@ namespace Common {/// Ceiled integer division.template <typename N, typename D>-requires std::is_integral_v<N> && std::is_unsigned_v<D>+ requires std::is_integral_v<N> && std::is_unsigned_v<D>[[nodiscard]] constexpr N DivCeil(N number, D divisor) {return static_cast<N>((static_cast<D>(number) + divisor - 1) / divisor);}/// Ceiled integer division with logarithmic divisor in base 2template <typename N, typename D>-requires std::is_integral_v<N> && std::is_unsigned_v<D>+ requires std::is_integral_v<N> && std::is_unsigned_v<D>[[nodiscard]] constexpr N DivCeilLog2(N value, D alignment_log2) {return static_cast<N>((static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2);}diff --git a/src/common/expected.h b/src/common/expected.hindex 6e6c86ee73..5fccfbcbdd 100644--- a/src/common/expected.h+++ b/src/common/expected.h@@ -64,7 +64,7 @@ struct no_init_t {* Additionally, this requires E to be trivially destructible*/template <typename T, typename E, bool = std::is_trivially_destructible_v<T>>-requires std::is_trivially_destructible_v<E>+ requires std::is_trivially_destructible_v<E>struct expected_storage_base {constexpr expected_storage_base() : m_val{T{}}, m_has_val{true} {}@@ -111,7 +111,7 @@ struct expected_storage_base {* Additionally, this requires E to be trivially destructible*/template <typename T, typename E>-requires std::is_trivially_destructible_v<E>+ requires std::is_trivially_destructible_v<E>struct expected_storage_base<T, E, true> {constexpr expected_storage_base() : m_val{T{}}, m_has_val{true} {}@@ -251,7 +251,7 @@ struct expected_operations_base : expected_storage_base<T, E> {* Additionally, this requires E to be trivially copy constructible*/template <typename T, typename E, bool = std::is_trivially_copy_constructible_v<T>>-requires std::is_trivially_copy_constructible_v<E>+ requires std::is_trivially_copy_constructible_v<E>struct expected_copy_base : expected_operations_base<T, E> {using expected_operations_base<T, E>::expected_operations_base;};@@ -261,7 +261,7 @@ struct expected_copy_base : expected_operations_base<T, E> {* Additionally, this requires E to be trivially copy constructible*/template <typename T, typename E>-requires std::is_trivially_copy_constructible_v<E>+ requires std::is_trivially_copy_constructible_v<E>struct expected_copy_base<T, E, false> : expected_operations_base<T, E> {using expected_operations_base<T, E>::expected_operations_base;@@ -289,7 +289,7 @@ struct expected_copy_base<T, E, false> : expected_operations_base<T, E> {* Additionally, this requires E to be trivially move constructible*/template <typename T, typename E, bool = std::is_trivially_move_constructible_v<T>>-requires std::is_trivially_move_constructible_v<E>+ requires std::is_trivially_move_constructible_v<E>struct expected_move_base : expected_copy_base<T, E> {using expected_copy_base<T, E>::expected_copy_base;};@@ -299,7 +299,7 @@ struct expected_move_base : expected_copy_base<T, E> {* Additionally, this requires E to be trivially move constructible*/template <typename T, typename E>-requires std::is_trivially_move_constructible_v<E>+ requires std::is_trivially_move_constructible_v<E>struct expected_move_base<T, E, false> : expected_copy_base<T, E> {using expected_copy_base<T, E>::expected_copy_base;@@ -330,9 +330,9 @@ template <typename T, typename E,bool = std::conjunction_v<std::is_trivially_copy_assignable<T>,std::is_trivially_copy_constructible<T>,std::is_trivially_destructible<T>>>-requires std::conjunction_v<std::is_trivially_copy_assignable<E>,- std::is_trivially_copy_constructible<E>,- std::is_trivially_destructible<E>>+ requires std::conjunction_v<std::is_trivially_copy_assignable<E>,+ std::is_trivially_copy_constructible<E>,+ std::is_trivially_destructible<E>>struct expected_copy_assign_base : expected_move_base<T, E> {using expected_move_base<T, E>::expected_move_base;};@@ -342,9 +342,9 @@ struct expected_copy_assign_base : expected_move_base<T, E> {* Additionally, this requires E to be trivially copy assignable*/template <typename T, typename E>-requires std::conjunction_v<std::is_trivially_copy_assignable<E>,- std::is_trivially_copy_constructible<E>,- std::is_trivially_destructible<E>>+ requires std::conjunction_v<std::is_trivially_copy_assignable<E>,+ std::is_trivially_copy_constructible<E>,+ std::is_trivially_destructible<E>>struct expected_copy_assign_base<T, E, false> : expected_move_base<T, E> {using expected_move_base<T, E>::expected_move_base;@@ -371,9 +371,9 @@ template <typename T, typename E,bool = std::conjunction_v<std::is_trivially_move_assignable<T>,std::is_trivially_move_constructible<T>,std::is_trivially_destructible<T>>>-requires std::conjunction_v<std::is_trivially_move_assignable<E>,- std::is_trivially_move_constructible<E>,- std::is_trivially_destructible<E>>+ requires std::conjunction_v<std::is_trivially_move_assignable<E>,+ std::is_trivially_move_constructible<E>,+ std::is_trivially_destructible<E>>struct expected_move_assign_base : expected_copy_assign_base<T, E> {using expected_copy_assign_base<T, E>::expected_copy_assign_base;};@@ -383,9 +383,9 @@ struct expected_move_assign_base : expected_copy_assign_base<T, E> {* Additionally, this requires E to be trivially move assignable*/template <typename T, typename E>-requires std::conjunction_v<std::is_trivially_move_assignable<E>,- std::is_trivially_move_constructible<E>,- std::is_trivially_destructible<E>>+ requires std::conjunction_v<std::is_trivially_move_assignable<E>,+ std::is_trivially_move_constructible<E>,+ std::is_trivially_destructible<E>>struct expected_move_assign_base<T, E, false> : expected_copy_assign_base<T, E> {using expected_copy_assign_base<T, E>::expected_copy_assign_base;@@ -412,7 +412,7 @@ struct expected_move_assign_base<T, E, false> : expected_copy_assign_base<T, E>*/template <typename T, typename E, bool EnableCopy = std::is_copy_constructible_v<T>,bool EnableMove = std::is_move_constructible_v<T>>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>struct expected_delete_ctor_base {expected_delete_ctor_base() = default;expected_delete_ctor_base(const expected_delete_ctor_base&) = default;@@ -422,7 +422,7 @@ struct expected_delete_ctor_base {};template <typename T, typename E>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>struct expected_delete_ctor_base<T, E, true, false> {expected_delete_ctor_base() = default;expected_delete_ctor_base(const expected_delete_ctor_base&) = default;@@ -432,7 +432,7 @@ struct expected_delete_ctor_base<T, E, true, false> {};template <typename T, typename E>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>struct expected_delete_ctor_base<T, E, false, true> {expected_delete_ctor_base() = default;expected_delete_ctor_base(const expected_delete_ctor_base&) = delete;@@ -442,7 +442,7 @@ struct expected_delete_ctor_base<T, E, false, true> {};template <typename T, typename E>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>struct expected_delete_ctor_base<T, E, false, false> {expected_delete_ctor_base() = default;expected_delete_ctor_base(const expected_delete_ctor_base&) = delete;@@ -460,8 +460,8 @@ template <typename T, typename E,bool EnableCopy = std::conjunction_v<std::is_copy_constructible<T>, std::is_copy_assignable<T>>,bool EnableMove = std::conjunction_v<std::is_move_constructible<T>, std::is_move_assignable<T>>>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,- std::is_copy_assignable<E>, std::is_move_assignable<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,+ std::is_copy_assignable<E>, std::is_move_assignable<E>>struct expected_delete_assign_base {expected_delete_assign_base() = default;expected_delete_assign_base(const expected_delete_assign_base&) = default;@@ -471,8 +471,8 @@ struct expected_delete_assign_base {};template <typename T, typename E>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,- std::is_copy_assignable<E>, std::is_move_assignable<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,+ std::is_copy_assignable<E>, std::is_move_assignable<E>>struct expected_delete_assign_base<T, E, true, false> {expected_delete_assign_base() = default;expected_delete_assign_base(const expected_delete_assign_base&) = default;@@ -482,8 +482,8 @@ struct expected_delete_assign_base<T, E, true, false> {};template <typename T, typename E>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,- std::is_copy_assignable<E>, std::is_move_assignable<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,+ std::is_copy_assignable<E>, std::is_move_assignable<E>>struct expected_delete_assign_base<T, E, false, true> {expected_delete_assign_base() = default;expected_delete_assign_base(const expected_delete_assign_base&) = default;@@ -493,8 +493,8 @@ struct expected_delete_assign_base<T, E, false, true> {};template <typename T, typename E>-requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,- std::is_copy_assignable<E>, std::is_move_assignable<E>>+ requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,+ std::is_copy_assignable<E>, std::is_move_assignable<E>>struct expected_delete_assign_base<T, E, false, false> {expected_delete_assign_base() = default;expected_delete_assign_base(const expected_delete_assign_base&) = default;diff --git a/src/common/intrusive_red_black_tree.h b/src/common/intrusive_red_black_tree.hindex 93046615ec..5f6b34e821 100644--- a/src/common/intrusive_red_black_tree.h+++ b/src/common/intrusive_red_black_tree.h@@ -242,19 +242,21 @@ public:template <typename T>concept HasRedBlackKeyType = requires {- { std::is_same<typename T::RedBlackKeyType, void>::value } -> std::convertible_to<bool>;-};+ {+ std::is_same<typename T::RedBlackKeyType, void>::value+ } -> std::convertible_to<bool>;+ };namespace impl {- template <typename T, typename Default>- consteval auto* GetRedBlackKeyType() {- if constexpr (HasRedBlackKeyType<T>) {- return static_cast<typename T::RedBlackKeyType*>(nullptr);- } else {- return static_cast<Default*>(nullptr);- }+template <typename T, typename Default>+consteval auto* GetRedBlackKeyType() {+ if constexpr (HasRedBlackKeyType<T>) {+ return static_cast<typename T::RedBlackKeyType*>(nullptr);+ } else {+ return static_cast<Default*>(nullptr);}+}} // namespace impldiff --git a/src/common/make_unique_for_overwrite.h b/src/common/make_unique_for_overwrite.hindex c7413cf510..17f81bba4a 100644--- a/src/common/make_unique_for_overwrite.h+++ b/src/common/make_unique_for_overwrite.h@@ -9,17 +9,19 @@namespace Common {template <class T>-requires(!std::is_array_v<T>) std::unique_ptr<T> make_unique_for_overwrite() {+ requires(!std::is_array_v<T>)+std::unique_ptr<T> make_unique_for_overwrite() {return std::unique_ptr<T>(new T);}template <class T>-requires std::is_unbounded_array_v<T> std::unique_ptr<T> make_unique_for_overwrite(std::size_t n) {+ requires std::is_unbounded_array_v<T>+std::unique_ptr<T> make_unique_for_overwrite(std::size_t n) {return std::unique_ptr<T>(new std::remove_extent_t<T>[n]);}template <class T, class... Args>-requires std::is_bounded_array_v<T>+ requires std::is_bounded_array_v<T>void make_unique_for_overwrite(Args&&...) = delete;} // namespace Commondiff --git a/src/common/polyfill_ranges.h b/src/common/polyfill_ranges.hindex ca44bfaef1..512dbcbcb7 100644--- a/src/common/polyfill_ranges.h+++ b/src/common/polyfill_ranges.h@@ -18,9 +18,9 @@ namespace ranges {template <typename T>concept range = requires(T& t) {- begin(t);- end(t);-};+ begin(t);+ end(t);+ };template <typename T>concept input_range = range<T>;@@ -421,7 +421,7 @@ struct generate_fn {}template <typename R, std::copy_constructible F>- requires std::invocable<F&> && ranges::output_range<R>+ requires std::invocable<F&> && ranges::output_range<R>constexpr ranges::iterator_t<R> operator()(R&& r, F gen) const {return operator()(ranges::begin(r), ranges::end(r), std::move(gen));}diff --git a/src/common/polyfill_thread.h b/src/common/polyfill_thread.hindex b4c94a5fc2..b5ef055dba 100644--- a/src/common/polyfill_thread.h+++ b/src/common/polyfill_thread.h@@ -213,7 +213,7 @@ public:using callback_type = Callback;template <typename C>- requires constructible_from<Callback, C>+ requires constructible_from<Callback, C>explicit stop_callback(const stop_token& st,C&& cb) noexcept(is_nothrow_constructible_v<Callback, C>): m_stop_state(st.m_stop_state) {@@ -222,7 +222,7 @@ public:}}template <typename C>- requires constructible_from<Callback, C>+ requires constructible_from<Callback, C>explicit stop_callback(stop_token&& st,C&& cb) noexcept(is_nothrow_constructible_v<Callback, C>): m_stop_state(move(st.m_stop_state)) {diff --git a/src/common/settings.h b/src/common/settings.hindex 4b4da4da29..64db66f379 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -131,7 +131,8 @@ public:* @param default_val Intial value of the setting, and default value of the setting* @param name Label for the setting*/- explicit Setting(const Type& default_val, const std::string& name) requires(!ranged)+ explicit Setting(const Type& default_val, const std::string& name)+ requires(!ranged): value{default_val}, default_value{default_val}, label{name} {}virtual ~Setting() = default;@@ -144,7 +145,8 @@ public:* @param name Label for the setting*/explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val,- const std::string& name) requires(ranged)+ const std::string& name)+ requires(ranged): value{default_val},default_value{default_val}, maximum{max_val}, minimum{min_val}, label{name} {}@@ -232,7 +234,8 @@ public:* @param default_val Intial value of the setting, and default value of the setting* @param name Label for the setting*/- explicit SwitchableSetting(const Type& default_val, const std::string& name) requires(!ranged)+ explicit SwitchableSetting(const Type& default_val, const std::string& name)+ requires(!ranged): Setting<Type>{default_val, name} {}virtual ~SwitchableSetting() = default;@@ -245,7 +248,8 @@ public:* @param name Label for the setting*/explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val,- const std::string& name) requires(ranged)+ const std::string& name)+ requires(ranged): Setting<Type, true>{default_val, min_val, max_val, name} {}/**diff --git a/src/common/tree.h b/src/common/tree.hindex f778592094..f4fc43de36 100644--- a/src/common/tree.h+++ b/src/common/tree.h@@ -103,12 +103,12 @@ concept IsRBEntry = CheckRBEntry<T>::value;template <typename T>concept HasRBEntry = requires(T& t, const T& ct) {- { t.GetRBEntry() } -> std::same_as<RBEntry<T>&>;- { ct.GetRBEntry() } -> std::same_as<const RBEntry<T>&>;-};+ { t.GetRBEntry() } -> std::same_as<RBEntry<T>&>;+ { ct.GetRBEntry() } -> std::same_as<const RBEntry<T>&>;+ };template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>class RBHead {private:T* m_rbh_root = nullptr;@@ -130,90 +130,90 @@ public:};template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr RBEntry<T>& RB_ENTRY(T* t) {return t->GetRBEntry();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr const RBEntry<T>& RB_ENTRY(const T* t) {return t->GetRBEntry();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr T* RB_LEFT(T* t) {return RB_ENTRY(t).Left();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr const T* RB_LEFT(const T* t) {return RB_ENTRY(t).Left();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr T* RB_RIGHT(T* t) {return RB_ENTRY(t).Right();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr const T* RB_RIGHT(const T* t) {return RB_ENTRY(t).Right();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr T* RB_PARENT(T* t) {return RB_ENTRY(t).Parent();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr const T* RB_PARENT(const T* t) {return RB_ENTRY(t).Parent();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_SET_LEFT(T* t, T* e) {RB_ENTRY(t).SetLeft(e);}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_SET_RIGHT(T* t, T* e) {RB_ENTRY(t).SetRight(e);}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_SET_PARENT(T* t, T* e) {RB_ENTRY(t).SetParent(e);}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr bool RB_IS_BLACK(const T* t) {return RB_ENTRY(t).IsBlack();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr bool RB_IS_RED(const T* t) {return RB_ENTRY(t).IsRed();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>[[nodiscard]] constexpr RBColor RB_COLOR(const T* t) {return RB_ENTRY(t).Color();}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_SET_COLOR(T* t, RBColor c) {RB_ENTRY(t).SetColor(c);}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_SET(T* elm, T* parent) {auto& rb_entry = RB_ENTRY(elm);rb_entry.SetParent(parent);@@ -223,14 +223,14 @@ constexpr void RB_SET(T* elm, T* parent) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_SET_BLACKRED(T* black, T* red) {RB_SET_COLOR(black, RBColor::RB_BLACK);RB_SET_COLOR(red, RBColor::RB_RED);}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_ROTATE_LEFT(RBHead<T>& head, T* elm, T*& tmp) {tmp = RB_RIGHT(elm);if (RB_SET_RIGHT(elm, RB_LEFT(tmp)); RB_RIGHT(elm) != nullptr) {@@ -252,7 +252,7 @@ constexpr void RB_ROTATE_LEFT(RBHead<T>& head, T* elm, T*& tmp) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_ROTATE_RIGHT(RBHead<T>& head, T* elm, T*& tmp) {tmp = RB_LEFT(elm);if (RB_SET_LEFT(elm, RB_RIGHT(tmp)); RB_LEFT(elm) != nullptr) {@@ -274,7 +274,7 @@ constexpr void RB_ROTATE_RIGHT(RBHead<T>& head, T* elm, T*& tmp) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_REMOVE_COLOR(RBHead<T>& head, T* parent, T* elm) {T* tmp;while ((elm == nullptr || RB_IS_BLACK(elm)) && elm != head.Root()) {@@ -358,7 +358,7 @@ constexpr void RB_REMOVE_COLOR(RBHead<T>& head, T* parent, T* elm) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_REMOVE(RBHead<T>& head, T* elm) {T* child = nullptr;T* parent = nullptr;@@ -451,7 +451,7 @@ constexpr T* RB_REMOVE(RBHead<T>& head, T* elm) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr void RB_INSERT_COLOR(RBHead<T>& head, T* elm) {T *parent = nullptr, *tmp = nullptr;while ((parent = RB_PARENT(elm)) != nullptr && RB_IS_RED(parent)) {@@ -499,7 +499,7 @@ constexpr void RB_INSERT_COLOR(RBHead<T>& head, T* elm) {}template <typename T, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_INSERT(RBHead<T>& head, T* elm, Compare cmp) {T* parent = nullptr;T* tmp = head.Root();@@ -534,7 +534,7 @@ constexpr T* RB_INSERT(RBHead<T>& head, T* elm, Compare cmp) {}template <typename T, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_FIND(RBHead<T>& head, T* elm, Compare cmp) {T* tmp = head.Root();@@ -553,7 +553,7 @@ constexpr T* RB_FIND(RBHead<T>& head, T* elm, Compare cmp) {}template <typename T, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_NFIND(RBHead<T>& head, T* elm, Compare cmp) {T* tmp = head.Root();T* res = nullptr;@@ -574,7 +574,7 @@ constexpr T* RB_NFIND(RBHead<T>& head, T* elm, Compare cmp) {}template <typename T, typename U, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_FIND_KEY(RBHead<T>& head, const U& key, Compare cmp) {T* tmp = head.Root();@@ -593,7 +593,7 @@ constexpr T* RB_FIND_KEY(RBHead<T>& head, const U& key, Compare cmp) {}template <typename T, typename U, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_NFIND_KEY(RBHead<T>& head, const U& key, Compare cmp) {T* tmp = head.Root();T* res = nullptr;@@ -614,7 +614,7 @@ constexpr T* RB_NFIND_KEY(RBHead<T>& head, const U& key, Compare cmp) {}template <typename T, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_FIND_EXISTING(RBHead<T>& head, T* elm, Compare cmp) {T* tmp = head.Root();@@ -631,7 +631,7 @@ constexpr T* RB_FIND_EXISTING(RBHead<T>& head, T* elm, Compare cmp) {}template <typename T, typename U, typename Compare>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_FIND_EXISTING_KEY(RBHead<T>& head, const U& key, Compare cmp) {T* tmp = head.Root();@@ -648,7 +648,7 @@ constexpr T* RB_FIND_EXISTING_KEY(RBHead<T>& head, const U& key, Compare cmp) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_NEXT(T* elm) {if (RB_RIGHT(elm)) {elm = RB_RIGHT(elm);@@ -669,7 +669,7 @@ constexpr T* RB_NEXT(T* elm) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_PREV(T* elm) {if (RB_LEFT(elm)) {elm = RB_LEFT(elm);@@ -690,7 +690,7 @@ constexpr T* RB_PREV(T* elm) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_MIN(RBHead<T>& head) {T* tmp = head.Root();T* parent = nullptr;@@ -704,7 +704,7 @@ constexpr T* RB_MIN(RBHead<T>& head) {}template <typename T>-requires HasRBEntry<T>+ requires HasRBEntry<T>constexpr T* RB_MAX(RBHead<T>& head) {T* tmp = head.Root();T* parent = nullptr;diff --git a/src/common/vector_math.h b/src/common/vector_math.hindex e62eeea2ee..0e2095c455 100644--- a/src/common/vector_math.h+++ b/src/common/vector_math.h@@ -348,9 +348,7 @@ public:// _DEFINE_SWIZZLER2 defines a single such function, DEFINE_SWIZZLER2 defines all of them for all// component names (x<->r) and permutations (xy<->yx)#define _DEFINE_SWIZZLER2(a, b, name) \- [[nodiscard]] constexpr Vec2<T> name() const { \- return Vec2<T>(a, b); \- }+ [[nodiscard]] constexpr Vec2<T> name() const { return Vec2<T>(a, b); }#define DEFINE_SWIZZLER2(a, b, a2, b2, a3, b3, a4, b4) \_DEFINE_SWIZZLER2(a, b, a##b); \_DEFINE_SWIZZLER2(a, b, a2##b2); \@@ -543,9 +541,7 @@ public:// DEFINE_SWIZZLER2_COMP2 defines two component functions for all component names (x<->r) and// permutations (xy<->yx)#define _DEFINE_SWIZZLER2(a, b, name) \- [[nodiscard]] constexpr Vec2<T> name() const { \- return Vec2<T>(a, b); \- }+ [[nodiscard]] constexpr Vec2<T> name() const { return Vec2<T>(a, b); }#define DEFINE_SWIZZLER2_COMP1(a, a2) \_DEFINE_SWIZZLER2(a, a, a##a); \_DEFINE_SWIZZLER2(a, a, a2##a2)@@ -570,9 +566,7 @@ public:#undef _DEFINE_SWIZZLER2#define _DEFINE_SWIZZLER3(a, b, c, name) \- [[nodiscard]] constexpr Vec3<T> name() const { \- return Vec3<T>(a, b, c); \- }+ [[nodiscard]] constexpr Vec3<T> name() const { return Vec3<T>(a, b, c); }#define DEFINE_SWIZZLER3_COMP1(a, a2) \_DEFINE_SWIZZLER3(a, a, a, a##a##a); \_DEFINE_SWIZZLER3(a, a, a, a2##a2##a2)@@ -641,8 +635,8 @@ template <typename T>// linear interpolation via float: 0.0=begin, 1.0=endtemplate <typename X>-[[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{})- Lerp(const X& begin, const X& end, const float t) {+[[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) Lerp(const X& begin, const X& end,+ const float t) {return begin * (1.f - t) + end * t;}diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.hindex 2827763d5f..e8118c2b8e 100644--- a/src/core/hle/kernel/k_auto_object.h+++ b/src/core/hle/kernel/k_auto_object.h@@ -24,9 +24,7 @@ private:friend class ::Kernel::KClassTokenGenerator; \static constexpr inline auto ObjectType = ::Kernel::KClassTokenGenerator::ObjectType::CLASS; \static constexpr inline const char* const TypeName = #CLASS; \- static constexpr inline ClassTokenType ClassToken() { \- return ::Kernel::ClassToken<CLASS>; \- } \+ static constexpr inline ClassTokenType ClassToken() { return ::Kernel::ClassToken<CLASS>; } \\public: \YUZU_NON_COPYABLE(CLASS); \@@ -37,15 +35,9 @@ public:constexpr ClassTokenType Token = ClassToken(); \return TypeObj(TypeName, Token); \} \- static constexpr const char* GetStaticTypeName() { \- return TypeName; \- } \- virtual TypeObj GetTypeObj() ATTRIBUTE { \- return GetStaticTypeObj(); \- } \- virtual const char* GetTypeName() ATTRIBUTE { \- return GetStaticTypeName(); \- } \+ static constexpr const char* GetStaticTypeName() { return TypeName; } \+ virtual TypeObj GetTypeObj() ATTRIBUTE { return GetStaticTypeObj(); } \+ virtual const char* GetTypeName() ATTRIBUTE { return GetStaticTypeName(); } \\private: \constexpr bool operator!=(const TypeObj& rhs)@@ -245,8 +237,8 @@ public:}template <typename U>- requires(std::derived_from<T, U> ||- std::derived_from<U, T>) constexpr KScopedAutoObject(KScopedAutoObject<U>&& rhs) {+ requires(std::derived_from<T, U> || std::derived_from<U, T>)+ constexpr KScopedAutoObject(KScopedAutoObject<U>&& rhs) {if constexpr (std::derived_from<U, T>) {// Upcast.m_obj = rhs.m_obj;diff --git a/src/core/hle/kernel/k_priority_queue.h b/src/core/hle/kernel/k_priority_queue.hindex cb2512b0b0..645c5b531e 100644--- a/src/core/hle/kernel/k_priority_queue.h+++ b/src/core/hle/kernel/k_priority_queue.h@@ -17,35 +17,41 @@ namespace Kernel {class KThread;template <typename T>-concept KPriorityQueueAffinityMask = !std::is_reference_v<T> && requires(T & t) {- { t.GetAffinityMask() } -> Common::ConvertibleTo<u64>;- {t.SetAffinityMask(0)};+concept KPriorityQueueAffinityMask = !+std::is_reference_v<T>&& requires(T& t) {+ { t.GetAffinityMask() } -> Common::ConvertibleTo<u64>;+ { t.SetAffinityMask(0) };- { t.GetAffinity(0) } -> std::same_as<bool>;- {t.SetAffinity(0, false)};- {t.SetAll()};-};+ { t.GetAffinity(0) } -> std::same_as<bool>;+ { t.SetAffinity(0, false) };+ { t.SetAll() };+ };template <typename T>-concept KPriorityQueueMember = !std::is_reference_v<T> && requires(T & t) {- {typename T::QueueEntry()};- {(typename T::QueueEntry()).Initialize()};- {(typename T::QueueEntry()).SetPrev(std::addressof(t))};- {(typename T::QueueEntry()).SetNext(std::addressof(t))};- { (typename T::QueueEntry()).GetNext() } -> std::same_as<T*>;- { (typename T::QueueEntry()).GetPrev() } -> std::same_as<T*>;- { t.GetPriorityQueueEntry(0) } -> std::same_as<typename T::QueueEntry&>;-- {t.GetAffinityMask()};- { std::remove_cvref_t<decltype(t.GetAffinityMask())>() } -> KPriorityQueueAffinityMask;-- { t.GetActiveCore() } -> Common::ConvertibleTo<s32>;- { t.GetPriority() } -> Common::ConvertibleTo<s32>;- { t.IsDummyThread() } -> Common::ConvertibleTo<bool>;-};+concept KPriorityQueueMember = !+std::is_reference_v<T>&& requires(T& t) {+ { typename T::QueueEntry() };+ { (typename T::QueueEntry()).Initialize() };+ { (typename T::QueueEntry()).SetPrev(std::addressof(t)) };+ { (typename T::QueueEntry()).SetNext(std::addressof(t)) };+ { (typename T::QueueEntry()).GetNext() } -> std::same_as<T*>;+ { (typename T::QueueEntry()).GetPrev() } -> std::same_as<T*>;+ {+ t.GetPriorityQueueEntry(0)+ } -> std::same_as<typename T::QueueEntry&>;++ { t.GetAffinityMask() };+ {+ std::remove_cvref_t<decltype(t.GetAffinityMask())>()+ } -> KPriorityQueueAffinityMask;++ { t.GetActiveCore() } -> Common::ConvertibleTo<s32>;+ { t.GetPriority() } -> Common::ConvertibleTo<s32>;+ { t.IsDummyThread() } -> Common::ConvertibleTo<bool>;+ };template <typename Member, size_t NumCores_, int LowestPriority, int HighestPriority>-requires KPriorityQueueMember<Member>+ requires KPriorityQueueMember<Member>class KPriorityQueue {public:using AffinityMaskType = std::remove_cv_t<diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/core/hle/kernel/k_scoped_lock.hindex 857e211565..59b3e32aed 100644--- a/src/core/hle/kernel/k_scoped_lock.h+++ b/src/core/hle/kernel/k_scoped_lock.h@@ -9,13 +9,14 @@namespace Kernel {template <typename T>-concept KLockable = !std::is_reference_v<T> && requires(T & t) {- { t.Lock() } -> std::same_as<void>;- { t.Unlock() } -> std::same_as<void>;-};+concept KLockable = !+std::is_reference_v<T>&& requires(T& t) {+ { t.Lock() } -> std::same_as<void>;+ { t.Unlock() } -> std::same_as<void>;+ };template <typename T>-requires KLockable<T>+ requires KLockable<T>class [[nodiscard]] KScopedLock {public:explicit KScopedLock(T* l) : lock_ptr(l) {diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.hindex 9d771de0e6..8b8dc51be2 100644--- a/src/core/hle/kernel/k_thread.h+++ b/src/core/hle/kernel/k_thread.h@@ -677,7 +677,7 @@ private:union SyncObjectBuffer {std::array<KSynchronizationObject*, Svc::ArgumentHandleCountMax> sync_objects{};std::array<Handle,- Svc::ArgumentHandleCountMax*(sizeof(KSynchronizationObject*) / sizeof(Handle))>+ Svc::ArgumentHandleCountMax * (sizeof(KSynchronizationObject*) / sizeof(Handle))>handles;constexpr SyncObjectBuffer() {}};@@ -698,10 +698,8 @@ private:};template <typename T>- requires(- std::same_as<T, KThread> ||- std::same_as<T, RedBlackKeyType>) static constexpr int Compare(const T& lhs,- const KThread& rhs) {+ requires(std::same_as<T, KThread> || std::same_as<T, RedBlackKeyType>)+ static constexpr int Compare(const T& lhs, const KThread& rhs) {const u64 l_key = lhs.GetConditionVariableKey();const u64 r_key = rhs.GetConditionVariableKey();diff --git a/src/core/hle/kernel/k_thread_local_page.h b/src/core/hle/kernel/k_thread_local_page.hindex fe0cff084b..71254eb556 100644--- a/src/core/hle/kernel/k_thread_local_page.h+++ b/src/core/hle/kernel/k_thread_local_page.h@@ -70,10 +70,8 @@ public:}template <typename T>- requires(std::same_as<T, KThreadLocalPage> ||- std::same_as<T, RedBlackKeyType>) static constexpr int Compare(const T& lhs,- const KThreadLocalPage&- rhs) {+ requires(std::same_as<T, KThreadLocalPage> || std::same_as<T, RedBlackKeyType>)+ static constexpr int Compare(const T& lhs, const KThreadLocalPage& rhs) {const VAddr lval = GetRedBlackKey(lhs);const VAddr rval = GetRedBlackKey(rhs);diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.h b/src/input_common/helpers/joycon_protocol/common_protocol.hindex 75d3f20a46..188f6ecfa6 100644--- a/src/input_common/helpers/joycon_protocol/common_protocol.h+++ b/src/input_common/helpers/joycon_protocol/common_protocol.h@@ -107,8 +107,8 @@ public:* @returns output object containing the responce*/template <typename Output>- requires std::is_trivially_copyable_v<Output> DriverResult ReadSPI(SpiAddress addr,- Output& output) {+ requires std::is_trivially_copyable_v<Output>+ DriverResult ReadSPI(SpiAddress addr, Output& output) {std::array<u8, sizeof(Output)> buffer;output = {};diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.h b/src/shader_recompiler/frontend/ir/ir_emitter.hindex df158c928c..f3c81dbe17 100644--- a/src/shader_recompiler/frontend/ir/ir_emitter.h+++ b/src/shader_recompiler/frontend/ir/ir_emitter.h@@ -409,7 +409,8 @@ private:}template <typename T>- requires(sizeof(T) <= sizeof(u32) && std::is_trivially_copyable_v<T>) struct Flags {+ requires(sizeof(T) <= sizeof(u32) && std::is_trivially_copyable_v<T>)+ struct Flags {Flags() = default;Flags(T proxy_) : proxy{proxy_} {}diff --git a/src/shader_recompiler/frontend/ir/value.h b/src/shader_recompiler/frontend/ir/value.hindex 883dfa24e5..22e89dd1b1 100644--- a/src/shader_recompiler/frontend/ir/value.h+++ b/src/shader_recompiler/frontend/ir/value.h@@ -101,9 +101,8 @@ public:TypedValue() = default;template <IR::Type other_type>- requires((other_type & type_) != IR::Type::Void) explicit(false)- TypedValue(const TypedValue<other_type>& value)- : Value(value) {}+ requires((other_type & type_) != IR::Type::Void)+ explicit(false) TypedValue(const TypedValue<other_type>& value) : Value(value) {}explicit TypedValue(const Value& value) : Value(value) {if ((value.Type() & type_) == IR::Type::Void) {@@ -194,16 +193,16 @@ public:void ReplaceOpcode(IR::Opcode opcode);template <typename FlagsType>- requires(sizeof(FlagsType) <= sizeof(u32) && std::is_trivially_copyable_v<FlagsType>)- [[nodiscard]] FlagsType Flags() const noexcept {+ requires(sizeof(FlagsType) <= sizeof(u32) && std::is_trivially_copyable_v<FlagsType>)+ [[nodiscard]] FlagsType Flags() const noexcept {FlagsType ret;std::memcpy(reinterpret_cast<char*>(&ret), &flags, sizeof(ret));return ret;}template <typename FlagsType>- requires(sizeof(FlagsType) <= sizeof(u32) &&- std::is_trivially_copyable_v<FlagsType>) void SetFlags(FlagsType value) noexcept {+ requires(sizeof(FlagsType) <= sizeof(u32) && std::is_trivially_copyable_v<FlagsType>)+ void SetFlags(FlagsType value) noexcept {std::memcpy(&flags, &value, sizeof(value));}diff --git a/src/shader_recompiler/object_pool.h b/src/shader_recompiler/object_pool.hindex 2b42c4ba2a..5d648b1592 100644--- a/src/shader_recompiler/object_pool.h+++ b/src/shader_recompiler/object_pool.h@@ -10,7 +10,7 @@namespace Shader {template <typename T>-requires std::is_destructible_v<T>+ requires std::is_destructible_v<T>class ObjectPool {public:explicit ObjectPool(size_t chunk_size = 8192) : new_chunk_size{chunk_size} {@@ -18,7 +18,7 @@ public:}template <typename... Args>- requires std::is_constructible_v<T, Args...>+ requires std::is_constructible_v<T, Args...>[[nodiscard]] T* Create(Args&&... args) {return std::construct_at(Memory(), std::forward<Args>(args)...);}diff --git a/src/video_core/texture_cache/descriptor_table.h b/src/video_core/texture_cache/descriptor_table.hindex ee4240288b..1bad83fb4a 100644--- a/src/video_core/texture_cache/descriptor_table.h+++ b/src/video_core/texture_cache/descriptor_table.h@@ -19,9 +19,7 @@ public:explicit DescriptorTable(Tegra::MemoryManager& gpu_memory_) : gpu_memory{gpu_memory_} {}[[nodiscard]] bool Synchronize(GPUVAddr gpu_addr, u32 limit) {- [[likely]] if (current_gpu_addr == gpu_addr && current_limit == limit) {- return false;- }+ [[likely]] if (current_gpu_addr == gpu_addr && current_limit == limit) { return false; }Refresh(gpu_addr, limit);return true;}diff --git a/src/video_core/texture_cache/slot_vector.h b/src/video_core/texture_cache/slot_vector.hindex 1e2aad76a8..9df6a29039 100644--- a/src/video_core/texture_cache/slot_vector.h+++ b/src/video_core/texture_cache/slot_vector.h@@ -29,7 +29,7 @@ struct SlotId {};template <class T>-requires std::is_nothrow_move_assignable_v<T> && std::is_nothrow_move_constructible_v<T>+ requires std::is_nothrow_move_assignable_v<T> && std::is_nothrow_move_constructible_v<T>class SlotVector {public:class Iterator {