Changeset 338 for branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence

Timestamp:

Mar 28, 2013, 2:12:01 PM (12 years ago)

Author:

joannou

Message:

• In vci_cc_vcache_wrapper_dspin_coherence, modified both states DCACHE_TLB_PTE1_GET and DCACHE_TLB_PTE2_GET to take into account the zombi state of a chache line
• In vci_mem_cache_dspin_coherence, added so traces

File:

• branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/src/vci_cc_vcache_wrapper_dspin_coherence.cpp (modified) (5 diffs)

branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/src/vci_cc_vcache_wrapper_dspin_coherence.cpp

@@ -2861 +2861 @@
         size_t          set;
         size_t          word;
-
-        bool     hit = r_dcache.read( r_dcache_tlb_paddr.read(),
-                                      &entry,
-                                      &way,
-                                      &set,
-                                      &word );
+        int         cache_state;
+        r_dcache.read( r_dcache_tlb_paddr.read(),
+                       &entry,
+                       &way,
+                       &set,
+                       &word,
+                       &cache_state );
 #ifdef INSTRUMENTATION
 m_cpt_dcache_data_read++;
 m_cpt_dcache_dir_read++;
 #endif
-        if ( hit )      //  hit in dcache
+        if ( cache_state == CACHE_SLOT_STATE_VALID )   // hit in dcache
         {
             if ( not (entry & PTE_V_MASK) )     // unmapped
@@ -2960 +2961 @@
 #endif
             }
+        }
+        else if ( cache_state == CACHE_SLOT_STATE_ZOMBI ) // pending cleanup
+        {
+            // stalled until cleanup is acknowledged
+            r_dcache_fsm   = DCACHE_TLB_PTE1_GET;
         }
         else            // we must load the missing cache line in dcache
@@ -3136 +3142 @@
         size_t          set;
         size_t          word;
-
-        bool     hit = r_dcache.read( r_dcache_tlb_paddr.read(),
-                                      &pte_flags,
-                                      &pte_ppn,
-                                      &way,
-                                      &set,
-                                      &word );
+        int         cache_state;
+
+        r_dcache.read( r_dcache_tlb_paddr.read(),
+                       &pte_flags,
+                       &pte_ppn,
+                       &way,
+                       &set,
+                       &word,
+                       &cache_state );
 #ifdef INSTRUMENTATION
 m_cpt_dcache_data_read++;
 m_cpt_dcache_dir_read++;
 #endif
-        if ( hit )      // request hits in dcache
+        if ( cache_state == CACHE_SLOT_STATE_VALID )   // hit in dcache
         {
             if ( not (pte_flags & PTE_V_MASK) ) // unmapped
@@ -3162 +3170 @@
                     r_mmu_detr             = MMU_READ_PT2_UNMAPPED;
                     r_mmu_dbvar            = r_dcache_tlb_vaddr.read();
-                    m_drsp.valid             = true;
-                    m_drsp.error             = true;
+                    m_drsp.valid           = true;
+                    m_drsp.error           = true;
                 }
-                r_dcache_fsm          = DCACHE_IDLE;
+                r_dcache_fsm               = DCACHE_IDLE;
 
 #if DEBUG_DCACHE
@@ -3196 +3204 @@
 #endif
              }
+        }
+        else if ( cache_state == CACHE_SLOT_STATE_ZOMBI ) // pending cleanup
+        {
+            // stalled until cleanup is acknowledged
+            r_dcache_fsm   = DCACHE_TLB_PTE2_GET;
         }
         else            // we must load the missing cache line in dcache