removed most mallocs

Author: SamuelHo10

libs/libarchfpga/src/arch_util.cpp

@@ -335,7 +335,7 @@ static void free_pb_type(t_pb_type* pb_type) {
                 for (int m = 0; m < pb_type->modes[i].interconnect[j].annotations[k].num_value_prop_pairs; ++m) {
                     vtr::free(pb_type->modes[i].interconnect[j].annotations[k].value[m]);
                 }
-                vtr::free(pb_type->modes[i].interconnect[j].annotations[k].prop);
+                delete[] pb_type->modes[i].interconnect[j].annotations[k].prop;
                 vtr::free(pb_type->modes[i].interconnect[j].annotations[k].value);
             }
             vtr::free(pb_type->modes[i].interconnect[j].annotations);
@@ -355,7 +355,7 @@ static void free_pb_type(t_pb_type* pb_type) {
             vtr::free(pb_type->annotations[i].value[j]);
         }
         vtr::free(pb_type->annotations[i].value);
-        vtr::free(pb_type->annotations[i].prop);
+        delete[] pb_type->annotations[i].prop;
         if (pb_type->annotations[i].input_pins) {
             vtr::free(pb_type->annotations[i].input_pins);
         }
@@ -367,7 +367,7 @@ static void free_pb_type(t_pb_type* pb_type) {
         }
     }
     if (pb_type->num_annotations > 0) {
-        vtr::free(pb_type->annotations);
+        delete[] pb_type->annotations;
     }
 
     if (pb_type->pb_type_power) {
@@ -527,7 +527,7 @@ void alloc_and_load_default_child_for_pb_type(t_pb_type* pb_type,
         }
     }
 
