mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 22:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more debug info in serial_breathe_and_tag()

Browse Source
This commit is contained in:
Eladash 2023-12-31 21:15:00 +02:00 committed by Elad Ashkenazi
parent ce5f7bd4ff
commit a4ab6126b0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpcs3/Emu/savestate_utils.cpp
View File

@ -299,6 +299,15 @@ namespace stx
extern u16 serial_breathe_and_tag(utils::serial& ar, std::string_view name, bool tag_bit) extern u16 serial_breathe_and_tag(utils::serial& ar, std::string_view name, bool tag_bit)
{ {
thread_local std::string_view s_tls_object_name = "none"; thread_local std::string_view s_tls_object_name = "none";
thread_local u64 s_tls_call_count = 1, s_tls_current_pos = 0;
if (s_tls_current_pos >= ar.pos)
{
// Reset, probably a new utils::serial object
s_tls_call_count = 1;
}
s_tls_current_pos = ar.pos;
constexpr u16 data_mask = 0x7fff; constexpr u16 data_mask = 0x7fff;
@ -311,15 +320,16 @@ namespace stx
u16 saved = tag; u16 saved = tag;
ar(saved); ar(saved);
sys_log.warning("serial_breathe_and_tag(): %s, object: '%s', next-object: '%s', expected/tag: 0x%x == 0x%x", ar, s_tls_object_name, name, tag, saved); sys_log.trace("serial_breathe_and_tag(%u): %s, object: '%s', next-object: '%s', expected/tag: 0x%x == 0x%x", s_tls_call_count, ar, s_tls_object_name, name, tag, saved);
if ((saved ^ tag) & data_mask) if ((saved ^ tag) & data_mask)
{ {
ensure(!ar.is_writing()); ensure(!ar.is_writing());
fmt::throw_exception("serial_breathe_and_tag(): %s, object: '%s', next-object: '%s', expected/tag: 0x%x != 0x%x,", ar, s_tls_object_name, name, tag, saved); fmt::throw_exception("serial_breathe_and_tag(%u): %s, object: '%s', next-object: '%s', expected/tag: 0x%x != 0x%x,", s_tls_call_count, ar, s_tls_object_name, name, tag, saved);
} }
s_tls_object_name = name; s_tls_object_name = name;
s_tls_call_count++;
ar.breathe(); ar.breathe();
return saved; return saved;
} }