diff --git a/include/panda_qt/cpu_debugger.hpp b/include/panda_qt/cpu_debugger.hpp index 9c710ead..de04d22e 100644 --- a/include/panda_qt/cpu_debugger.hpp +++ b/include/panda_qt/cpu_debugger.hpp @@ -1,5 +1,4 @@ #pragma once - #include #include #include diff --git a/include/panda_qt/dsp_debugger.hpp b/include/panda_qt/dsp_debugger.hpp index 277fb199..e0067690 100644 --- a/include/panda_qt/dsp_debugger.hpp +++ b/include/panda_qt/dsp_debugger.hpp @@ -1,5 +1,4 @@ #pragma once - #include #include #include diff --git a/include/panda_qt/elided_label.hpp b/include/panda_qt/elided_label.hpp index 1dc3e88a..9d937f9b 100644 --- a/include/panda_qt/elided_label.hpp +++ b/include/panda_qt/elided_label.hpp @@ -1,5 +1,4 @@ #pragma once - #include #include #include diff --git a/include/sdl_sensors.hpp b/include/sdl_sensors.hpp index 7e498afc..db982cec 100644 --- a/include/sdl_sensors.hpp +++ b/include/sdl_sensors.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include "helpers.hpp" diff --git a/include/swap.hpp b/include/swap.hpp index b7db9226..c0910f08 100644 --- a/include/swap.hpp +++ b/include/swap.hpp @@ -23,6 +23,7 @@ #include #endif #include + #include "helpers.hpp" // GCC @@ -57,15 +58,9 @@ namespace Common { #ifdef _MSC_VER -[[nodiscard]] inline u16 swap16(u16 data) noexcept { - return _byteswap_ushort(data); -} -[[nodiscard]] inline u32 swap32(u32 data) noexcept { - return _byteswap_ulong(data); -} -[[nodiscard]] inline u64 swap64(u64 data) noexcept { - return _byteswap_uint64(data); -} + [[nodiscard]] inline u16 swap16(u16 data) noexcept { return _byteswap_ushort(data); } + [[nodiscard]] inline u32 swap32(u32 data) noexcept { return _byteswap_ulong(data); } + [[nodiscard]] inline u64 swap64(u64 data) noexcept { return _byteswap_uint64(data); } #elif defined(__clang__) || defined(__GNUC__) #if defined(__Bitrig__) || defined(__OpenBSD__) // redefine swap16, swap32, swap64 as inline functions @@ -73,523 +68,441 @@ namespace Common { #undef swap32 #undef swap64 #endif -[[nodiscard]] inline u16 swap16(u16 data) noexcept { - return __builtin_bswap16(data); -} -[[nodiscard]] inline u32 swap32(u32 data) noexcept { - return __builtin_bswap32(data); -} -[[nodiscard]] inline u64 swap64(u64 data) noexcept { - return __builtin_bswap64(data); -} + [[nodiscard]] inline u16 swap16(u16 data) noexcept { return __builtin_bswap16(data); } + [[nodiscard]] inline u32 swap32(u32 data) noexcept { return __builtin_bswap32(data); } + [[nodiscard]] inline u64 swap64(u64 data) noexcept { return __builtin_bswap64(data); } #else -// Generic implementation. -[[nodiscard]] inline u16 swap16(u16 data) noexcept { - return (data >> 8) | (data << 8); -} -[[nodiscard]] inline u32 swap32(u32 data) noexcept { - return ((data & 0xFF000000U) >> 24) | ((data & 0x00FF0000U) >> 8) | - ((data & 0x0000FF00U) << 8) | ((data & 0x000000FFU) << 24); -} -[[nodiscard]] inline u64 swap64(u64 data) noexcept { - return ((data & 0xFF00000000000000ULL) >> 56) | ((data & 0x00FF000000000000ULL) >> 40) | - ((data & 0x0000FF0000000000ULL) >> 24) | ((data & 0x000000FF00000000ULL) >> 8) | - ((data & 0x00000000FF000000ULL) << 8) | ((data & 0x0000000000FF0000ULL) << 24) | - ((data & 0x000000000000FF00ULL) << 40) | ((data & 0x00000000000000FFULL) << 56); -} + // Generic implementation. + [[nodiscard]] inline u16 swap16(u16 data) noexcept { return (data >> 8) | (data << 8); } + [[nodiscard]] inline u32 swap32(u32 data) noexcept { + return ((data & 0xFF000000U) >> 24) | ((data & 0x00FF0000U) >> 8) | ((data & 0x0000FF00U) << 8) | ((data & 0x000000FFU) << 24); + } + [[nodiscard]] inline u64 swap64(u64 data) noexcept { + return ((data & 0xFF00000000000000ULL) >> 56) | ((data & 0x00FF000000000000ULL) >> 40) | ((data & 0x0000FF0000000000ULL) >> 24) | + ((data & 0x000000FF00000000ULL) >> 8) | ((data & 0x00000000FF000000ULL) << 8) | ((data & 0x0000000000FF0000ULL) << 24) | + ((data & 0x000000000000FF00ULL) << 40) | ((data & 0x00000000000000FFULL) << 56); + } #endif -[[nodiscard]] inline float swapf(float f) noexcept { - static_assert(sizeof(u32) == sizeof(float), "float must be the same size as uint32_t."); + [[nodiscard]] inline float swapf(float f) noexcept { + static_assert(sizeof(u32) == sizeof(float), "float must be the same size as uint32_t."); - u32 value; - std::memcpy(&value, &f, sizeof(u32)); + u32 value; + std::memcpy(&value, &f, sizeof(u32)); - value = swap32(value); - std::memcpy(&f, &value, sizeof(u32)); + value = swap32(value); + std::memcpy(&f, &value, sizeof(u32)); - return f; -} + return f; + } -[[nodiscard]] inline double swapd(double f) noexcept { - static_assert(sizeof(u64) == sizeof(double), "double must be the same size as uint64_t."); + [[nodiscard]] inline double swapd(double f) noexcept { + static_assert(sizeof(u64) == sizeof(double), "double must be the same size as uint64_t."); - u64 value; - std::memcpy(&value, &f, sizeof(u64)); + u64 value; + std::memcpy(&value, &f, sizeof(u64)); - value = swap64(value); - std::memcpy(&f, &value, sizeof(u64)); + value = swap64(value); + std::memcpy(&f, &value, sizeof(u64)); - return f; -} + return f; + } -} // Namespace Common +} // Namespace Common template struct swap_struct_t { - using swapped_t = swap_struct_t; + using swapped_t = swap_struct_t; -protected: - T value; + protected: + T value; - static T swap(T v) { - return F::swap(v); - } + static T swap(T v) { return F::swap(v); } -public: - T swap() const { - return swap(value); - } - swap_struct_t() = default; - swap_struct_t(const T& v) : value(swap(v)) {} + public: + T swap() const { return swap(value); } + swap_struct_t() = default; + swap_struct_t(const T& v) : value(swap(v)) {} - template - swapped_t& operator=(const S& source) { - value = swap(static_cast(source)); - return *this; - } + template + swapped_t& operator=(const S& source) { + value = swap(static_cast(source)); + return *this; + } - operator s8() const { - return static_cast(swap()); - } - operator u8() const { - return static_cast(swap()); - } - operator s16() const { - return static_cast(swap()); - } - operator u16() const { - return static_cast(swap()); - } - operator s32() const { - return static_cast(swap()); - } - operator u32() const { - return static_cast(swap()); - } - operator s64() const { - return static_cast(swap()); - } - operator u64() const { - return static_cast(swap()); - } - operator float() const { - return static_cast(swap()); - } - operator double() const { - return static_cast(swap()); - } + operator s8() const { return static_cast(swap()); } + operator u8() const { return static_cast(swap()); } + operator s16() const { return static_cast(swap()); } + operator u16() const { return static_cast(swap()); } + operator s32() const { return static_cast(swap()); } + operator u32() const { return static_cast(swap()); } + operator s64() const { return static_cast(swap()); } + operator u64() const { return static_cast(swap()); } + operator float() const { return static_cast(swap()); } + operator double() const { return static_cast(swap()); } - // +v - swapped_t operator+() const { - return +swap(); - } - // -v - swapped_t operator-() const { - return -swap(); - } + // +v + swapped_t operator+() const { return +swap(); } + // -v + swapped_t operator-() const { return -swap(); } - // v / 5 - swapped_t operator/(const swapped_t& i) const { - return swap() / i.swap(); - } - template - swapped_t operator/(const S& i) const { - return swap() / i; - } + // v / 5 + swapped_t operator/(const swapped_t& i) const { return swap() / i.swap(); } + template + swapped_t operator/(const S& i) const { + return swap() / i; + } - // v * 5 - swapped_t operator*(const swapped_t& i) const { - return swap() * i.swap(); - } - template - swapped_t operator*(const S& i) const { - return swap() * i; - } + // v * 5 + swapped_t operator*(const swapped_t& i) const { return swap() * i.swap(); } + template + swapped_t operator*(const S& i) const { + return swap() * i; + } - // v + 5 - swapped_t operator+(const swapped_t& i) const { - return swap() + i.swap(); - } - template - swapped_t operator+(const S& i) const { - return swap() + static_cast(i); - } - // v - 5 - swapped_t operator-(const swapped_t& i) const { - return swap() - i.swap(); - } - template - swapped_t operator-(const S& i) const { - return swap() - static_cast(i); - } + // v + 5 + swapped_t operator+(const swapped_t& i) const { return swap() + i.swap(); } + template + swapped_t operator+(const S& i) const { + return swap() + static_cast(i); + } + // v - 5 + swapped_t operator-(const swapped_t& i) const { return swap() - i.swap(); } + template + swapped_t operator-(const S& i) const { + return swap() - static_cast(i); + } - // v += 5 - swapped_t& operator+=(const swapped_t& i) { - value = swap(swap() + i.swap()); - return *this; - } - template - swapped_t& operator+=(const S& i) { - value = swap(swap() + static_cast(i)); - return *this; - } - // v -= 5 - swapped_t& operator-=(const swapped_t& i) { - value = swap(swap() - i.swap()); - return *this; - } - template - swapped_t& operator-=(const S& i) { - value = swap(swap() - static_cast(i)); - return *this; - } + // v += 5 + swapped_t& operator+=(const swapped_t& i) { + value = swap(swap() + i.swap()); + return *this; + } + template + swapped_t& operator+=(const S& i) { + value = swap(swap() + static_cast(i)); + return *this; + } + // v -= 5 + swapped_t& operator-=(const swapped_t& i) { + value = swap(swap() - i.swap()); + return *this; + } + template + swapped_t& operator-=(const S& i) { + value = swap(swap() - static_cast(i)); + return *this; + } - // ++v - swapped_t& operator++() { - value = swap(swap() + 1); - return *this; - } - // --v - swapped_t& operator--() { - value = swap(swap() - 1); - return *this; - } + // ++v + swapped_t& operator++() { + value = swap(swap() + 1); + return *this; + } + // --v + swapped_t& operator--() { + value = swap(swap() - 1); + return *this; + } - // v++ - swapped_t operator++(int) { - swapped_t old = *this; - value = swap(swap() + 1); - return old; - } - // v-- - swapped_t operator--(int) { - swapped_t old = *this; - value = swap(swap() - 1); - return old; - } - // Comparaison - // v == i - bool operator==(const swapped_t& i) const { - return swap() == i.swap(); - } - template - bool operator==(const S& i) const { - return swap() == i; - } + // v++ + swapped_t operator++(int) { + swapped_t old = *this; + value = swap(swap() + 1); + return old; + } + // v-- + swapped_t operator--(int) { + swapped_t old = *this; + value = swap(swap() - 1); + return old; + } + // Comparaison + // v == i + bool operator==(const swapped_t& i) const { return swap() == i.swap(); } + template + bool operator==(const S& i) const { + return swap() == i; + } - // v != i - bool operator!=(const swapped_t& i) const { - return swap() != i.swap(); - } - template - bool operator!=(const S& i) const { - return swap() != i; - } + // v != i + bool operator!=(const swapped_t& i) const { return swap() != i.swap(); } + template + bool operator!=(const S& i) const { + return swap() != i; + } - // v > i - bool operator>(const swapped_t& i) const { - return swap() > i.swap(); - } - template - bool operator>(const S& i) const { - return swap() > i; - } + // v > i + bool operator>(const swapped_t& i) const { return swap() > i.swap(); } + template + bool operator>(const S& i) const { + return swap() > i; + } - // v < i - bool operator<(const swapped_t& i) const { - return swap() < i.swap(); - } - template - bool operator<(const S& i) const { - return swap() < i; - } + // v < i + bool operator<(const swapped_t& i) const { return swap() < i.swap(); } + template + bool operator<(const S& i) const { + return swap() < i; + } - // v >= i - bool operator>=(const swapped_t& i) const { - return swap() >= i.swap(); - } - template - bool operator>=(const S& i) const { - return swap() >= i; - } + // v >= i + bool operator>=(const swapped_t& i) const { return swap() >= i.swap(); } + template + bool operator>=(const S& i) const { + return swap() >= i; + } - // v <= i - bool operator<=(const swapped_t& i) const { - return swap() <= i.swap(); - } - template - bool operator<=(const S& i) const { - return swap() <= i; - } + // v <= i + bool operator<=(const swapped_t& i) const { return swap() <= i.swap(); } + template + bool operator<=(const S& i) const { + return swap() <= i; + } - // logical - swapped_t operator!() const { - return !swap(); - } + // logical + swapped_t operator!() const { return !swap(); } - // bitmath - swapped_t operator~() const { - return ~swap(); - } + // bitmath + swapped_t operator~() const { return ~swap(); } - swapped_t operator&(const swapped_t& b) const { - return swap() & b.swap(); - } - template - swapped_t operator&(const S& b) const { - return swap() & b; - } - swapped_t& operator&=(const swapped_t& b) { - value = swap(swap() & b.swap()); - return *this; - } - template - swapped_t& operator&=(const S b) { - value = swap(swap() & b); - return *this; - } + swapped_t operator&(const swapped_t& b) const { return swap() & b.swap(); } + template + swapped_t operator&(const S& b) const { + return swap() & b; + } + swapped_t& operator&=(const swapped_t& b) { + value = swap(swap() & b.swap()); + return *this; + } + template + swapped_t& operator&=(const S b) { + value = swap(swap() & b); + return *this; + } - swapped_t operator|(const swapped_t& b) const { - return swap() | b.swap(); - } - template - swapped_t operator|(const S& b) const { - return swap() | b; - } - swapped_t& operator|=(const swapped_t& b) { - value = swap(swap() | b.swap()); - return *this; - } - template - swapped_t& operator|=(const S& b) { - value = swap(swap() | b); - return *this; - } + swapped_t operator|(const swapped_t& b) const { return swap() | b.swap(); } + template + swapped_t operator|(const S& b) const { + return swap() | b; + } + swapped_t& operator|=(const swapped_t& b) { + value = swap(swap() | b.swap()); + return *this; + } + template + swapped_t& operator|=(const S& b) { + value = swap(swap() | b); + return *this; + } - swapped_t operator^(const swapped_t& b) const { - return swap() ^ b.swap(); - } - template - swapped_t operator^(const S& b) const { - return swap() ^ b; - } - swapped_t& operator^=(const swapped_t& b) { - value = swap(swap() ^ b.swap()); - return *this; - } - template - swapped_t& operator^=(const S& b) { - value = swap(swap() ^ b); - return *this; - } + swapped_t operator^(const swapped_t& b) const { return swap() ^ b.swap(); } + template + swapped_t operator^(const S& b) const { + return swap() ^ b; + } + swapped_t& operator^=(const swapped_t& b) { + value = swap(swap() ^ b.swap()); + return *this; + } + template + swapped_t& operator^=(const S& b) { + value = swap(swap() ^ b); + return *this; + } - template - swapped_t operator<<(const S& b) const { - return swap() << b; - } - template - swapped_t& operator<<=(const S& b) const { - value = swap(swap() << b); - return *this; - } + template + swapped_t operator<<(const S& b) const { + return swap() << b; + } + template + swapped_t& operator<<=(const S& b) const { + value = swap(swap() << b); + return *this; + } - template - swapped_t operator>>(const S& b) const { - return swap() >> b; - } - template - swapped_t& operator>>=(const S& b) const { - value = swap(swap() >> b); - return *this; - } + template + swapped_t operator>>(const S& b) const { + return swap() >> b; + } + template + swapped_t& operator>>=(const S& b) const { + value = swap(swap() >> b); + return *this; + } - // Member - /** todo **/ + // Member + /** todo **/ - // Arithmetics - template - friend S operator+(const S& p, const swapped_t v); + // Arithmetics + template + friend S operator+(const S& p, const swapped_t v); - template - friend S operator-(const S& p, const swapped_t v); + template + friend S operator-(const S& p, const swapped_t v); - template - friend S operator/(const S& p, const swapped_t v); + template + friend S operator/(const S& p, const swapped_t v); - template - friend S operator*(const S& p, const swapped_t v); + template + friend S operator*(const S& p, const swapped_t v); - template - friend S operator%(const S& p, const swapped_t v); + template + friend S operator%(const S& p, const swapped_t v); - // Arithmetics + assignments - template - friend S operator+=(const S& p, const swapped_t v); + // Arithmetics + assignments + template + friend S operator+=(const S& p, const swapped_t v); - template - friend S operator-=(const S& p, const swapped_t v); + template + friend S operator-=(const S& p, const swapped_t v); - // Bitmath - template - friend S operator&(const S& p, const swapped_t v); + // Bitmath + template + friend S operator&(const S& p, const swapped_t v); - // Comparison - template - friend bool operator<(const S& p, const swapped_t v); + // Comparison + template + friend bool operator<(const S& p, const swapped_t v); - template - friend bool operator>(const S& p, const swapped_t v); + template + friend bool operator>(const S& p, const swapped_t v); - template - friend bool operator<=(const S& p, const swapped_t v); + template + friend bool operator<=(const S& p, const swapped_t v); - template - friend bool operator>=(const S& p, const swapped_t v); + template + friend bool operator>=(const S& p, const swapped_t v); - template - friend bool operator!=(const S& p, const swapped_t v); + template + friend bool operator!=(const S& p, const swapped_t v); - template - friend bool operator==(const S& p, const swapped_t v); + template + friend bool operator==(const S& p, const swapped_t v); }; // Arithmetics template S operator+(const S& i, const swap_struct_t v) { - return i + v.swap(); + return i + v.swap(); } template S operator-(const S& i, const swap_struct_t v) { - return i - v.swap(); + return i - v.swap(); } template S operator/(const S& i, const swap_struct_t v) { - return i / v.swap(); + return i / v.swap(); } template S operator*(const S& i, const swap_struct_t v) { - return i * v.swap(); + return i * v.swap(); } template S operator%(const S& i, const swap_struct_t v) { - return i % v.swap(); + return i % v.swap(); } // Arithmetics + assignments template S& operator+=(S& i, const swap_struct_t v) { - i += v.swap(); - return i; + i += v.swap(); + return i; } template S& operator-=(S& i, const swap_struct_t v) { - i -= v.swap(); - return i; + i -= v.swap(); + return i; } // Logical template S operator&(const S& i, const swap_struct_t v) { - return i & v.swap(); + return i & v.swap(); } template S operator&(const swap_struct_t v, const S& i) { - return static_cast(v.swap() & i); + return static_cast(v.swap() & i); } // Comparaison template bool operator<(const S& p, const swap_struct_t v) { - return p < v.swap(); + return p < v.swap(); } template bool operator>(const S& p, const swap_struct_t v) { - return p > v.swap(); + return p > v.swap(); } template bool operator<=(const S& p, const swap_struct_t v) { - return p <= v.swap(); + return p <= v.swap(); } template bool operator>=(const S& p, const swap_struct_t v) { - return p >= v.swap(); + return p >= v.swap(); } template bool operator!=(const S& p, const swap_struct_t v) { - return p != v.swap(); + return p != v.swap(); } template bool operator==(const S& p, const swap_struct_t v) { - return p == v.swap(); + return p == v.swap(); } template struct swap_64_t { - static T swap(T x) { - return static_cast(Common::swap64(x)); - } + static T swap(T x) { return static_cast(Common::swap64(x)); } }; template struct swap_32_t { - static T swap(T x) { - return static_cast(Common::swap32(x)); - } + static T swap(T x) { return static_cast(Common::swap32(x)); } }; template struct swap_16_t { - static T swap(T x) { - return static_cast(Common::swap16(x)); - } + static T swap(T x) { return static_cast(Common::swap16(x)); } }; template struct swap_float_t { - static T swap(T x) { - return static_cast(Common::swapf(x)); - } + static T swap(T x) { return static_cast(Common::swapf(x)); } }; template struct swap_double_t { - static T swap(T x) { - return static_cast(Common::swapd(x)); - } + static T swap(T x) { return static_cast(Common::swapd(x)); } }; template struct swap_enum_t { - static_assert(std::is_enum_v); - using base = std::underlying_type_t; + static_assert(std::is_enum_v); + using base = std::underlying_type_t; -public: - swap_enum_t() = default; - swap_enum_t(const T& v) : value(swap(v)) {} + public: + swap_enum_t() = default; + swap_enum_t(const T& v) : value(swap(v)) {} - swap_enum_t& operator=(const T& v) { - value = swap(v); - return *this; - } + swap_enum_t& operator=(const T& v) { + value = swap(v); + return *this; + } - operator T() const { - return swap(value); - } + operator T() const { return swap(value); } - explicit operator base() const { - return static_cast(swap(value)); - } + explicit operator base() const { return static_cast(swap(value)); } -protected: - T value{}; - // clang-format off + protected: + T value{}; + // clang-format off using swap_t = std::conditional_t< std::is_same_v, swap_16_t, std::conditional_t< std::is_same_v, swap_16_t, std::conditional_t< @@ -597,14 +510,12 @@ protected: std::is_same_v, swap_32_t, std::conditional_t< std::is_same_v, swap_64_t, std::conditional_t< std::is_same_v, swap_64_t, void>>>>>>; - // clang-format on - static T swap(T x) { - return static_cast(swap_t::swap(static_cast(x))); - } + // clang-format on + static T swap(T x) { return static_cast(swap_t::swap(static_cast(x))); } }; -struct SwapTag {}; // Use the different endianness from the system -struct KeepTag {}; // Use the same endianness as the system +struct SwapTag {}; // Use the different endianness from the system +struct KeepTag {}; // Use the same endianness as the system template struct AddEndian; @@ -613,65 +524,65 @@ struct AddEndian; template struct AddEndian { - using type = T; + using type = T; }; // SwapTag specializations template <> struct AddEndian { - using type = u8; + using type = u8; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = s8; + using type = s8; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template <> struct AddEndian { - using type = swap_struct_t>; + using type = swap_struct_t>; }; template struct AddEndian { - static_assert(std::is_enum_v); - using type = swap_enum_t; + static_assert(std::is_enum_v); + using type = swap_enum_t; }; // Alias LETag/BETag as KeepTag/SwapTag depending on the system