-    copy->annotations = (t_pin_to_pin_annotation*)vtr::calloc(pb_type->num_annotations, sizeof(t_pin_to_pin_annotation));
+    copy->annotations = new t_pin_to_pin_annotation[pb_type->num_annotations]();
     copy->num_annotations = pb_type->num_annotations;
     for (i = 0; i < copy->num_annotations; i++) {
         copy->annotations[i].clock = vtr::strdup(pb_type->annotations[i].clock);
@@ -549,7 +549,7 @@ void alloc_and_load_default_child_for_pb_type(t_pb_type* pb_type,
         copy->annotations[i].format = pb_type->annotations[i].format;
         copy->annotations[i].type = pb_type->annotations[i].type;
         copy->annotations[i].num_value_prop_pairs = pb_type->annotations[i].num_value_prop_pairs;
-        copy->annotations[i].prop = (int*)vtr::malloc(sizeof(int) * pb_type->annotations[i].num_value_prop_pairs);
+        copy->annotations[i].prop = new int[pb_type->annotations[i].num_value_prop_pairs];
         copy->annotations[i].value = (char**)vtr::malloc(sizeof(char*) * pb_type->annotations[i].num_value_prop_pairs);
         for (j = 0; j < pb_type->annotations[i].num_value_prop_pairs; j++) {
             copy->annotations[i].prop[j] = pb_type->annotations[i].prop[j];
@@ -627,8 +627,7 @@ void ProcessLutClass(t_pb_type* lut_pb_type) {
         lut_pb_type->modes[0].interconnect[0].annotations[i].format = lut_pb_type->annotations[i].format;
         lut_pb_type->modes[0].interconnect[0].annotations[i].type = lut_pb_type->annotations[i].type;
         lut_pb_type->modes[0].interconnect[0].annotations[i].num_value_prop_pairs = lut_pb_type->annotations[i].num_value_prop_pairs;
-        lut_pb_type->modes[0].interconnect[0].annotations[i].prop = (int*)vtr::malloc(sizeof(int)
-                                                                                      * lut_pb_type->annotations[i].num_value_prop_pairs);
+        lut_pb_type->modes[0].interconnect[0].annotations[i].prop = new int[lut_pb_type->annotations[i].num_value_prop_pairs];
         lut_pb_type->modes[0].interconnect[0].annotations[i].value = (char**)vtr::malloc(sizeof(char*)
                                                                                          * lut_pb_type->annotations[i].num_value_prop_pairs);
         for (j = 0; j < lut_pb_type->annotations[i].num_value_prop_pairs; j++) {
@@ -654,7 +653,7 @@ void ProcessLutClass(t_pb_type* lut_pb_type) {
             free(lut_pb_type->annotations[i].value[j]);
         }
         free(lut_pb_type->annotations[i].value);
-        free(lut_pb_type->annotations[i].prop);
+        delete[] lut_pb_type->annotations[i].prop;
         if (lut_pb_type->annotations[i].input_pins) {
             free(lut_pb_type->annotations[i].input_pins);
         }
@@ -666,7 +665,7 @@ void ProcessLutClass(t_pb_type* lut_pb_type) {
         }
     }
     lut_pb_type->num_annotations = 0;
-    free(lut_pb_type->annotations);
+    delete[] lut_pb_type->annotations;
     lut_pb_type->annotations = nullptr;
     lut_pb_type->modes[1].pb_type_children[0].depth = lut_pb_type->depth + 1;
     lut_pb_type->modes[1].pb_type_children[0].parent_mode = &lut_pb_type->modes[1];
@@ -944,7 +943,7 @@ void SyncModelsPbTypes_rec(t_arch* arch,
 
         pb_type->model_id = model_match_prim_id;
         vtr::t_linked_vptr* old = model_match_prim.pb_types;
-        model_match_prim.pb_types = (vtr::t_linked_vptr*)vtr::malloc(sizeof(vtr::t_linked_vptr));
+        model_match_prim.pb_types = new vtr::t_linked_vptr;
         model_match_prim.pb_types->next = old;
         model_match_prim.pb_types->data_vptr = pb_type;
 

libs/libarchfpga/src/echo_arch.cpp

@@ -383,7 +383,7 @@ static void print_model(FILE* echo, const t_model& model) {
 static void PrintPb_types_rec(FILE* Echo, const t_pb_type* pb_type, int level, const LogicalModels& models) {
     char* tabs;
 
-    tabs = (char*)vtr::malloc((level + 1) * sizeof(char));
+    tabs = new char[level + 1];
     for (int i = 0; i < level; i++) {
         tabs[i] = '\t';
     }
@@ -455,7 +455,7 @@ static void PrintPb_types_rec(FILE* Echo, const t_pb_type* pb_type, int level, c
     if (pb_type->pb_type_power) {
         PrintPb_types_recPower(Echo, pb_type, tabs);
     }
-    free(tabs);
+    delete[] tabs;
 }
 
 //Added May 2013 Daniel Chen, help dump arch info after loading from XML

libs/libarchfpga/src/logic_types.cpp

@@ -144,7 +144,7 @@ void LogicalModels::free_model_data(t_model& model) {
     while (vptr) {
         vtr::t_linked_vptr* vptr_prev = vptr;
         vptr = vptr->next;
-        vtr::free(vptr_prev);
+        delete vptr_prev;
     }
 
     if (model.instances)

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -536,7 +536,7 @@ void XmlReadArch(const char* ArchFile,
                 t_clock_arch* clocks_fake = (t_clock_arch*)vtr::calloc(1,
                                                                        sizeof(t_clock_arch));
                 ProcessClocks(Next, clocks_fake, loc_data);
-                free(clocks_fake->clock_inf);
+                delete[] clocks_fake->clock_inf;
                 free(clocks_fake);
             }
         }
@@ -887,7 +887,7 @@ static void ProcessPinToPinAnnotations(pugi::xml_node Parent,
     }
 
     annotation->num_value_prop_pairs = i;
-    annotation->prop = (int*)vtr::calloc(i, sizeof(int));
+    annotation->prop = new int[i]();
     annotation->value = (char**)vtr::calloc(i, sizeof(char*));
     annotation->line_num = loc_data.line(Parent);
     /* Todo: This is slow, I should use a case lookup */
@@ -1377,7 +1377,7 @@ static void ProcessPb_Type(pugi::xml_node Parent,
             num_annotations += count_children(Parent, child_name, loc_data, ReqOpt::OPTIONAL);
         }
 
-        pb_type->annotations = (t_pin_to_pin_annotation*)vtr::calloc(num_annotations, sizeof(t_pin_to_pin_annotation));
+        pb_type->annotations = new t_pin_to_pin_annotation[num_annotations]();
         pb_type->num_annotations = num_annotations;
 
         int annotation_idx = 0;
@@ -4725,7 +4725,7 @@ static void ProcessClocks(pugi::xml_node Parent, t_clock_arch* clocks, const pug
     /* Alloc the clockdetails */
     clocks->clock_inf = nullptr;
     if (clocks->num_global_clocks > 0) {
-        clocks->clock_inf = (t_clock_network*)vtr::malloc(clocks->num_global_clocks * sizeof(t_clock_network));
+        clocks->clock_inf = new t_clock_network[clocks->num_global_clocks];
         memset(clocks->clock_inf, 0,
                clocks->num_global_clocks * sizeof(t_clock_network));
     }