From a1011e18b0f8235e8b94961971b80f43f8d14053 Mon Sep 17 00:00:00 2001 From: "Robert L. Bocchino Jr" Date: Thu, 29 Feb 2024 16:02:46 -0800 Subject: [PATCH] Revise C++ code gen for array records --- .../ComponentDataProducts.scala | 12 +++++------ .../ActiveAsyncProductsComponentAc.ref.cpp | 20 +++++++++---------- .../base/ActiveGetProductsComponentAc.ref.cpp | 20 +++++++++---------- .../ActiveGuardedProductsComponentAc.ref.cpp | 20 +++++++++---------- .../ActiveSyncProductsComponentAc.ref.cpp | 20 +++++++++---------- .../base/ActiveTestComponentAc.ref.cpp | 20 +++++++++---------- .../PassiveGetProductsComponentAc.ref.cpp | 20 +++++++++---------- .../PassiveGuardedProductsComponentAc.ref.cpp | 20 +++++++++---------- .../PassiveSyncProductsComponentAc.ref.cpp | 20 +++++++++---------- .../base/PassiveTestComponentAc.ref.cpp | 20 +++++++++---------- .../QueuedAsyncProductsComponentAc.ref.cpp | 20 +++++++++---------- .../base/QueuedGetProductsComponentAc.ref.cpp | 20 +++++++++---------- .../QueuedGuardedProductsComponentAc.ref.cpp | 20 +++++++++---------- .../QueuedSyncProductsComponentAc.ref.cpp | 20 +++++++++---------- .../base/QueuedTestComponentAc.ref.cpp | 20 +++++++++---------- 15 files changed, 146 insertions(+), 146 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 606de3205..72938403e 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala @@ -94,8 +94,9 @@ case class ComponentDataProducts ( |// Update the size of the buffer according to the data size |const FwSizeType packetSize = container.getPacketSize(); |Fw::Buffer buffer = container.getBuffer(); - |FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - |buffer.setSize(packetSize); + |FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + | static_cast(buffer.getSize())); + |buffer.setSize(static_cast(packetSize)); |// Send the buffer |this->$invokeProductSend(0, container.getId(), buffer);""" ) @@ -424,8 +425,7 @@ case class ComponentDataProducts ( val serializeElts = (t match { // Optimize the U8 case case Type.U8 => - """| const bool omitSerializedLength = true; - | status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + """| status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); | FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status);""" case _ => """| for (FwSizeType i = 0; i < size; i++) { @@ -437,14 +437,14 @@ case class ComponentDataProducts ( s"""|FW_ASSERT(array != nullptr); |const FwSizeType sizeDelta = | sizeof(FwDpIdType) + - | sizeof(FwSizeType) + + | sizeof(FwSizeStoreType) + | size * $eltSize; |Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; |if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { | const FwDpIdType id = this->baseId + RecordId::$name; | status = this->m_dataBuffer.serialize(id); | FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - | status = this->m_dataBuffer.serialize(size); + | status = this->m_dataBuffer.serializeSize(size); | FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); |$serializeElts | this->m_dataSize += sizeDelta; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp index cd9777871..5e14c0311 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp @@ -102,14 +102,14 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * ActiveAsyncProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -153,14 +153,14 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -204,17 +204,16 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2811,8 +2810,9 @@ void ActiveAsyncProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp index 6ca051426..e58e47452 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp @@ -100,14 +100,14 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * ActiveGetProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -151,14 +151,14 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -202,17 +202,16 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2660,8 +2659,9 @@ void ActiveGetProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp index d55bbfe77..f4bb961de 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp @@ -100,14 +100,14 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * ActiveGuardedProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -151,14 +151,14 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -202,17 +202,16 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2767,8 +2766,9 @@ void ActiveGuardedProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp index 52b9f954d..d2972f10a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp @@ -100,14 +100,14 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * ActiveSyncProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -151,14 +151,14 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -202,17 +202,16 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2761,8 +2760,9 @@ void ActiveSyncProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 59f7de008..789ed96ba 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -138,14 +138,14 @@ namespace M { FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * M::ActiveTest_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -189,14 +189,14 @@ namespace M { FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -240,17 +240,16 @@ namespace M { FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -5608,8 +5607,9 @@ namespace M { // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp index 1ec13f31c..b75066918 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp @@ -45,14 +45,14 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * PassiveGetProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -96,14 +96,14 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -147,17 +147,16 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -1841,8 +1840,9 @@ void PassiveGetProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp index 468359b0f..8da739897 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp @@ -45,14 +45,14 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * PassiveGuardedProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -96,14 +96,14 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -147,17 +147,16 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -1948,8 +1947,9 @@ void PassiveGuardedProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp index c7bb9e146..248169c28 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp @@ -45,14 +45,14 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * PassiveSyncProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -96,14 +96,14 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -147,17 +147,16 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -1942,8 +1941,9 @@ void PassiveSyncProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index e2c720de1..15d180464 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -45,14 +45,14 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * PassiveTest_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -96,14 +96,14 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -147,17 +147,16 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -4066,8 +4065,9 @@ void PassiveTestComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp index 169863c68..9b7a366b1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp @@ -102,14 +102,14 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * QueuedAsyncProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -153,14 +153,14 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -204,17 +204,16 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2811,8 +2810,9 @@ void QueuedAsyncProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp index d71f5e6e1..36732e409 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp @@ -100,14 +100,14 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * QueuedGetProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -151,14 +151,14 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -202,17 +202,16 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2660,8 +2659,9 @@ void QueuedGetProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp index e82832d90..190ea22c2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp @@ -100,14 +100,14 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * QueuedGuardedProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -151,14 +151,14 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -202,17 +202,16 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2767,8 +2766,9 @@ void QueuedGuardedProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp index 3373d2852..d35f65e83 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp @@ -100,14 +100,14 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * QueuedSyncProducts_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -151,14 +151,14 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -202,17 +202,16 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -2761,8 +2760,9 @@ void QueuedSyncProductsComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 0372ce4e0..5389aca8c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -136,14 +136,14 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * QueuedTest_Data::SERIALIZED_SIZE; Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::DataArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -187,14 +187,14 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U32); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U32ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); for (FwSizeType i = 0; i < size; i++) { status = this->m_dataBuffer.serialize(array[i]); @@ -238,17 +238,16 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: FW_ASSERT(array != nullptr); const FwSizeType sizeDelta = sizeof(FwDpIdType) + - sizeof(FwSizeType) + + sizeof(FwSizeStoreType) + size * sizeof(U8); Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK; if (this->m_dataBuffer.getBuffLength() + sizeDelta <= this->m_dataBuffer.getBuffCapacity()) { const FwDpIdType id = this->baseId + RecordId::U8ArrayRecord; status = this->m_dataBuffer.serialize(id); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - status = this->m_dataBuffer.serialize(size); + status = this->m_dataBuffer.serializeSize(size); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); - const bool omitSerializedLength = true; - status = this->m_dataBuffer.serialize(array, size, omitSerializedLength); + status = this->m_dataBuffer.serialize(array, size, Fw::Serialization::OMIT_LENGTH); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, status); this->m_dataSize += sizeDelta; } @@ -5606,8 +5605,9 @@ void QueuedTestComponentBase :: // Update the size of the buffer according to the data size const FwSizeType packetSize = container.getPacketSize(); Fw::Buffer buffer = container.getBuffer(); - FW_ASSERT(packetSize <= buffer.getSize(), packetSize, buffer.getSize()); - buffer.setSize(packetSize); + FW_ASSERT(packetSize <= buffer.getSize(), static_cast(packetSize), + static_cast(buffer.getSize())); + buffer.setSize(static_cast(packetSize)); // Send the buffer this->productSendOut_out(0, container.getId(), buffer); }