Fixed some memory leaks

Signed-off-by: Maciej Kurc <[email protected]>

Author: mkurc-ant

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -1041,7 +1041,7 @@ struct ArchReader {
         std::string opin = pin + pad_out_suffix_;
 
         auto num_ports = 2;
-        auto ports = new t_port[num_ports];
+        auto ports = (t_port*)vtr::calloc(num_ports, sizeof(t_port));
         pad->ports = ports;
         pad->num_ports = pad->num_pins = num_ports;
         pad->num_input_pins = 1;
@@ -1078,7 +1078,7 @@ struct ArchReader {
         omode->num_pb_type_children = 1;
         omode->pb_type_children = new t_pb_type[1];
 
-        auto opad = new t_pb_type;
+        auto opad = &omode->pb_type_children[0];
         opad->name = vtr::strdup("opad");
         opad->num_pb = 1;
         opad->parent_mode = omode;
@@ -1090,7 +1090,6 @@ struct ArchReader {
         opad->model = get_model(arch_, std::string(MODEL_OUTPUT));
 
         opad->ports[0] = get_generic_port(arch_, opad, IN_PORT, "outpad", MODEL_OUTPUT);
-        omode->pb_type_children[0] = *opad;
 
         // IPAD mode
         auto imode = &pad->modes[1];
@@ -1100,7 +1099,7 @@ struct ArchReader {
         imode->num_pb_type_children = 1;
         imode->pb_type_children = new t_pb_type[1];
 
-        auto ipad = new t_pb_type;
+        auto ipad = &imode->pb_type_children[0];
         ipad->name = vtr::strdup("ipad");
         ipad->num_pb = 1;
         ipad->parent_mode = imode;
@@ -1112,7 +1111,6 @@ struct ArchReader {
         ipad->model = get_model(arch_, std::string(MODEL_INPUT));
 
         ipad->ports[0] = get_generic_port(arch_, ipad, OUT_PORT, "inpad", MODEL_INPUT);
-        imode->pb_type_children[0] = *ipad;
 
         // Handle interconnects
         int num_pins = 1;
@@ -1131,8 +1129,8 @@ struct ArchReader {
         std::string ipad_ostr = std::string(pad->name) + std::string(".") + opin;
         std::string i_ic_name = std::string(ipad->name) + std::string("_") + std::string(pad->name);
 
-        auto o_ic = new t_interconnect[num_pins];
-        auto i_ic = new t_interconnect[num_pins];
+        auto o_ic = &omode->interconnect[0];
+        auto i_ic = &imode->interconnect[0];
 
         o_ic->name = vtr::strdup(o_ic_name.c_str());
         o_ic->type = DIRECT_INTERC;
@@ -1148,8 +1146,6 @@ struct ArchReader {
         i_ic->input_string = vtr::strdup(ipad_istr.c_str());
         i_ic->output_string = vtr::strdup(ipad_ostr.c_str());
 
-        omode->interconnect[0] = *o_ic;
-        imode->interconnect[0] = *i_ic;
     }
 
     void process_generic_block(t_pb_type* pb_type, Device::BEL::Reader& bel) {
@@ -1273,7 +1269,7 @@ struct ArchReader {
         std::unordered_set<std::string> names;
 
         auto num_ports = pins.size();
-        auto ports = new t_port[num_ports];
+        auto ports = (t_port*)vtr::calloc(num_ports, sizeof(t_port));
         pb_type->ports = ports;
         pb_type->num_ports = pb_type->num_pins = num_ports;
         pb_type->num_input_pins = 0;
@@ -1337,7 +1333,7 @@ struct ArchReader {
                 auto outs = vtr::split(outputs, " ");
                 auto ins = vtr::split(inputs, " ");
                 ic->num_annotations = outs.size();
-                ic->annotations = new t_pin_to_pin_annotation[outs.size()];
+                ic->annotations = (t_pin_to_pin_annotation*)vtr::calloc(outs.size(), sizeof(t_pin_to_pin_annotation));
                 VTR_ASSERT(ins.size() == 1);
 
                 // pack pattern
@@ -1362,23 +1358,23 @@ struct ArchReader {
     }
 
     t_pin_to_pin_annotation get_pack_pattern(std::string ic_name, std::string input, std::string output) {
-        auto pp = new t_pin_to_pin_annotation;
+        t_pin_to_pin_annotation pp;
 
         std::string pp_name = ic_name + "_" + output;
 
-        pp->prop = (int*)vtr::calloc(1, sizeof(int));
-        pp->value = (char**)vtr::calloc(1, sizeof(char*));
+        pp.prop = (int*)vtr::calloc(1, sizeof(int));
+        pp.value = (char**)vtr::calloc(1, sizeof(char*));
 
-        pp->type = E_ANNOT_PIN_TO_PIN_PACK_PATTERN;
-        pp->format = E_ANNOT_PIN_TO_PIN_CONSTANT;
-        pp->prop[0] = (int)E_ANNOT_PIN_TO_PIN_PACK_PATTERN_NAME;
-        pp->value[0] = vtr::strdup(pp_name.c_str());
-        pp->input_pins = vtr::strdup(input.c_str());
-        pp->output_pins = vtr::strdup(output.c_str());
-        pp->num_value_prop_pairs = 1;
-        pp->clock = nullptr;
+        pp.type = E_ANNOT_PIN_TO_PIN_PACK_PATTERN;
+        pp.format = E_ANNOT_PIN_TO_PIN_CONSTANT;
+        pp.prop[0] = (int)E_ANNOT_PIN_TO_PIN_PACK_PATTERN_NAME;
+        pp.value[0] = vtr::strdup(pp_name.c_str());
+        pp.input_pins = vtr::strdup(input.c_str());
+        pp.output_pins = vtr::strdup(output.c_str());
+        pp.num_value_prop_pairs = 1;
+        pp.clock = nullptr;
 
-        return *pp;
+        return pp;
     }
 
     // Physical Tiles