zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-01-19 23:11:50 +00:00
Code Activity

fix: filling union members that are not supposed to be written

Browse Source 
* This causes some pointers to be partially overwritten when filling in the wrong order as well
This commit is contained in:
Jan Laupetin
2026-01-14 22:14:43 +00:00
parent 9f559fdcd0
commit 00546740e4
15 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ZoneCodeGeneratorLib/Domain/Computations/MemberComputations.cpp
View File

@@ -189,15 +189,15 @@ bool MemberComputations::IsInRuntimeBlock() const
return m_info->m_fast_file_block != nullptr && m_info->m_fast_file_block->m_type == FastFileBlockType::RUNTIME;
}
bool MemberComputations::IsFirstUsedMember() const
bool MemberComputations::IsFirstUsedMember(const bool includeLeafs) const
{
const auto parentUsedMembers = StructureComputations(m_info->m_parent).GetUsedMembers();
const auto parentUsedMembers = StructureComputations(m_info->m_parent).GetUsedMembers(includeLeafs);
return !parentUsedMembers.empty() && parentUsedMembers[0] == m_info;
}
bool MemberComputations::IsLastUsedMember() const
bool MemberComputations::IsLastUsedMember(const bool includeLeafs) const
{
const auto parentUsedMembers = StructureComputations(m_info->m_parent).GetUsedMembers();
const auto parentUsedMembers = StructureComputations(m_info->m_parent).GetUsedMembers(includeLeafs);
return !parentUsedMembers.empty() && parentUsedMembers[parentUsedMembers.size() - 1] == m_info;
}

4
src/ZoneCodeGeneratorLib/Domain/Computations/MemberComputations.h
View File

@@ -25,8 +25,8 @@ public:
[[nodiscard]] bool IsNotInDefaultNormalBlock() const;
[[nodiscard]] bool IsInTempBlock() const;
[[nodiscard]] bool IsInRuntimeBlock() const;
[[nodiscard]] bool IsFirstUsedMember() const;
[[nodiscard]] bool IsLastUsedMember() const;
[[nodiscard]] bool IsFirstUsedMember(bool includeLeafs) const;
[[nodiscard]] bool IsLastUsedMember(bool includeLeafs) const;
[[nodiscard]] bool HasDynamicArraySize() const;
[[nodiscard]] bool IsDynamicMember() const;
[[nodiscard]] bool IsAfterPartialLoad() const;

4
src/ZoneCodeGeneratorLib/Domain/Computations/StructureComputations.cpp
View File

