use a little more c++20/23 features

This commit is contained in:
irisz64
2025-07-22 16:07:00 +02:00
parent a5bb2c8b0a
commit f7ec6df924
5 changed files with 97 additions and 85 deletions

View File

@@ -2,101 +2,121 @@
#include <common.hpp>
#include <cstring>
#include <functional>
#include <byteswap.hpp>
#include <bit>
#include <algorithm>
#include <vector>
#include <concepts>
namespace Util {
template <typename T>
static FORCE_INLINE std::vector<u8> IntegralToBuffer(const T &val) {
static FORCE_INLINE std::vector<u8> IntegralToBuffer(const std::integral auto &val) {
std::vector<u8> ret{};
ret.resize(sizeof(T));
ret.resize(sizeof(val));
memcpy(ret.data(), &val, sizeof(T));
memcpy(ret.data(), &val, sizeof(val));
return ret;
}
template <typename T>
static constexpr FORCE_INLINE T ReadAccess(const u8 *data, const u32 index);
template <typename T>
static constexpr FORCE_INLINE T ReadAccess(const std::vector<u8> &data, const u32 index);
template <typename T, size_t Size>
static constexpr FORCE_INLINE T ReadAccess(const std::array<u8, Size> &data, const u32 index);
template <typename T>
static constexpr FORCE_INLINE void WriteAccess(u8 *data, const u32 index, const T val);
template <typename T>
static constexpr FORCE_INLINE void WriteAccess(std::vector<u8> &data, const u32 index, const T val);
template <typename T, size_t Size>
static constexpr FORCE_INLINE void WriteAccess(std::array<u8, Size> &data, const u32 index, const T val);
template <>
constexpr FORCE_INLINE u64 ReadAccess(const u8 *data, const u32 index) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const auto& result = static_cast<u64>(hi) << 32 | static_cast<u64>(lo);
return result;
}
template <typename T>
static constexpr FORCE_INLINE T ReadAccess(const u8 *data, const u32 index) {
if constexpr (sizeof(T) == 8) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const T result = static_cast<T>(hi) << 32 | static_cast<T>(lo);
return result;
} else {
return *reinterpret_cast<const T *>(&data[index]);
}
return *reinterpret_cast<const T *>(&data[index]);
}
template <>
constexpr FORCE_INLINE u64 ReadAccess(const std::vector<u8> &data, const u32 index) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const u64& result = (static_cast<u64>(hi) << 32) | static_cast<u64>(lo);
return result;
}
template <typename T>
static constexpr FORCE_INLINE T ReadAccess(const std::vector<u8> &data, const u32 index) {
if constexpr (sizeof(T) == 8) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const T result = (static_cast<T>(hi) << 32) | static_cast<T>(lo);
return result;
} else {
return *reinterpret_cast<const T *>(&data[index]);
}
return *reinterpret_cast<const T *>(&data[index]);
}
template <size_t Size>
constexpr FORCE_INLINE u64 ReadAccess(const std::array<u8, Size> &data, const u32 index) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const u64& result = static_cast<u64>(hi) << 32 | static_cast<u64>(lo);
return result;
}
template <typename T, size_t Size>
static constexpr FORCE_INLINE T ReadAccess(const std::array<u8, Size> &data, const u32 index) {
if constexpr (sizeof(T) == 8) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const T result = static_cast<T>(hi) << 32 | static_cast<T>(lo);
return result;
} else {
return *reinterpret_cast<const T *>(&data[index]);
}
return *reinterpret_cast<const T *>(&data[index]);
}
template <size_t Size>
constexpr FORCE_INLINE void WriteAccess(std::array<u8, Size> &data, const u32 index, const u64& val) {
const u32 hi = val >> 32;
const u32 lo = val;
*reinterpret_cast<u32 *>(&data[index + 0]) = hi;
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
}
template <typename T, size_t Size>
static constexpr FORCE_INLINE void WriteAccess(std::array<u8, Size> &data, const u32 index, const T val) {
if constexpr (sizeof(T) == 8) {
const u32 hi = val >> 32;
const u32 lo = val;
*reinterpret_cast<T *>(&data[index]) = val;
}
*reinterpret_cast<u32 *>(&data[index + 0]) = hi;
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
} else {
*reinterpret_cast<T *>(&data[index]) = val;
}
template <>
constexpr FORCE_INLINE void WriteAccess(std::vector<u8> &data, const u32 index, const u64 val) {
const u32 hi = val >> 32;
const u32 lo = val;
*reinterpret_cast<u32 *>(&data[index + 0]) = hi;
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
}
template <typename T>
static constexpr FORCE_INLINE void WriteAccess(std::vector<u8> &data, const u32 index, const T val) {
if constexpr (sizeof(T) == 8) {
const u32 hi = val >> 32;
const u32 lo = val;
*reinterpret_cast<T *>(&data[index]) = val;
}
*reinterpret_cast<u32 *>(&data[index + 0]) = hi;
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
} else {
*reinterpret_cast<T *>(&data[index]) = val;
}
template <>
constexpr FORCE_INLINE void WriteAccess(u8 *data, const u32 index, const u64 val) {
const u32 hi = val >> 32;
const u32 lo = val;
*reinterpret_cast<u32 *>(&data[index + 0]) = hi;
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
}
template <typename T>
static constexpr FORCE_INLINE void WriteAccess(u8 *data, const u32 index, const T val) {
if constexpr (sizeof(T) == 8) {
const u32 hi = val >> 32;
const u32 lo = val;
*reinterpret_cast<u32 *>(&data[index + 0]) = hi;
*reinterpret_cast<u32 *>(&data[index + 4]) = lo;
} else {
*reinterpret_cast<T *>(&data[index]) = val;
}
*reinterpret_cast<T *>(&data[index]) = val;
}
template <typename T>
static constexpr FORCE_INLINE void SwapBuffer(std::vector<u8> &data) {
for (size_t i = 0; i < data.size(); i += sizeof(T)) {
const T original = *reinterpret_cast<T *>(&data[i]);
*reinterpret_cast<T *>(&data[i]) = bswap(original);
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
}
}
@@ -104,7 +124,7 @@ template <typename T, size_t Size>
static constexpr FORCE_INLINE void SwapBuffer(std::array<u8, Size> &data) {
for (size_t i = 0; i < data.size(); i += sizeof(T)) {
const T original = *reinterpret_cast<T *>(&data[i]);
*reinterpret_cast<T *>(&data[i]) = bswap(original);
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
}
}

View File

@@ -1,8 +0,0 @@
#pragma once
#include <common.hpp>
#include <bit>
template <class T>
static constexpr T bswap(const T x) {
return std::byteswap<T>(x);
}