Changeset 1019


Ignore:
Timestamp:
Oct 13, 2015, 4:21:06 PM (8 years ago)
Author:
cfuguet
Message:

Fixing some warnings for new compiler's versions

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/reconfiguration/modules/dspin_local_crossbar/caba/source/src/dspin_local_crossbar.cpp

    r1001 r1019  
    279279        size_t              get_out[m_local_outputs+1]; // output ports -> input ports
    280280        bool                put_in[m_local_inputs+1];   // input ports  -> output ports
    281         internal_flit_t     data_in[m_local_inputs+1];  // input ports  -> output ports
     281        internal_flit_t*    data_in = new internal_flit_t[m_local_inputs+1];
    282282
    283283        // control signals for the input fifos
    284284        bool                fifo_in_write[m_local_inputs+1];
    285285        bool                fifo_in_read[m_local_inputs+1];
    286         internal_flit_t     fifo_in_wdata[m_local_inputs+1];
     286        internal_flit_t*    fifo_in_wdata = new internal_flit_t[m_local_inputs+1];
    287287
    288288        // control signals for the output fifos
    289289        bool                fifo_out_write[m_local_outputs+1];
    290290        bool                fifo_out_read[m_local_outputs+1];
    291         internal_flit_t     fifo_out_wdata[m_local_outputs+1];
     291        internal_flit_t*    fifo_out_wdata = new internal_flit_t[m_local_outputs+1];
    292292
    293293        // local-to-global and global-to-local hardware barrier enable signal
     
    551551                                 fifo_out_wdata[j]);
    552552        }
     553
     554        delete [] data_in;
     555        delete [] fifo_in_wdata;
     556        delete [] fifo_out_wdata;
    553557    } // end transition
    554558
  • branches/reconfiguration/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

    r1014 r1019  
    697697    {
    698698        const uint32_t srcid_width = vci_param_int::S;
    699 
    700         uint8_t req_x = (req_srcid >> (srcid_width - m_x_width));
    701         uint8_t req_y = (req_srcid >> (srcid_width - m_x_width - m_y_width)) & ((1 << m_y_width) - 1);
    702 
    703         return abs(m_x_self - req_x) + abs(m_y_self - req_y) + 1;
     699        int req_x = (req_srcid >> (srcid_width - m_x_width));
     700        int req_y = (req_srcid >> (srcid_width - m_x_width - m_y_width)) & ((1 << m_y_width) - 1);
     701
     702        return abs((int)m_x_self - req_x) + abs((int)m_y_self - req_y) + 1;
    704703    }
    705704
  • trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h

    r650 r1019  
    129129        xor_counter = new_counter ^ r_last_counter;
    130130
    131         for (size_t i = nb_slots - 1; i >= 0; --i)
     131        for (int i = (int)nb_slots - 1; i >= 0; --i)
    132132        {
    133133            if(xor_counter & (1 << i))
Note: See TracChangeset for help on using the changeset viewer.