Changeset 458 for branches/RWT

Timestamp:

Jul 19, 2013, 2:21:49 PM (11 years ago)

Author:

lgarcia

Message:

Cosmetic (suppression of warning in memcache and vcache)

Location:

branches/RWT/modules

Files:

• vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (modified) (1 diff)
• vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (modified) (9 diffs)
• vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (3 diffs)

branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h

@@ -549 +549 @@
     GenericFifo<uint32_t>   r_vci_rsp_fifo_dcache;              // response FIFO to DCACHE FSM
     
-    GenericFifo<uint32_t>   r_cc_send_data_fifo;   
-
     //RWT
     GenericFifo<bool>       r_vci_rsp_fifo_rpktid;
+
+
+    GenericFifo<uint32_t>   r_cc_send_data_fifo;   
+
 
     ///////////////////////////////////

branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp

@@ -1117 +1117 @@
                 else
                 {
-                                r_icache_vci_paddr = (paddr_t)r_mmu_word_hi.read() << 32 |
+                                r_icache_vci_paddr = (uint64_t)r_mmu_word_hi.read() << 32 |
                                                          (paddr_t)r_mmu_word_lo.read();
                         }
@@ -2247 +2247 @@
                 // we take into account the paddr extension
                 if (vci_param::N > 32) 
-                    paddr = paddr | ((paddr_t)(r_dcache_paddr_ext.read()) << 32);
+                    paddr = paddr | ((uint64_t)(r_dcache_paddr_ext.read()) << 32);
             }
         } // end physical address computation
@@ -2565 +2565 @@
                         else
                         {
-                            r_dcache_save_paddr = (paddr_t)r_mmu_word_hi.read() << 32 |
+                            r_dcache_save_paddr = ((uint64_t)r_mmu_word_hi.read()) << 32 |
                                                   (paddr_t)r_mmu_word_lo.read();
                         }
@@ -3325 +3325 @@
         }
 
-        uint32_t        pte_flags;
-        uint32_t        pte_ppn;
-        size_t          way;
-        size_t          set;
-        size_t          word;
-        int         cache_state;
+        uint32_t        pte_flags       = 0;
+        uint32_t        pte_ppn         = 0;
+        size_t          way             = 0;
+        size_t          set             = 0;
+        size_t          word            = 0;
+        int         cache_state     = 0;
 
         r_dcache.read( r_dcache_tlb_paddr.read(),
@@ -3860 +3860 @@
                     r_dcache_xtn_flush_data_cpt = 0;
                     r_dcache_cc_cleanup_updt_data = true;
-                    for (int w = 0; w< m_dcache_words; w++)
+                    for (size_t w = 0; w < m_dcache_words; w++)
                     {
                         m_cpt_cleanup_data_dirty_word += r_dcache_dirty_word[(m_dcache_sets*way+set)*m_dcache_words + w];
@@ -4100 +4100 @@
                     {
                         r_dcache_cc_cleanup_updt_data = true;
-                        for (int w = 0; w< m_dcache_words; w++)
+                        for (size_t w = 0; w< m_dcache_words; w++)
                         {
                             m_cpt_cleanup_data_dirty_word += r_dcache_dirty_word[(m_dcache_sets*way+set)*m_dcache_words + w];
@@ -4274 +4274 @@
                         {
                             r_dcache_cc_cleanup_updt_data = true;
-                            for (int w = 0; w< m_dcache_words; w++)
+                            for (size_t w = 0; w< m_dcache_words; w++)
                             {
                                 m_cpt_cleanup_data_dirty_word += r_dcache_dirty_word[(m_dcache_sets*way+set)*m_dcache_words + w];
@@ -4606 +4606 @@
                                         CACHE_SLOT_STATE_VALID_NCC );
                     r_dcache_content_state[way*m_dcache_sets+set] = LINE_CACHE_DATA_NOT_DIRTY;
-                    for (int word =0; word < m_dcache_words ; word++)
+                    for (size_t word = 0; word < m_dcache_words ; word++)
                     {
                         r_dcache_dirty_word[(way*m_dcache_sets +set)*m_dcache_words+word] = 0;
@@ -5197 +5197 @@
                 {
                     r_dcache_cc_cleanup_updt_data = true;
-                    for (int w = 0; w< m_dcache_words; w++)
+                    for (size_t w = 0; w < m_dcache_words; w++)
                     {
                         m_cpt_cleanup_data_dirty_word += r_dcache_dirty_word[(m_dcache_sets*way+set)*m_dcache_words + w];

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

@@ -353 +353 @@
   : soclib::caba::BaseModule(name),
 
+    m_monitor_ok(false),
     p_clk( "p_clk" ),
     p_resetn( "p_resetn" ),
@@ -360 +361 @@
     p_dspin_out( "p_dspin_out" ),
 
-    m_monitor_ok(false),
     m_seglist( mtp.getSegmentList(tgtid_d) ),
     m_nseg( 0 ),
@@ -1326 +1326 @@
             error            = 0;
             r_config_address = (r_config_address.read() & 0x00000000FFFFFFFFLL) |
-                               ((addr_t)p_vci_tgt.wdata.read())<<32;
+                               ((uint64_t)p_vci_tgt.wdata.read())<<32;
         }
         else if ( (p_vci_tgt.cmd.read() == vci_param_int::CMD_WRITE)   // set buf_lines