fix leak when ipo is enabled

Author: jeanlego

ODIN_II/SRC/adders.cpp

@@ -51,7 +51,7 @@ t_linked_vptr *add_list = NULL;
 t_linked_vptr *processed_adder_list = NULL;
 t_linked_vptr *chain_list = NULL;
 int total = 0;
-int *adder = NULL;
+static int *adder = NULL;
 int min_add = 0;
 int min_threshold_adder = 0;
 
@@ -67,13 +67,10 @@ void init_split_adder(nnode_t *node, nnode_t *ptr, int a, int sizea, int b, int
  *-------------------------------------------------------------------------*/
 void init_add_distribution()
 {
-	int i, j;
 	oassert(hard_adders != NULL);
-	j = hard_adders->inputs->size + hard_adders->inputs->next->size;
-	adder = (int *)vtr::malloc(sizeof(int) * (j + 1));
-	for (i = 0; i <= j; i++)
-		adder[i] = 0;
-	return;
+
+	int len = hard_adders->inputs->size + hard_adders->inputs->next->size + 1;
+	adder = (int *)vtr::calloc(len, sizeof(int));
 }
 
 /*---------------------------------------------------------------------------
@@ -84,7 +81,12 @@ void record_add_distribution(nnode_t *node)
 	oassert(hard_adders != NULL);
 	oassert(node != NULL);
 	adder[hard_adders->inputs->size] += 1;
-	return;
+}
+
+void terminate_add_distribution()
+{
+	oassert(hard_adders != NULL);
+	vtr::free(adder);
 }
 
 /*---------------------------------------------------------------------------

ODIN_II/SRC/include/adders.h

@@ -55,6 +55,8 @@ extern int min_threshold_adder;
 
 void init_add_distribution();
 void report_add_distribution();
+void terminate_add_distribution();
+
 void declare_hard_adder(nnode_t *node);
 void instantiate_hard_adder(nnode_t *node, short mark, netlist_t *netlist);
 void instantiate_simple_soft_adder(nnode_t *node, short mark, netlist_t *netlist);

ODIN_II/SRC/include/multipliers.h

@@ -38,6 +38,8 @@ extern vtr::t_linked_vptr *mult_list;
 extern int min_mult;
 
 extern void init_mult_distribution();
+void terminate_mult_distribution();
+
 extern void report_mult_distribution();
 extern void declare_hard_multiplier(nnode_t *node);
 extern void instantiate_hard_multiplier(nnode_t *node, short mark, netlist_t *netlist);

ODIN_II/SRC/multipliers.cpp

@@ -49,7 +49,7 @@ using vtr::insert_in_vptr_list;
 t_model *hard_multipliers = NULL;
 t_linked_vptr *mult_list = NULL;
 int min_mult = 0;
-int *mults = NULL;
+static int *mults = NULL;
 
 void record_mult_distribution(nnode_t *node);
 void init_split_multiplier(nnode_t *node, nnode_t *ptr, int offa, int a, int offb, int b, nnode_t *node_a, nnode_t *node_b);
@@ -275,14 +275,15 @@ void instantiate_simple_soft_multiplier(nnode_t *node, short mark, netlist_t *ne
  *-------------------------------------------------------------------------*/
 void init_mult_distribution()
 {
-	int i, j;
+	oassert(hard_multipliers != NULL);
+	int len = ( 1 + hard_multipliers->inputs->size ) * ( 1 + hard_multipliers->inputs->next->size );
+	mults = (int *)vtr::calloc(len, sizeof(int));
+}
 
+void terminate_mult_distribution()
+{
 	oassert(hard_multipliers != NULL);
-	mults = (int *)vtr::malloc(sizeof(int) * (hard_multipliers->inputs->size + 1) * (1 + hard_multipliers->inputs->next->size));
-	for (i = 0; i <= hard_multipliers->inputs->size; i++)
-		for (j = 0; j <= hard_multipliers->inputs->next->size; j++)
-			mults[i * hard_multipliers->inputs->size + j] = 0;
-	return;
+	vtr::free(mults);
 }
 
 /*---------------------------------------------------------------------------

ODIN_II/SRC/odin_ii.cpp

@@ -192,8 +192,13 @@ static ODIN_ERROR_CODE synthesize_verilog()
 	printf("--------------------------------------------------------------------\n");
 
 	report_mult_distribution();
+	terminate_mult_distribution();
+
 	report_add_distribution();
+	terminate_add_distribution();
+
 	report_sub_distribution();
+
 	deregister_hard_blocks();
 
 	//cleanup netlist

ODIN_II/SRC/subtractions.cpp

@@ -44,7 +44,6 @@ using vtr::t_linked_vptr;
 t_linked_vptr *sub_list = NULL;
 t_linked_vptr *sub_chain_list = NULL;
 int subchaintotal = 0;
-int *sub = NULL;
 
 void init_split_adder_for_sub(nnode_t *node, nnode_t *ptr, int a, int sizea, int b, int sizeb, int cin, int cout, int index, int flag);