Changeset 512 for trunk/platforms

Timestamp:

Sep 3, 2013, 1:51:37 PM (11 years ago)

Author:

meunier

Message:

Tried to supress a few errors from valgrind; added corresponding delete and free in destructors (tsar_generic_xbar/top.cpp, tsar_xbar_cluster, vci_mem_cache)

Location:

trunk/platforms/tsar_generic_xbar

Files:

• top.cpp (modified) (2 diffs)
• tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (1 diff)

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -951 +951 @@
 
    
+   // Free memory
    for (size_t i = 0; i  < (XMAX * YMAX); i++)
    {
@@ -957 +958 @@
       delete clusters[x][y];
    }
+
+   dealloc_elems<DspinSignals<dspin_cmd_width> >(signal_dspin_h_cmd_inc, XMAX - 1, YMAX, 3);
+   dealloc_elems<DspinSignals<dspin_cmd_width> >(signal_dspin_h_cmd_dec, XMAX - 1, YMAX, 3);
+   dealloc_elems<DspinSignals<dspin_rsp_width> >(signal_dspin_h_rsp_inc, XMAX - 1, YMAX, 2);
+   dealloc_elems<DspinSignals<dspin_rsp_width> >(signal_dspin_h_rsp_dec, XMAX - 1, YMAX, 2);
+   dealloc_elems<DspinSignals<dspin_cmd_width> >(signal_dspin_v_cmd_inc, XMAX, YMAX - 1, 3);
+   dealloc_elems<DspinSignals<dspin_cmd_width> >(signal_dspin_v_cmd_dec, XMAX, YMAX - 1, 3);
+   dealloc_elems<DspinSignals<dspin_rsp_width> >(signal_dspin_v_rsp_inc, XMAX, YMAX - 1, 2);
+   dealloc_elems<DspinSignals<dspin_rsp_width> >(signal_dspin_v_rsp_dec, XMAX, YMAX - 1, 2);
+   dealloc_elems<DspinSignals<dspin_cmd_width> >(signal_dspin_false_cmd_in, XMAX, YMAX, 4, 3);
+   dealloc_elems<DspinSignals<dspin_cmd_width> >(signal_dspin_false_cmd_out, XMAX, YMAX, 4, 3);
+   dealloc_elems<DspinSignals<dspin_rsp_width> >(signal_dspin_false_rsp_in, XMAX, YMAX, 4, 2);
+   dealloc_elems<DspinSignals<dspin_rsp_width> >(signal_dspin_false_rsp_out, XMAX, YMAX, 4, 2);
 
    return EXIT_SUCCESS;

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -789 +789 @@
                                                  vci_param_ext>::~TsarXbarCluster() {
 
+    dealloc_elems<DspinInput<dspin_cmd_width> > (p_cmd_in, 4, 3);
+    dealloc_elems<DspinOutput<dspin_cmd_width> >(p_cmd_out, 4, 3);
+    dealloc_elems<DspinInput<dspin_rsp_width> > (p_rsp_in, 4, 2);
+    dealloc_elems<DspinOutput<dspin_rsp_width> >(p_rsp_out, 4, 2);
+
     for (size_t p = 0; p < n_procs; p++)
     {