Changeset 72 for trunk

Timestamp:

Aug 6, 2010, 10:32:14 PM (14 years ago)

Author:

bouyer

Message:

2 fixes:

• do not test r_dcache_in_[id]tlb[] just after setting the entry to false, just go to DCACHE_TLB_CC_INVAL in these cases.
• if r_dcache_fsm_save is DCACHE_TLB1_UPDT or DCACHE_TLB2_UPDT, the dcache line is already valid, so move test for these cases in the dcache_hit case.

File:

• trunk/modules/vci_cc_vcache_wrapper2_v1/caba/source/src/vci_cc_vcache_wrapper2_v1.cpp (modified) (5 diffs)

trunk/modules/vci_cc_vcache_wrapper2_v1/caba/source/src/vci_cc_vcache_wrapper2_v1.cpp

@@ -4119 +4119 @@
             {
                 // data TLB flush 
-                dcache_tlb.flush(true);      // global entries are not invalidated
+                dcache_tlb.flush(true);      // global entries are invalidated
                 r_dtlb_translation_valid = false;
                 r_dcache_ptba_ok = false;
@@ -4379 +4379 @@
                 r_dcache_cleanup_line = victim_index;
                 m_cpt_cc_cleanup_data++;
-                if ( r_dcache_in_itlb[m_dcache_sets*way+set] || r_dcache_in_dtlb[m_dcache_sets*way+set] )
-                {
-                    r_dcache_fsm = DCACHE_TLB_CC_INVAL;
-                    r_dcache_fsm_save = r_dcache_fsm;
-                    break;
-                }
+                r_dcache_fsm = DCACHE_TLB_CC_INVAL;
+                r_dcache_fsm_save = r_dcache_fsm;
+                break;
             }
             m_cpt_dcache_dir_write++;
@@ -4596 +4593 @@
                 r_dcache_cleanup_line = victim_index;
                 m_cpt_cc_cleanup_data++;
-                if ( r_dcache_in_itlb[m_dcache_sets*way+set] || r_dcache_in_dtlb[m_dcache_sets*way+set] )
-                {
-                    r_dcache_fsm = DCACHE_TLB_CC_INVAL;
-                    r_dcache_fsm_save = r_dcache_fsm;
-                    break;
-                }
+                r_dcache_fsm = DCACHE_TLB_CC_INVAL;
+                r_dcache_fsm_save = r_dcache_fsm;
+                break;
             }
 
@@ -4743 +4737 @@
            ( (r_dcache_paddr_save.read() & ~((m_dcache_words<<2)-1)) == (r_tgt_addr.read() & ~((m_dcache_words<<2)-1)))) 
         || (( ( r_dcache_fsm_save == DCACHE_TLB1_READ )      || ( r_dcache_fsm_save == DCACHE_TLB2_READ )      ||
-             ( r_dcache_fsm_save == DCACHE_TLB1_READ_UPDT ) || ( r_dcache_fsm_save == DCACHE_TLB2_READ_UPDT ) ||
-             ( r_dcache_fsm_save == DCACHE_TLB1_UPDT )      || ( r_dcache_fsm_save == DCACHE_TLB2_UPDT )         /* ||
+             ( r_dcache_fsm_save == DCACHE_TLB1_READ_UPDT ) || ( r_dcache_fsm_save == DCACHE_TLB2_READ_UPDT) /* ||
              ( r_dcache_fsm_save == DCACHE_TLB1_LL_WAIT )   || ( r_dcache_fsm_save == DCACHE_TLB2_LL_WAIT )   ||
              ( r_dcache_fsm_save == DCACHE_TLB1_SC_WAIT )   || ( r_dcache_fsm_save == DCACHE_TLB2_SC_WAIT )   ||
@@ -4781 +4774 @@
             if ( dcache_hit )
             {
+                if (((r_dcache_tlb_paddr.read() & ~((m_dcache_words<<2)-1)) ==
+                     (r_tgt_addr.read() & ~((m_dcache_words<<2)-1))) &&
+                    (r_dcache_fsm_save == DCACHE_TLB1_UPDT ||
+                     r_dcache_fsm_save == DCACHE_TLB2_UPDT))
+                        r_dcache_inval_rsp = true;
                 if ( r_dcache_in_dtlb[m_dcache_sets*way+set] || r_dcache_in_itlb[m_dcache_sets*way+set] )
                 {