zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-26 11:31:43 +00:00
Code Activity

refactor(zcg): use wordsize instead of architecture

Browse Source
This commit is contained in:
Michael Oliver
2026-04-30 13:48:32 +01:00
parent abfc2dc547
commit 97591f59f4
30 changed files with 170 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZoneCodeGeneratorLib/Generating/BaseRenderingContext.cpp
+3 -3
View File
@@ -1,9 +1,9 @@
#include "BaseRenderingContext.h"
BaseRenderingContext::BaseRenderingContext(std::string game, const Architecture gameArchitecture, std::vector<const FastFileBlock*> fastFileBlocks)
BaseRenderingContext::BaseRenderingContext(std::string game, const WordSize gameWordSize, std::vector<const FastFileBlock*> fastFileBlocks)
: m_game(std::move(game)),
m_architecture_mismatch(gameArchitecture != OWN_ARCHITECTURE),
m_pointer_size(GetPointerSizeForArchitecture(gameArchitecture)),
m_word_size_mismatch(gameWordSize != OWN_WORD_SIZE),
m_pointer_size(GetPointerSizeForWordSize(gameWordSize)),
m_blocks(std::move(fastFileBlocks)),
m_default_normal_block(nullptr),
m_default_temp_block(nullptr)
src/ZoneCodeGeneratorLib/Generating/BaseRenderingContext.h
+2 -2
View File
@@ -9,7 +9,7 @@ class BaseRenderingContext
{
public:
std::string m_game;
bool m_architecture_mismatch;
bool m_word_size_mismatch;
unsigned m_pointer_size;
std::vector<const FastFileBlock*> m_blocks;
@@ -17,5 +17,5 @@ public:
const FastFileBlock* m_default_temp_block;
protected:
BaseRenderingContext(std::string game, Architecture gameArchitecture, std::vector<const FastFileBlock*> fastFileBlocks);
BaseRenderingContext(std::string game, WordSize gameWordSize, std::vector<const FastFileBlock*> fastFileBlocks);
};
src/ZoneCodeGeneratorLib/Generating/OncePerAssetRenderingContext.cpp
+3 -5
View File
@@ -18,10 +18,8 @@ RenderingUsedType::RenderingUsedType(const DataDefinition* type, StructureInform
{
}
OncePerAssetRenderingContext::OncePerAssetRenderingContext(std::string game,
const Architecture gameArchitecture,
std::vector<const FastFileBlock*> fastFileBlocks)
: BaseRenderingContext(std::move(game), gameArchitecture, std::move(fastFileBlocks)),
OncePerAssetRenderingContext::OncePerAssetRenderingContext(std::string game, const WordSize gameWordSize, std::vector<const FastFileBlock*> fastFileBlocks)
: BaseRenderingContext(std::move(game), gameWordSize, std::move(fastFileBlocks)),
m_asset(nullptr),
m_has_actions(false)
{
@@ -190,7 +188,7 @@ bool OncePerAssetRenderingContext::UsedTypeHasActions(const RenderingUsedType* u
std::unique_ptr<OncePerAssetRenderingContext> OncePerAssetRenderingContext::BuildContext(const IDataRepository* repository, StructureInformation* asset)
{
auto context = std::make_unique<OncePerAssetRenderingContext>(
OncePerAssetRenderingContext(repository->GetGameName(), repository->GetArchitecture(), repository->GetAllFastFileBlocks()));
OncePerAssetRenderingContext(repository->GetGameName(), repository->GetWordSize(), repository->GetAllFastFileBlocks()));
context->MakeAsset(repository, asset);
context->CreateUsedTypeCollections();
src/ZoneCodeGeneratorLib/Generating/OncePerAssetRenderingContext.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
bool m_has_actions;
private:
OncePerAssetRenderingContext(std::string game, Architecture gameArchitecture, std::vector<const FastFileBlock*> fastFileBlocks);
OncePerAssetRenderingContext(std::string game, WordSize gameWordSize, std::vector<const FastFileBlock*> fastFileBlocks);
RenderingUsedType* AddUsedType(std::unique_ptr<RenderingUsedType> usedType);
RenderingUsedType* GetBaseType(const IDataRepository* repository, MemberComputations* computations, RenderingUsedType* usedType);
src/ZoneCodeGeneratorLib/Generating/OncePerTemplateRenderingContext.cpp
+3 -3
View File
@@ -5,10 +5,10 @@
#include <algorithm>
OncePerTemplateRenderingContext::OncePerTemplateRenderingContext(std::string game,
const Architecture gameArchitecture,
const WordSize gameWordSize,
std::vector<const FastFileBlock*> fastFileBlocks,
std::vector<StructureInformation*> assets)
: BaseRenderingContext(std::move(game), gameArchitecture, std::move(fastFileBlocks)),
: BaseRenderingContext(std::move(game), gameWordSize, std::move(fastFileBlocks)),
m_assets(std::move(assets))
{
for (const auto* block : m_blocks)
@@ -35,5 +35,5 @@ std::unique_ptr<OncePerTemplateRenderingContext> OncePerTemplateRenderingContext
}
return std::make_unique<OncePerTemplateRenderingContext>(
OncePerTemplateRenderingContext(repository->GetGameName(), repository->GetArchitecture(), repository->GetAllFastFileBlocks(), assetInformation));
OncePerTemplateRenderingContext(repository->GetGameName(), repository->GetWordSize(), repository->GetAllFastFileBlocks(), assetInformation));
}
src/ZoneCodeGeneratorLib/Generating/OncePerTemplateRenderingContext.h
+1 -1
View File
@@ -15,7 +15,7 @@ public:
private:
OncePerTemplateRenderingContext(std::string game,
Architecture gameArchitecture,
WordSize gameWordSize,
std::vector<const FastFileBlock*> fastFileBlocks,
std::vector<StructureInformation*> assets);
};
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
+21 -21
View File
@@ -83,7 +83,7 @@ namespace
m_intendation++;
// Method Declarations
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
for (const auto* type : m_env.m_used_types)
{
@@ -190,7 +190,7 @@ namespace
LINE("")
PrintMainLoadMethod();
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
for (const auto* type : m_env.m_used_types)
{
@@ -899,7 +899,7 @@ namespace
{
LINEF("*{0} = m_stream.{1}<{2}>({3});",
MakeTypePtrVarName(def),
m_env.m_architecture_mismatch ? "AllocOutOfBlock" : "Alloc",
m_env.m_word_size_mismatch ? "AllocOutOfBlock" : "Alloc",
def->GetFullName(),
def->GetAlignment())
}
@@ -976,7 +976,7 @@ namespace
LINE("if (atStreamStart)")
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
LINE("{")
m_intendation++;
@@ -1210,7 +1210,7 @@ namespace
{
LINEF("{0} = {1};", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier))
if (computations.IsAfterPartialLoad() && !m_env.m_architecture_mismatch)
if (computations.IsAfterPartialLoad() && !m_env.m_word_size_mismatch)
{
LINEF("LoadArray_{0}(true, {1});", MakeSafeTypeName(member->m_member->m_type_declaration->m_type), arraySizeStr)
}
@@ -1231,7 +1231,7 @@ namespace
LINE(MakeCustomActionCall(member->m_post_load_action.get()))
}
}
else if (computations.IsAfterPartialLoad() && !m_env.m_architecture_mismatch)
else if (computations.IsAfterPartialLoad() && !m_env.m_word_size_mismatch)
{
LINEF("m_stream.Load<{0}{1}>({2}, {3});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
@@ -1248,12 +1248,12 @@ namespace
LINEF("{0} = {1};", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier))
LINEF("LoadArray_{0}({1}, {2});",
MakeSafeTypeName(member->m_member->m_type_declaration->m_type),
m_env.m_architecture_mismatch ? "false" : "true",
m_env.m_word_size_mismatch ? "false" : "true",
MakeEvaluation(modifier.GetDynamicArraySizeEvaluation()))
}
else if (info->m_has_matching_cross_platform_structure)
{
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
LINE("if (atStreamStart)")
m_intendation++;
@@ -1265,7 +1265,7 @@ namespace
MakeMemberAccess(info, member, modifier),
MakeEvaluation(modifier.GetDynamicArraySizeEvaluation()))
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
m_intendation--;
}
@@ -1279,7 +1279,7 @@ namespace
{
LINEF("{0} = &{1};", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier))
if (computations.IsAfterPartialLoad() && !m_env.m_architecture_mismatch)
if (computations.IsAfterPartialLoad() && !m_env.m_word_size_mismatch)
{
LINEF("Load_{0}(true);", MakeSafeTypeName(member->m_member->m_type_declaration->m_type))
}
@@ -1300,7 +1300,7 @@ namespace
LINE(MakeCustomActionCall(member->m_post_load_action.get()))
}
}
else if (computations.IsAfterPartialLoad() && !m_env.m_architecture_mismatch)
else if (computations.IsAfterPartialLoad() && !m_env.m_word_size_mismatch)
{
LINEF("m_stream.Load<{0}{1}>(&{2});",
MakeTypeDecl(member->m_member->m_type_declaration.get()),
@@ -1421,7 +1421,7 @@ namespace
[[nodiscard]] bool ShouldAllocOutOfBlock(const MemberInformation& member, const MemberLoadType loadType) const
{
return m_env.m_architecture_mismatch
return m_env.m_word_size_mismatch
&& ((member.m_type && !member.m_type->m_has_matching_cross_platform_structure) || loadType == MemberLoadType::POINTER_ARRAY);
}
@@ -1505,7 +1505,7 @@ namespace
{
LINE("")
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
LINE("uintptr_t toInsertLookupEntry = 0;")
else
LINEF("{0}** toInsert = nullptr;", member->m_member->m_type_declaration->m_type->GetFullName())
@@ -1513,7 +1513,7 @@ namespace
LINE("if (zonePtrType == ZonePointerType::INSERT)")
m_intendation++;
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
LINE("toInsertLookupEntry = m_stream.InsertPointerAliasLookup();")
else
LINEF("toInsert = m_stream.InsertPointerNative<{0}>();", member->m_member->m_type_declaration->m_type->GetFullName())
@@ -1530,7 +1530,7 @@ namespace
LINE("if (zonePtrType == ZonePointerType::INSERT)")
m_intendation++;
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
LINEF(
"m_stream.SetInsertedPointerAliasLookup(toInsertLookupEntry, {0}->{1});", MakeTypeVarName(info->m_definition), member->m_member->m_name)
else
@@ -1909,7 +1909,7 @@ namespace
}
m_intendation--;
}
else if (!m_env.m_architecture_mismatch)
else if (!m_env.m_word_size_mismatch)
{
LINE("assert(atStreamStart);")
}
@@ -1950,7 +1950,7 @@ namespace
LINEF("assert({0} != nullptr);", MakeTypePtrVarName(info->m_definition))
LINE("")
if (!m_env.m_architecture_mismatch)
if (!m_env.m_word_size_mismatch)
{
LINE("if (atStreamStart)")
m_intendation++;
@@ -1987,7 +1987,7 @@ namespace
LINEF("*{0} = m_stream.{1}<{2}>({3});",
MakeTypePtrVarName(info->m_definition),
m_env.m_architecture_mismatch ? "AllocOutOfBlock" : "Alloc",
m_env.m_word_size_mismatch ? "AllocOutOfBlock" : "Alloc",
info->m_definition->GetFullName(),
info->m_definition->GetAlignment())
@@ -1995,7 +1995,7 @@ namespace
{
LINE("")
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
LINE("uintptr_t toInsertLookupEntry = 0;")
else
LINEF("{0}** toInsert = nullptr;", info->m_definition->GetFullName())
@@ -2003,7 +2003,7 @@ namespace
LINE("if (zonePtrType == ZonePointerType::INSERT)")
m_intendation++;
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
LINE("toInsertLookupEntry = m_stream.InsertPointerAliasLookup();")
else
LINEF("toInsert = m_stream.InsertPointerNative<{0}>();", info->m_definition->GetFullName())
@@ -2050,7 +2050,7 @@ namespace
LINE("if (zonePtrType == ZonePointerType::INSERT)")
m_intendation++;
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
LINEF("m_stream.SetInsertedPointerAliasLookup(toInsertLookupEntry, *{0});", MakeTypePtrVarName(info->m_definition))
else
LINEF("*toInsert = *{0};", MakeTypePtrVarName(info->m_definition))
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
+4 -4
View File
@@ -79,7 +79,7 @@ namespace
m_intendation++;
// Method Declarations
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
for (const auto* type : m_env.m_used_types)
{
@@ -178,7 +178,7 @@ namespace
LINE("")
PrintMainWriteMethod();
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
for (const auto* type : m_env.m_used_types)
{
@@ -335,7 +335,7 @@ namespace
MakeTypeWrittenVarNameInternal(info->m_definition, str);
str << ".AtOffset(";
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
{
str << OffsetForMemberModifier(*member, modifier, 0);
}
@@ -837,7 +837,7 @@ namespace
std::string MakeReusableInnerOffset(const DataDefinition* dataDefinition, const Variable* member) const
{
if (m_env.m_architecture_mismatch)
if (m_env.m_word_size_mismatch)
return std::to_string(member->m_offset);
return std::format("offsetof({0}, {1})", dataDefinition->GetFullName(), member->m_name);