ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BitUtils: Constexpr BitCastToArray, Remove BitCastFromArray 

`std::bit_cast` participates in overload resolution only if `sizeof(To) == sizeof(From)` and both `To` and `From` are *TriviallyCopyable* types, so the static assertions here can be removed. `[[nodiscard]]` was added as well.
This commit is contained in:
mitaclaw 2024-06-24 00:05:46 -07:00
parent c536754ffe
commit 6ffd71ffae
3 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Core/Common/BitUtils.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <bit>
#include <climits> #include <climits>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@ -166,50 +167,10 @@ inline auto BitCastPtr(PtrType* ptr) noexcept -> BitCastPtrType<T, PtrType>
} }
// Similar to BitCastPtr, but specifically for aliasing structs to arrays. // Similar to BitCastPtr, but specifically for aliasing structs to arrays.
template <typename ArrayType, typename T, template <typename ValueType, typename From>
typename Container = std::array<ArrayType, sizeof(T) / sizeof(ArrayType)>> [[nodiscard]] constexpr auto BitCastToArray(const From& obj) noexcept
inline auto BitCastToArray(const T& obj) noexcept -> Container
{ {
static_assert(sizeof(T) % sizeof(ArrayType) == 0, return std::bit_cast<std::array<ValueType, sizeof(From) / sizeof(ValueType)>>(obj);
"Size of array type must be a factor of size of source type.");
static_assert(std::is_trivially_copyable<T>(),
"BitCastToArray source type must be trivially copyable.");
static_assert(std::is_trivially_copyable<Container>(),
"BitCastToArray array type must be trivially copyable.");
Container result;
std::memcpy(result.data(), &obj, sizeof(T));
return result;
}
template <typename ArrayType, typename T,
typename Container = std::array<ArrayType, sizeof(T) / sizeof(ArrayType)>>
inline void BitCastFromArray(const Container& array, T& obj) noexcept
{
static_assert(sizeof(T) % sizeof(ArrayType) == 0,
"Size of array type must be a factor of size of destination type.");
static_assert(std::is_trivially_copyable<Container>(),
"BitCastFromArray array type must be trivially copyable.");
static_assert(std::is_trivially_copyable<T>(),
"BitCastFromArray destination type must be trivially copyable.");
std::memcpy(&obj, array.data(), sizeof(T));
}
template <typename ArrayType, typename T,
typename Container = std::array<ArrayType, sizeof(T) / sizeof(ArrayType)>>
inline auto BitCastFromArray(const Container& array) noexcept -> T
{
static_assert(sizeof(T) % sizeof(ArrayType) == 0,
"Size of array type must be a factor of size of destination type.");
static_assert(std::is_trivially_copyable<Container>(),
"BitCastFromArray array type must be trivially copyable.");
static_assert(std::is_trivially_copyable<T>(),
"BitCastFromArray destination type must be trivially copyable.");
T obj;
std::memcpy(&obj, array.data(), sizeof(T));
return obj;
} }
template <typename T> template <typename T>

2
Source/Core/Core/HW/DSPHLE/UCodes/AX.h
View File

@ -143,7 +143,7 @@ protected:
pb_mem[update_off] = update_val; pb_mem[update_off] = update_val;
} }
Common::BitCastFromArray<u16>(pb_mem, pb); pb = std::bit_cast<PBType>(pb_mem);
} }
virtual void HandleCommandList(); virtual void HandleCommandList();

4
Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
View File

@ -397,7 +397,7 @@ bool AXWiiUCode::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* update
// Remove the updates data from the PB // Remove the updates data from the PB
memmove(&pb_mem[41], &pb_mem[46], sizeof(pb) - 2 * 46); memmove(&pb_mem[41], &pb_mem[46], sizeof(pb) - 2 * 46);
Common::BitCastFromArray<u16>(pb_mem, pb); pb = std::bit_cast<AXPBWii>(pb_mem);
return true; return true;
} }
@ -416,7 +416,7 @@ void AXWiiUCode::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 update
pb_mem[44] = updates_addr >> 16; pb_mem[44] = updates_addr >> 16;
pb_mem[45] = updates_addr & 0xFFFF; pb_mem[45] = updates_addr & 0xFFFF;
Common::BitCastFromArray<u16>(pb_mem, pb); pb = std::bit_cast<AXPBWii>(pb_mem);
} }
void AXWiiUCode::ProcessPBList(u32 pb_addr) void AXWiiUCode::ProcessPBList(u32 pb_addr)