@@ -38,7 +38,7 @@ bool StructureComputations::HasNonDynamicMember() const
return false;
}
std::vector<MemberInformation*> StructureComputations::GetUsedMembers() const
std::vector<MemberInformation*> StructureComputations::GetUsedMembers(const bool includeLeafs) const
{
std::vector<MemberInformation*> members;
@@ -54,7 +54,7 @@ std::vector<MemberInformation*> StructureComputations::GetUsedMembers() const
{
for (const auto& member : m_info->m_ordered_members)
{
if (!member->m_is_leaf && !MemberComputations(member.get()).ShouldIgnore())
if ((includeLeafs || !member->m_is_leaf) && !MemberComputations(member.get()).ShouldIgnore())
members.push_back(member.get());
}
}

2
src/ZoneCodeGeneratorLib/Domain/Computations/StructureComputations.h
View File

@@ -10,7 +10,7 @@ public:
[[nodiscard]] bool IsAsset() const;
[[nodiscard]] MemberInformation* GetDynamicMember() const;
[[nodiscard]] bool HasNonDynamicMember() const;
[[nodiscard]] std::vector<MemberInformation*> GetUsedMembers() const;
[[nodiscard]] std::vector<MemberInformation*> GetUsedMembers(bool includeLeafs) const;
[[nodiscard]] bool IsInTempBlock() const;
private:

12
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
View File

@@ -596,7 +596,7 @@ namespace
{
const MemberComputations computations(&member);
if (computations.IsFirstUsedMember())
if (computations.IsFirstUsedMember(false))
{
if (member.m_condition)
{
@@ -614,7 +614,7 @@ namespace
PrintFillStruct_Member(structInfo, member, DeclarationModifierComputations(&member), 0u);
}
}
else if (computations.IsLastUsedMember())
else if (computations.IsLastUsedMember(false))
{
if (member.m_condition)
{
@@ -810,7 +810,7 @@ namespace
if (computations.ShouldIgnore())
continue;
if (computations.IsFirstUsedMember())
if (computations.IsFirstUsedMember(false))
{
LINE("")
if (member->m_condition)
@@ -829,7 +829,7 @@ namespace
PrintDynamicOversize_DynamicMember(info, *member);
}
}
else if (computations.IsLastUsedMember())
else if (computations.IsLastUsedMember(false))
{
if (member->m_condition)
{
@@ -1788,7 +1788,7 @@ namespace
{
const MemberComputations computations(member);
if (computations.IsFirstUsedMember())
if (computations.IsFirstUsedMember(false))
{
LINE("")
if (member->m_condition)
@@ -1807,7 +1807,7 @@ namespace
LoadMember_Reference(info, member, DeclarationModifierComputations(member));
}
}
else if (computations.IsLastUsedMember())
else if (computations.IsLastUsedMember(false))
{
if (member->m_condition)
{

4
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
View File

@@ -670,7 +670,7 @@ namespace
{
const MemberComputations computations(member);
if (computations.IsFirstUsedMember())
if (computations.IsFirstUsedMember(false))
{
LINE("")
if (member->m_condition)
@@ -689,7 +689,7 @@ namespace
MarkMember_Reference(info, member, DeclarationModifierComputations(member));
}
}
else if (computations.IsLastUsedMember())
else if (computations.IsLastUsedMember(false))
{
if (member->m_condition)
{

68
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
View File

@@ -1010,7 +1010,7 @@ namespace
{
const MemberComputations computations(member);
if (computations.IsFirstUsedMember())
if (computations.IsFirstUsedMember(false))
{
LINE("")
if (member->m_condition)
@@ -1029,7 +1029,7 @@ namespace
WriteMember_Reference(info, member, DeclarationModifierComputations(member));
}
}
else if (computations.IsLastUsedMember())
else if (computations.IsLastUsedMember(false))
{
if (member->m_condition)
{
@@ -1326,12 +1326,20 @@ namespace
}
}
static bool ShouldFillMember(const DeclarationModifierComputations& modifier)
{
return !modifier.HasPointerModifier();
}
// nestedBaseOffset: Base offset in case member is part of a nested anonymous sub-struct
void PrintFillStruct_Member(const StructureInformation& structInfo,
const MemberInformation& memberInfo,
const DeclarationModifierComputations& modifier,
const size_t nestedBaseOffset)
{
if (!ShouldFillMember(modifier))
return;
if (modifier.IsDynamicArray())
{
}
@@ -1360,7 +1368,7 @@ namespace
{
const MemberComputations computations(&member);
if (computations.IsFirstUsedMember())
if (computations.IsFirstUsedMember(true))
{
if (member.m_condition)
{
@@ -1378,7 +1386,7 @@ namespace
PrintFillStruct_Member(structInfo, member, modifier, 0u);
}
}
else if (computations.IsLastUsedMember())
else if (computations.IsLastUsedMember(true))
{
if (member.m_condition)
{
@@ -1423,49 +1431,10 @@ namespace
}
}
static bool ShouldFillMember(const DeclarationModifierComputations& modifier)
{
return !modifier.HasPointerModifier();
}
void PrintFillStruct_Struct(const StructureInformation& info)
{
const auto* dynamicMember = StructureComputations(&info).GetDynamicMember();
if (dynamicMember)
{
if (info.m_definition->GetType() == DataDefinitionType::UNION)
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore())
continue;
DeclarationModifierComputations modifier(member.get());
if (!ShouldFillMember(modifier))
continue;
PrintFillStruct_Member_Condition_Union(info, *member, modifier);
}
}
else
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore() || member.get() == dynamicMember)
continue;
DeclarationModifierComputations modifier(member.get());
if (!ShouldFillMember(modifier))
continue;
PrintFillStruct_Member(info, *member, modifier, 0u);
}
}
}
else
if (info.m_definition->GetType() == DataDefinitionType::UNION)
{
for (const auto& member : info.m_ordered_members)
{
@@ -1474,9 +1443,18 @@ namespace
continue;
DeclarationModifierComputations modifier(member.get());
if (!ShouldFillMember(modifier))
PrintFillStruct_Member_Condition_Union(info, *member, modifier);
}
}
else
{
for (const auto& member : info.m_ordered_members)
{
const MemberComputations computations(member.get());
if (computations.ShouldIgnore() || member.get() == dynamicMember)
continue;
DeclarationModifierComputations modifier(member.get());
PrintFillStruct_Member(info, *member, modifier, 0u);
}
}