zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 16:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove duplicated alignment utility method

Browse Source
This commit is contained in:
Jan 2025-04-19 16:00:42 +02:00
parent 3e58ddd2ad
commit 6d594d1651
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ZoneCodeGeneratorLib/Parsing/PostProcessing/CalculateSizeAndAlignPostProcessor.cpp
View File

@ -1,7 +1,7 @@
#include "CalculateSizeAndAlignPostProcessor.h"
#include "Domain/Definition/ArrayDeclarationModifier.h"
#include "Utils/AlignmentUtils.h"
#include "Utils/Alignment.h"
#include <cassert>
#include <cstdint>
@ -136,13 +136,13 @@ bool CalculateSizeAndAlignPostProcessor::CalculateSize(IDataRepository* reposito
{
if (currentBitOffset > 0)
{
currentBitOffset = AlignmentUtils::Align(currentBitOffset, 8u);
currentBitOffset = utils::Align(currentBitOffset, 8u);
definition->m_size += currentBitOffset / 8;
currentBitOffset = 0;
}
definition->m_size = AlignmentUtils::Align(
definition->m_size, member->GetForceAlignment() ? member->GetAlignment() : std::min(member->GetAlignment(), definition->m_pack));
definition->m_size =
utils::Align(definition->m_size, member->GetForceAlignment() ? member->GetAlignment() : std::min(member->GetAlignment(), definition->m_pack));
member->m_offset = definition->m_size;
@ -152,11 +152,11 @@ bool CalculateSizeAndAlignPostProcessor::CalculateSize(IDataRepository* reposito
if (currentBitOffset > 0)
{
currentBitOffset = AlignmentUtils::Align(currentBitOffset, 8u);
currentBitOffset = utils::Align(currentBitOffset, 8u);
definition->m_size += currentBitOffset / 8;
}
definition->m_size = AlignmentUtils::Align(definition->m_size, definition->m_alignment);
definition->m_size = utils::Align(definition->m_size, definition->m_alignment);
return true;
}
@ -177,7 +177,7 @@ bool CalculateSizeAndAlignPostProcessor::CalculateSize(IDataRepository* reposito
definition->m_size = memberSize;
}
definition->m_size = AlignmentUtils::Align(definition->m_size, definition->m_alignment);
definition->m_size = utils::Align(definition->m_size, definition->m_alignment);
return true;
}

13
src/ZoneCodeGeneratorLib/Utils/AlignmentUtils.h
View File

@ -1,13 +0,0 @@
#pragma once
class AlignmentUtils
{
public:
template<typename T> static T Align(T number, T alignmentValue)
{
if (alignmentValue == 0)
return number;
return (number + (alignmentValue - 1)) / alignmentValue * alignmentValue;
}
};