Merge pull request verilog-to-routing#660 from j-b-1-7/odin_leak_instantiate_hard_multiplier

odin_leak: fix memory leak in instantiate_hard_multiplier function

Author: jeanlego

ODIN_II/SRC/multipliers.cpp

@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <algorithm>
 #include <cmath>
+#include <string>
 #include "odin_types.h"
 #include "node_creation_library.h"
 #include "multipliers.h"
@@ -38,6 +39,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "vtr_memory.h"
 #include "vtr_list.h"
+#include "vtr_util.h"
 
 
 using vtr::t_linked_vptr;
@@ -395,39 +397,55 @@ void declare_hard_multiplier(nnode_t *node)
  *-------------------------------------------------------------------------*/
 void instantiate_hard_multiplier(nnode_t *node, short mark, netlist_t * /*netlist*/)
 {
-	char *new_name;
-	int len, sanity, i;
+	oassert(node
+	 && "node is NULL to instanciate hard multiplier");
 
 	declare_hard_multiplier(node);
 
-	/* Need to give node proper name */
-	len = strlen(node->name);
-	len = len + 20; /* 20 chars should hold mul specs */
-	new_name = (char*)vtr::malloc(len);
+	std::string node_name = "";
+	if( node->name )
+	{	
+		node_name = node->name;
+		vtr::free(node->name);
+		node->name = NULL;
+	}
 
-	/* wide input first :) */
-	if (node->input_port_sizes[0] > node->input_port_sizes[1])
-		sanity = odin_sprintf(new_name, "%s_%d_%d_%d", node->name, node->input_port_sizes[0], node->input_port_sizes[1], node->output_port_sizes[0]);
+	if(node->num_output_pins <= 0)
+	{
+		/* wide input first :) */
+		int portA = 0;
+		int portB = 1;
+		if (node->input_port_sizes[1] > node->input_port_sizes[0])
+		{
+			portA = 1;
+			portB = 0;
+		}
+		std::string tmp(
+			node_name +
+			"_" + std::to_string(node->input_port_sizes[portA]) +
+			"_" + std::to_string(node->input_port_sizes[portB]) +
+			"_" + std::to_string(node->output_port_sizes[0])
+		);
+		node->name = vtr::strdup(tmp.c_str());
+	}
 	else
-		sanity = odin_sprintf(new_name, "%s_%d_%d_%d", node->name, node->input_port_sizes[1], node->input_port_sizes[0], node->output_port_sizes[0]);
-
-	if (len <= sanity) /* buffer not large enough */
-		oassert(FALSE);
-
-	/* Give names to the output pins */
-	for (i = 0; i < node->num_output_pins;  i++)
 	{
-		if (node->output_pins[i]->name)
+		/* Give names to the output pins */
+		for (int i = 0; i < node->num_output_pins;  i++)
 		{
-			vtr::free(node->output_pins[i]->name);
+			if (node->output_pins[i]->name)
+			{
+				vtr::free(node->output_pins[i]->name);
+			}
+			//build the output string
+			std::string tmp( 
+				node_name + 
+				"[" + std::to_string(node->output_pins[i]->pin_node_idx) + "]"
+			);
+			node->output_pins[i]->name = vtr::strdup(tmp.c_str());
 		}
-		len = strlen(node->name) + 6; /* 6 chars for pin idx */
-		new_name = (char*)vtr::malloc(len);
-		odin_sprintf(new_name, "%s[%d]", node->name, node->output_pins[i]->pin_node_idx);
-		node->output_pins[i]->name = new_name;
+		node->name = vtr::strdup(node->output_pins[node->num_output_pins-1]->name);
 	}
-	vtr::free(node->name);
-	node->name = new_name;
 	node->traverse_visited = mark;
 	return;
 }