archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

IdManager.h: Savestate fix

Browse source
This commit is contained in:
Eladash 2023-10-01 14:41:17 +03:00 • committed by Elad Ashkenazi
parent f35ca71454
commit 96d31cf64e
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/lv2/sys_net.cpp
View file

@ -266,7 +266,7 @@ lv2_socket::lv2_socket(utils::serial& ar, lv2_socket_type _type)
ar(last_bound_addr); ar(last_bound_addr);
} }
std::shared_ptr<lv2_socket> lv2_socket::load(utils::serial& ar) std::shared_ptr<void> lv2_socket::load(utils::serial& ar)
{ {
const lv2_socket_type type{ar}; const lv2_socket_type type{ar};

2
rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h
View file

@ -60,7 +60,7 @@ public:
lv2_socket(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol); lv2_socket(lv2_socket_family family, lv2_socket_type type, lv2_ip_protocol protocol);
lv2_socket(utils::serial&) {} lv2_socket(utils::serial&) {}
lv2_socket(utils::serial&, lv2_socket_type type); lv2_socket(utils::serial&, lv2_socket_type type);
static std::shared_ptr<lv2_socket> load(utils::serial& ar); static std::shared_ptr<void> load(utils::serial& ar);
void save(utils::serial&, bool save_only_this_class = false); void save(utils::serial&, bool save_only_this_class = false);
virtual ~lv2_socket() = default; virtual ~lv2_socket() = default;

9
rpcs3/Emu/IdManager.h
View file

@ -50,6 +50,9 @@ namespace id_manager
template <typename T> template <typename T>
concept IdmCompatible = requires () { T::id_base, T::id_step, T::id_count; }; concept IdmCompatible = requires () { T::id_base, T::id_step, T::id_count; };
template <typename T>
concept IdmSavable = IdmCompatible<T> && T::savestate_init_pos != 0 && (requires () { std::declval<T>().save(std::declval<stx::exact_t<utils::serial&>>()); });
// Last allocated ID for constructors // Last allocated ID for constructors
extern thread_local u32 g_id; extern thread_local u32 g_id;
@ -169,7 +172,7 @@ namespace id_manager
{ {
typeinfo info{}; typeinfo info{};
using C = std::conditional_t<IdmCompatible<T> && std::is_constructible_v<T, stx::exact_t<utils::serial&>>, T, dummy_construct>; using C = std::conditional_t<IdmSavable<T>, T, dummy_construct>;
using Type = std::conditional_t<IdmCompatible<T>, T, dummy_construct>; using Type = std::conditional_t<IdmCompatible<T>, T, dummy_construct>;
if constexpr (std::is_same_v<C, T>) if constexpr (std::is_same_v<C, T>)
@ -258,7 +261,7 @@ namespace id_manager
static constexpr double savestate_init_pos_original = T::savestate_init_pos; static constexpr double savestate_init_pos_original = T::savestate_init_pos;
static constexpr double savestate_init_pos = std::bit_cast<double>(std::bit_cast<u64>(savestate_init_pos_original) - 1); static constexpr double savestate_init_pos = std::bit_cast<double>(std::bit_cast<u64>(savestate_init_pos_original) - 1);
id_map(utils::serial& ar) noexcept requires (savestate_init_pos_original != 0 && std::is_constructible_v<T, stx::exact_t<utils::serial&>>) id_map(utils::serial& ar) noexcept requires IdmSavable<T>
{ {
vec.resize(T::id_count); vec.resize(T::id_count);
@ -298,7 +301,7 @@ namespace id_manager
} }
} }
void save(utils::serial& ar) requires (savestate_init_pos_original != 0 && std::is_constructible_v<T, stx::exact_t<utils::serial&>>) void save(utils::serial& ar) requires IdmSavable<T>
{ {
u32 obj_count = 0; u32 obj_count = 0;
usz obj_count_offs = ar.data.size(); usz obj_count_offs = ar.data.size();