Merge pull request #385 from thomas-bc/fw-objec-name

Add support for Fw::ObjectName
nasa · Feb 26, 2024 · f75c77e · f75c77e
2 parents d9fa43a + b76f713
commit f75c77e
Show file tree

Hide file tree

Showing 68 changed files with 5,724 additions and 17,044 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
@@ -967,21 +967,13 @@ object ComponentCppWriter extends CppWriterUtils {
           },
           Line.blank :: lines(
             s"""|#if FW_OBJECT_NAMES == 1
-                |// The port name consists of this->m_objName and some extra info.
-                |// We expect all of this to fit in FW_OBJ_NAME_MAX_SIZE bytes.
-                |// However, the compiler may assume that this->m_objName fills
-                |// the entire array, whose size is FW_OBJ_NAME_MAX_SIZE. So to
-                |// avoid a compiler warning, we provide an extra FW_OBJ_NAME_MAX_SIZE
-                |// bytes to cover the extra info.
-                |char portName[2*FW_OBJ_NAME_MAX_SIZE];
-                |(void) snprintf(
-                |  portName,
-                |  sizeof(portName),
+                |Fw::ObjectName portName;
+                |portName.format(
                 |  "%s_${printName(port)}[%" PRI_PlatformIntType "]",
-                |  this->m_objName,
+                |  this->m_objName.toChar(),
                 |  port
                 |);
-                |this->${variableName(port)}[port].setObjName(portName);
+                |this->${variableName(port)}[port].setObjName(portName.toChar());
                 |#endif
                 |"""
           )

diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentEvents.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentEvents.scala
@@ -214,7 +214,7 @@ case class ComponentEvents (
                     |  FW_LOG_TEXT_BUFFER_SIZE,
                     |  _formatString,
                     |#if FW_OBJECT_NAMES == 1
-                    |  this->m_objName,
+                    |  this->m_objName.toChar(),
                     |#endif
                     |"""
               ),

diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp
@@ -86,21 +86,13 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
     this->m_productRecvIn_InputPort[port].setPortNum(port);
 
 #if FW_OBJECT_NAMES == 1
-    // The port name consists of this->m_objName and some extra info.
-    // We expect all of this to fit in FW_OBJ_NAME_MAX_SIZE bytes.
-    // However, the compiler may assume that this->m_objName fills
-    // the entire array, whose size is FW_OBJ_NAME_MAX_SIZE. So to
-    // avoid a compiler warning, we provide an extra FW_OBJ_NAME_MAX_SIZE
-    // bytes to cover the extra info.
-    char portName[2*FW_OBJ_NAME_MAX_SIZE];
-    (void) snprintf(
-      portName,
-      sizeof(portName),
+    Fw::ObjectName portName;
+    portName.format(
       "%s_productRecvIn_InputPort[%" PRI_PlatformIntType "]",
-      this->m_objName,
+      this->m_objName.toChar(),
       port
     );
-    this->m_productRecvIn_InputPort[port].setObjName(portName);
+    this->m_productRecvIn_InputPort[port].setObjName(portName.toChar());
 #endif
   }
 
@@ -113,21 +105,13 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
     this->m_productRequestOut_OutputPort[port].init();
 
 #if FW_OBJECT_NAMES == 1
-    // The port name consists of this->m_objName and some extra info.
-    // We expect all of this to fit in FW_OBJ_NAME_MAX_SIZE bytes.
-    // However, the compiler may assume that this->m_objName fills
-    // the entire array, whose size is FW_OBJ_NAME_MAX_SIZE. So to
-    // avoid a compiler warning, we provide an extra FW_OBJ_NAME_MAX_SIZE
-    // bytes to cover the extra info.
-    char portName[2*FW_OBJ_NAME_MAX_SIZE];
-    (void) snprintf(
-      portName,
-      sizeof(portName),
+    Fw::ObjectName portName;
+    portName.format(
       "%s_productRequestOut_OutputPort[%" PRI_PlatformIntType "]",
-      this->m_objName,
+      this->m_objName.toChar(),
       port
     );
-    this->m_productRequestOut_OutputPort[port].setObjName(portName);
+    this->m_productRequestOut_OutputPort[port].setObjName(portName.toChar());
 #endif
   }
 
@@ -140,21 +124,13 @@ void ActiveAsyncProductPortsOnlyComponentBase ::
     this->m_productSendOut_OutputPort[port].init();
 
 #if FW_OBJECT_NAMES == 1
-    // The port name consists of this->m_objName and some extra info.
-    // We expect all of this to fit in FW_OBJ_NAME_MAX_SIZE bytes.
-    // However, the compiler may assume that this->m_objName fills
-    // the entire array, whose size is FW_OBJ_NAME_MAX_SIZE. So to
-    // avoid a compiler warning, we provide an extra FW_OBJ_NAME_MAX_SIZE
-    // bytes to cover the extra info.
-    char portName[2*FW_OBJ_NAME_MAX_SIZE];
-    (void) snprintf(
-      portName,
-      sizeof(portName),
+    Fw::ObjectName portName;
+    portName.format(
       "%s_productSendOut_OutputPort[%" PRI_PlatformIntType "]",
-      this->m_objName,
+      this->m_objName.toChar(),
       port
     );
-    this->m_productSendOut_OutputPort[port].setObjName(portName);
+    this->m_productSendOut_OutputPort[port].setObjName(portName.toChar());
 #endif
   }