Log overlapping object access

This commit is contained in:
momo5502
2025-08-17 17:52:50 +02:00
parent 2192d10828
commit 0e92b04ef9
2 changed files with 72 additions and 25 deletions

View File

@@ -31,14 +31,34 @@ emulator_hook* watch_object(windows_emulator& emu, const std::set<std::string, s
}
}
const auto offset = address - object.value();
const auto start_offset = address - object.value();
const auto end_offset = start_offset + size;
const auto* mod_name = mod ? mod->name.c_str() : "<N/A>";
const auto& type_name = i.get_type_name();
const auto member_name = i.get_member_name(static_cast<size_t>(offset));
emu.log.print(is_main_access ? color::green : color::dark_gray,
"Object access: %s - 0x%" PRIx64 " 0x%zx (%s) at 0x%" PRIx64 " (%s)\n", type_name.c_str(), offset, size,
member_name.c_str(), rip, mod_name);
for (auto offset = start_offset; offset < end_offset;)
{
const auto member_info = i.get_member_info(static_cast<size_t>(offset));
if (!member_info.has_value())
{
const auto remaining_size = end_offset - offset;
emu.log.print(is_main_access ? color::green : color::dark_gray,
"Object access: %s - 0x%" PRIx64 " 0x%" PRIx64 " (<N/A>) at 0x%" PRIx64 " (%s)\n", type_name.c_str(),
offset, remaining_size, rip, mod_name);
break;
}
const auto remaining_size = end_offset - offset;
const auto member_end = member_info->offset + member_info->size;
const auto member_access_size = member_end - offset;
const auto access_size = std::min(remaining_size, member_access_size);
emu.log.print(is_main_access ? color::green : color::dark_gray,
"Object access: %s - 0x%" PRIx64 " 0x%" PRIx64 " (%s) at 0x%" PRIx64 " (%s)\n", type_name.c_str(), offset,
access_size, member_info->get_diff_name(static_cast<size_t>(offset)).c_str(), rip, mod_name);
offset = member_end;
}
});
}

View File

@@ -43,34 +43,61 @@ class reflect_type_info
reflect::for_each<T>([this](auto I) {
const auto member_name = reflect::member_name<I, T>();
const auto member_offset = reflect::offset_of<I, T>();
const auto member_size = reflect::size_of<I, T>();
this->members_[member_offset] = member_name;
this->members_[member_offset] = std::make_pair(std::string(member_name), member_size);
});
}
std::string get_member_name(const size_t offset) const
{
size_t last_offset{};
std::string_view last_member{};
for (const auto& member : this->members_)
const auto info = this->get_member_info(offset);
if (!info.has_value())
{
if (offset == member.first)
{
return member.second;
}
if (offset < member.first)
{
const auto diff = offset - last_offset;
return std::string(last_member) + "+" + std::to_string(diff);
}
last_offset = member.first;
last_member = member.second;
return "<N/A>";
}
return "<N/A>";
return info->get_diff_name(offset);
}
struct member_info
{
std::string name{};
size_t offset{};
size_t size{};
std::string get_diff_name(const size_t access) const
{
const auto diff = access - this->offset;
if (diff == 0)
{
return this->name;
}
return this->name + "+" + std::to_string(diff);
}
};
std::optional<member_info> get_member_info(const size_t offset) const
{
auto entry = this->members_.upper_bound(offset);
if (entry == this->members_.begin())
{
return std::nullopt;
}
--entry;
if (entry->first + entry->second.second <= offset)
{
return std::nullopt;
}
return member_info{
.name = entry->second.first,
.offset = entry->first,
.size = entry->second.second,
};
}
const std::string& get_type_name() const
@@ -80,5 +107,5 @@ class reflect_type_info
private:
std::string type_name_{};
std::map<size_t, std::string> members_{};
std::map<size_t, std::pair<std::string, size_t>> members_{};
};