From 4fcedfb2c4cf0254a1f9c69354039adc827ada2c Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 20 May 2024 14:48:13 -0700 Subject: [PATCH 1/2] Revise code gen for data products --- .../ComponentCppWriter.scala | 3 ++- .../ComponentDataProducts.scala | 20 +++++++++++++++++++ .../codegen/CppWriter/TypeCppWriter.scala | 4 ++-- .../ActiveAsyncProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../base/ActiveGetProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../ActiveGuardedProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../ActiveSyncProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../base/ActiveTestComponentAc.ref.hpp | 20 +++++++++++++++++++ .../PassiveGetProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../PassiveGuardedProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../PassiveSyncProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../base/PassiveTestComponentAc.ref.hpp | 20 +++++++++++++++++++ .../QueuedAsyncProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../base/QueuedGetProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../QueuedGuardedProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../QueuedSyncProductsComponentAc.ref.hpp | 20 +++++++++++++++++++ .../base/QueuedTestComponentAc.ref.hpp | 20 +++++++++++++++++++ 17 files changed, 304 insertions(+), 3 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala index 4dc87fa04..52a900c37 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala @@ -213,7 +213,8 @@ case class ComponentCppWriter ( cmdWriter.getConstantMembers, eventWriter.getConstantMembers, tlmWriter.getConstantMembers, - paramWriter.getConstantMembers + paramWriter.getConstantMembers, + dpWriter.getConstantMembers ).flatten if constants.isEmpty then Nil diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala index e2ab00aab..4103ee3c8 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala @@ -10,6 +10,26 @@ case class ComponentDataProducts ( aNode: Ast.Annotated[AstNode[Ast.DefComponent]] ) extends ComponentCppWriterUtils(s, aNode) { + def getConstantMembers: List[CppDoc.Class.Member] = { + def writeRecordSize(record: Record) = { + val data = record.aNode._2.data + val constantName = s"SIZE_OF_${data.name}" + val typeName = TypeCppWriter.getName(s, record.recordType) + val eltSize = writeSerializedSizeExpr(s, record.recordType, typeName) + if record.isArray + then s"""|static constexpr FwSizeType $constantName(FwSizeType arraySize) { + | return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * $eltSize; + |}""" + else s"""|static constexpr FwSizeType $constantName = + | sizeof(FwDpIdType) + $eltSize;""" + } + val sizes = recordsByName.map((_, record) => writeRecordSize(record)).flatMap(lines) + lazy val member = linesClassMember( + Line.blank :: line("//! Record sizes") :: sizes + ) + guardedList (!sizes.isEmpty) (List(member)) + } + def getTypeMembers: List[CppDoc.Class.Member] = addAccessTagAndComment( "PROTECTED", diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/TypeCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/TypeCppWriter.scala index cfaf31e2a..db65ff2c9 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/TypeCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/TypeCppWriter.scala @@ -8,7 +8,7 @@ case class TypeCppWriter( /** CppWriterState */ s: CppWriterState, /** The name to use for string types */ - stringTypeName: String = "Fw::String" + stringTypeName: String = "Fw::StringBase" ) { private object NameVisitor extends TypeVisitor { @@ -52,7 +52,7 @@ object TypeCppWriter { def getName( s: CppWriterState, t: Type, - stringTypeName: String = "Fw::String" + stringTypeName: String = "Fw::StringBase" ): String = TypeCppWriter(s, stringTypeName).write(t) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp index a0ea7aff7..7c3693f6f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp @@ -99,6 +99,26 @@ class ActiveAsyncProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveAsyncProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + ActiveAsyncProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp index 890f28f96..f0e88911c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp @@ -97,6 +97,26 @@ class ActiveGetProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveGetProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + ActiveGetProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp index 151c13aae..bdac1a7bb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp @@ -99,6 +99,26 @@ class ActiveGuardedProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveGuardedProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + ActiveGuardedProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp index 4715bc86c..05f71b119 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp @@ -99,6 +99,26 @@ class ActiveSyncProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveSyncProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + ActiveSyncProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index 3d1c33506..bad147a95 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -186,6 +186,26 @@ namespace M { PARAMID_PARAMSTRUCT = 0x32, //!< A parameter with struct data and set/save opcodes }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * M::ActiveTest_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + M::ActiveTest_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp index 45cf430a7..53a942645 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp @@ -92,6 +92,26 @@ class PassiveGetProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveGetProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + PassiveGetProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp index edfb32861..9d4c2b5b8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp @@ -94,6 +94,26 @@ class PassiveGuardedProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveGuardedProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + PassiveGuardedProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp index f4df77b23..1d07e91b9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp @@ -94,6 +94,26 @@ class PassiveSyncProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveSyncProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + PassiveSyncProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index eacc487d9..8bdbd6f05 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -173,6 +173,26 @@ class PassiveTestComponentBase : PARAMID_PARAMSTRUCT = 0x32, //!< A parameter with struct data and set/save opcodes }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveTest_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + PassiveTest_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp index 06ecb9a2c..e38e23219 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp @@ -99,6 +99,26 @@ class QueuedAsyncProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedAsyncProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + QueuedAsyncProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp index a50aeefa8..429c2d4fb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp @@ -97,6 +97,26 @@ class QueuedGetProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedGetProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + QueuedGetProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp index b269aaff8..8646c560d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp @@ -99,6 +99,26 @@ class QueuedGuardedProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedGuardedProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + QueuedGuardedProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp index 22fc6f40c..30bf0ae79 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp @@ -99,6 +99,26 @@ class QueuedSyncProductsComponentBase : NUM_TYPEDRETURNOUT_OUTPUT_PORTS = 1, }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedSyncProducts_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + QueuedSyncProducts_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index 062ba8464..716222edc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -184,6 +184,26 @@ class QueuedTestComponentBase : PARAMID_PARAMSTRUCT = 0x32, //!< A parameter with struct data and set/save opcodes }; + //! Record sizes + static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedTest_Data::SERIALIZED_SIZE; + } + static constexpr FwSizeType SIZE_OF_DataRecord = + sizeof(FwDpIdType) + QueuedTest_Data::SERIALIZED_SIZE; + static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + } + static constexpr FwSizeType SIZE_OF_StringRecord = + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); + } + static constexpr FwSizeType SIZE_OF_U32Record = + sizeof(FwDpIdType) + sizeof(U32); + static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); + } + PROTECTED: // ---------------------------------------------------------------------- From 9e6a69306432cfe586c78e7a63a6f81a55e4dc36 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 20 May 2024 15:34:34 -0700 Subject: [PATCH 2/2] Revise code gen for data products --- .../ComponentCppWriter/ComponentDataProducts.scala | 2 +- .../base/ActiveAsyncProductsComponentAc.ref.hpp | 14 +++++++------- .../base/ActiveGetProductsComponentAc.ref.hpp | 14 +++++++------- .../base/ActiveGuardedProductsComponentAc.ref.hpp | 14 +++++++------- .../base/ActiveSyncProductsComponentAc.ref.hpp | 14 +++++++------- .../component/base/ActiveTestComponentAc.ref.hpp | 14 +++++++------- .../base/PassiveGetProductsComponentAc.ref.hpp | 14 +++++++------- .../base/PassiveGuardedProductsComponentAc.ref.hpp | 14 +++++++------- .../base/PassiveSyncProductsComponentAc.ref.hpp | 14 +++++++------- .../component/base/PassiveTestComponentAc.ref.hpp | 14 +++++++------- .../base/QueuedAsyncProductsComponentAc.ref.hpp | 14 +++++++------- .../base/QueuedGetProductsComponentAc.ref.hpp | 14 +++++++------- .../base/QueuedGuardedProductsComponentAc.ref.hpp | 14 +++++++------- .../base/QueuedSyncProductsComponentAc.ref.hpp | 14 +++++++------- .../component/base/QueuedTestComponentAc.ref.hpp | 14 +++++++------- 15 files changed, 99 insertions(+), 99 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala index 4103ee3c8..25caca2b1 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala @@ -13,7 +13,7 @@ case class ComponentDataProducts ( def getConstantMembers: List[CppDoc.Class.Member] = { def writeRecordSize(record: Record) = { val data = record.aNode._2.data - val constantName = s"SIZE_OF_${data.name}" + val constantName = s"SIZE_OF_${data.name}_RECORD" val typeName = TypeCppWriter.getName(s, record.recordType) val eltSize = writeSerializedSizeExpr(s, record.recordType, typeName) if record.isArray diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp index 7c3693f6f..267e7519b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp @@ -100,22 +100,22 @@ class ActiveAsyncProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveAsyncProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveAsyncProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp index f0e88911c..c659fca59 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp @@ -98,22 +98,22 @@ class ActiveGetProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveGetProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveGetProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp index bdac1a7bb..2852b6482 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp @@ -100,22 +100,22 @@ class ActiveGuardedProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveGuardedProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveGuardedProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp index 05f71b119..5f4bc065a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp @@ -100,22 +100,22 @@ class ActiveSyncProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * ActiveSyncProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveSyncProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index bad147a95..063c5222c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -187,22 +187,22 @@ namespace M { }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * M::ActiveTest_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + M::ActiveTest_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp index 53a942645..7ce884773 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp @@ -93,22 +93,22 @@ class PassiveGetProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveGetProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveGetProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp index 9d4c2b5b8..b6cbad603 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp @@ -95,22 +95,22 @@ class PassiveGuardedProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveGuardedProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveGuardedProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp index 1d07e91b9..326baaebc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp @@ -95,22 +95,22 @@ class PassiveSyncProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveSyncProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveSyncProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index 8bdbd6f05..95eeb36a7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -174,22 +174,22 @@ class PassiveTestComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * PassiveTest_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveTest_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp index e38e23219..05fc97622 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp @@ -100,22 +100,22 @@ class QueuedAsyncProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedAsyncProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedAsyncProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp index 429c2d4fb..bd1bc7254 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp @@ -98,22 +98,22 @@ class QueuedGetProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedGetProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedGetProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp index 8646c560d..626304a56 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp @@ -100,22 +100,22 @@ class QueuedGuardedProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedGuardedProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedGuardedProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp index 30bf0ae79..d618298b0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp @@ -100,22 +100,22 @@ class QueuedSyncProductsComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedSyncProducts_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedSyncProducts_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index 716222edc..725d3fadd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -185,22 +185,22 @@ class QueuedTestComponentBase : }; //! Record sizes - static constexpr FwSizeType SIZE_OF_DataArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_DataArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * QueuedTest_Data::SERIALIZED_SIZE; } - static constexpr FwSizeType SIZE_OF_DataRecord = + static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedTest_Data::SERIALIZED_SIZE; - static constexpr FwSizeType SIZE_OF_StringArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); } - static constexpr FwSizeType SIZE_OF_StringRecord = + static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); - static constexpr FwSizeType SIZE_OF_U32ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } - static constexpr FwSizeType SIZE_OF_U32Record = + static constexpr FwSizeType SIZE_OF_U32Record_RECORD = sizeof(FwDpIdType) + sizeof(U32); - static constexpr FwSizeType SIZE_OF_U8ArrayRecord(FwSizeType arraySize) { + static constexpr FwSizeType SIZE_OF_U8ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U8); }