mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

serialization.hpp: Fixes

Browse Source
This commit is contained in:
Eladash 2021-06-10 18:34:35 +03:00 committed by Ivan
parent 696be6aacd
commit 0628a5d931
7 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpcs3/Emu/Memory/vm_ptr.h
View File

@ -29,6 +29,8 @@ namespace vm
using type = T;
using addr_type = std::remove_cv_t<AT>;
static constexpr bool enable_bitcopy = true;
_ptr_base() = default;
_ptr_base(vm::addr_t addr)
@ -226,6 +228,7 @@ namespace vm
public:
using addr_type = std::remove_cv_t<AT>;
static constexpr bool enable_bitcopy = true;
_ptr_base() = default;

4
rpcs3/Emu/Memory/vm_var.h
View File

@ -46,6 +46,8 @@ namespace vm
_var_base& operator=(const _var_base&) = delete;
static constexpr bool enable_bitcopy = false;
_var_base()
: pointer(A::alloc(sizeof(T), alignof(T)))
{
@ -79,6 +81,8 @@ namespace vm
_var_base& operator=(const _var_base&) = delete;
static constexpr bool enable_bitcopy = false;
_var_base(u32 count)
: pointer(A::alloc(u32{sizeof(T)} * count, alignof(T)))
, m_size(u32{sizeof(T)} * count)

1
rpcs3/util/atomic.hpp
View File

@ -1112,6 +1112,7 @@ protected:
public:
static constexpr usz align = Align;
static constexpr bool enable_bitcopy = true;
atomic_t() noexcept = default;

2
rpcs3/util/endian.hpp
View File

@ -180,6 +180,8 @@ namespace stx
using under = decltype(int_or_enum());
public:
static constexpr bool enable_bitcopy = true;
se_t() noexcept = default;
constexpr se_t(type value) noexcept

101
rpcs3/util/serialization.hpp
View File

@ -33,7 +33,7 @@ namespace utils
};
template <typename T>
concept Bitcopy = (std::is_arithmetic_v<T>) || (std::is_enum_v<T>) || requires (T& obj)
concept Bitcopy = (std::is_arithmetic_v<T>) || (std::is_enum_v<T>) || Integral<T> || requires (T& obj)
{
std::enable_if_t<static_cast<bool>(std::remove_cv_t<T>::enable_bitcopy)>();
};
@ -82,6 +82,49 @@ namespace utils
return true;
}
template <typename T> requires Integral<T>
bool serialize_vle(T&& value)
{
for (auto i = value;;)
{
const auto i_old = std::exchange(i, i >> 7);
const u8 to_write = static_cast<u8>((static_cast<u8>(i_old) % 0x80) | (i ? 0x80 : 0));
raw_serialize(&to_write, 1);
if (!i)
{
break;
}
}
return true;
}
template <typename T> requires Integral<T>
bool deserialize_vle(T& value)
{
value = {};
for (u32 i = 0;; i += 7)
{
u8 byte_data = 0;
if (!raw_serialize(&byte_data, 1))
{
return false;
}
value |= static_cast<T>(byte_data % 0x80) << i;
if (!(byte_data & 0x80))
{
break;
}
}
return true;
}
// (De)serialization function
template <typename T>
bool serialize(T& obj)
@ -103,13 +146,7 @@ namespace utils
{
if (is_writing())
{
for (usz i = obj.size();;)
{
const usz i_old = std::exchange(i, i >> 7);
operator()<u8>(static_cast<u8>(i_old % 0x80) | (u8{!!i} << 7));
if (!i)
break;
}
serialize_vle(obj.size());
if constexpr (Bitcopy<typename std::remove_reference_t<T>::value_type>)
{
@ -132,22 +169,9 @@ namespace utils
obj.clear();
usz size = 0;
for (u32 i = 0;; i += 7)
if (!deserialize_vle(size))
{
u8 byte_data = 0;
if (!raw_serialize(&byte_data, 1))
{
return false;
}
size |= static_cast<usz>(byte_data % 0x80) << i;
if (!(byte_data >> 7))
{
break;
}
return false;
}
obj.resize(size);
@ -175,7 +199,7 @@ namespace utils
return true;
}
// C-array, std::array, std::span
// C-array, std::array, std::span (span must be supplied with size and address, this function does not modify it)
template <typename T> requires FastRandomAccess<T> && (!ListAlike<T>) && (!Bitcopy<T>)
bool serialize(T& obj)
{
@ -203,13 +227,7 @@ namespace utils
{
if (is_writing())
{
for (usz i = obj.size();;)
{
const usz i_old = std::exchange(i, i >> 7);
operator()<u8>(static_cast<u8>(i_old % 0x80) | (u8{!!i} << 7));
if (!i)
break;
}
serialize_vle(obj.size());
for (auto&& value : obj)
{
@ -225,22 +243,9 @@ namespace utils
obj.clear();
usz size = 0;
for (u32 i = 0;; i += 7)
if (!deserialize_vle(size))
{
u8 byte_data = 0;
if (!raw_serialize(&byte_data, 1))
{
return false;
}
size |= static_cast<usz>(byte_data % 0x80) << i;
if (!(byte_data >> 7))
{
break;
}
return false;
}
if constexpr (Reservable<T>)
@ -290,7 +295,7 @@ namespace utils
bool operator()(Args&&... args)
{
return ((AUDIT(!std::is_const_v<std::remove_reference_t<Args>> || is_writing())
, serialize(const_cast<Args&>(static_cast<const Args&>(args)))), ...);
, serialize(const_cast<std::remove_cvref_t<Args>&>(static_cast<const Args&>(args)))), ...);
}
// Convert serialization manager to deserializion manager (can't go the other way)
@ -305,7 +310,7 @@ namespace utils
pos = 0;
}
template <typename T> requires (std::is_constructible_v<std::remove_const_t<T>> || Bitcopy<std::remove_const_t<T>> ||
template <typename T> requires (std::is_copy_constructible_v<std::remove_const_t<T>>) && (std::is_constructible_v<std::remove_const_t<T>> || Bitcopy<std::remove_const_t<T>> ||
std::is_constructible_v<std::remove_const_t<T>, stx::exact_t<serial&>> || TupleAlike<std::remove_const_t<T>>)
operator T()
{

3
rpcs3/util/types.hpp
View File

@ -520,6 +520,9 @@ concept SignedInt = (std::is_signed_v<std::common_type_t<T>> && std::is_integral
template <typename T>
concept FPInt = std::is_floating_point_v<std::common_type_t<T>> || std::is_same_v<std::common_type_t<T>, f16>;
template <typename T>
concept Integral = std::is_integral_v<std::common_type_t<T>> || std::is_same_v<std::common_type_t<T>, u128> || std::is_same_v<std::common_type_t<T>, s128>;
template <typename T>
constexpr T min_v;

2
rpcs3/util/v128.hpp
View File

@ -92,6 +92,8 @@ union alignas(16) v128
__m128d vd;
#endif
static constexpr bool enable_bitcopy = true;
static v128 from64(u64 _0, u64 _1 = 0)
{
v128 ret;