Changeset 1019

Timestamp:

Oct 13, 2015, 4:21:06 PM (9 years ago)

Author:

cfuguet

Message:

Fixing some warnings for new compiler's versions

Files:

• branches/reconfiguration/modules/dspin_local_crossbar/caba/source/src/dspin_local_crossbar.cpp (modified) (2 diffs)
• branches/reconfiguration/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (1 diff)
• trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h (modified) (1 diff)

branches/reconfiguration/modules/dspin_local_crossbar/caba/source/src/dspin_local_crossbar.cpp

@@ -279 +279 @@
         size_t              get_out[m_local_outputs+1]; // output ports -> input ports
         bool                put_in[m_local_inputs+1];   // input ports  -> output ports
-        internal_flit_t     data_in[m_local_inputs+1];  // input ports  -> output ports
+        internal_flit_t*    data_in = new internal_flit_t[m_local_inputs+1];
 
         // control signals for the input fifos
         bool                fifo_in_write[m_local_inputs+1];
         bool                fifo_in_read[m_local_inputs+1];
-        internal_flit_t     fifo_in_wdata[m_local_inputs+1];
+        internal_flit_t*    fifo_in_wdata = new internal_flit_t[m_local_inputs+1];
 
         // control signals for the output fifos
         bool                fifo_out_write[m_local_outputs+1];
         bool                fifo_out_read[m_local_outputs+1];
-        internal_flit_t     fifo_out_wdata[m_local_outputs+1];
+        internal_flit_t*    fifo_out_wdata = new internal_flit_t[m_local_outputs+1];
 
         // local-to-global and global-to-local hardware barrier enable signal
@@ -551 +551 @@
                                  fifo_out_wdata[j]);
         }
+
+        delete [] data_in;
+        delete [] fifo_in_wdata;
+        delete [] fifo_out_wdata;
     } // end transition
 

branches/reconfiguration/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -697 +697 @@
     {
         const uint32_t srcid_width = vci_param_int::S;
-
-        uint8_t req_x = (req_srcid >> (srcid_width - m_x_width));
-        uint8_t req_y = (req_srcid >> (srcid_width - m_x_width - m_y_width)) & ((1 << m_y_width) - 1);
-
-        return abs(m_x_self - req_x) + abs(m_y_self - req_y) + 1;
+        int req_x = (req_srcid >> (srcid_width - m_x_width));
+        int req_y = (req_srcid >> (srcid_width - m_x_width - m_y_width)) & ((1 << m_y_width) - 1);
+
+        return abs((int)m_x_self - req_x) + abs((int)m_y_self - req_y) + 1;
     }
 

trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h

@@ -129 +129 @@
         xor_counter = new_counter ^ r_last_counter;
 
-        for (size_t i = nb_slots - 1; i >= 0; --i)
+        for (int i = (int)nb_slots - 1; i >= 0; --i)
         {
             if(xor_counter & (1 << i))