Changeset 108 for trunk/modules

Timestamp:

Oct 19, 2010, 12:32:49 AM (14 years ago)

Author:

gao

Message:

Bug correction

File:

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

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

@@ -700 +700 @@
                           (paddr_t)p_vci_tgt.wdata.read() * m_dcache_words * 4; 
 
-            if ( (address & 0x3) == 0x3 ) // broadcast invalidate for data or instruction type
+            if ( (address&0x3) == 0x3 ) // broadcast invalidate for data or instruction type
             {
                 if ( ! p_vci_tgt.eop.read() ) 
@@ -2078 +2078 @@
     std::cout << name() << " Instruction Response: " << irsp << std::endl;
 #endif
-
     ////////////////////////////////////////////////////////////////////////////////////
     //      INVAL ITLB CHECK FSM 
@@ -4465 +4464 @@
                 r_dcache_itlb_inval_req = r_dcache_in_itlb[m_dcache_sets*way+set];
                 r_dcache_itlb_inval_line = victim_index;
-                r_dcache_in_itlb[way*m_dcache_sets+set] = false;
 
                 // data tlb invalidate verification
                 r_dcache_dtlb_inval_req = r_dcache_in_dtlb[m_dcache_sets*way+set]; 
                 r_dcache_dtlb_inval_line = victim_index;
-                r_dcache_in_dtlb[way*m_dcache_sets+set] = false;
 
                 r_dcache_cleanup_req = true; 
                 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;
+                    r_dcache_in_itlb[way*m_dcache_sets+set] = false;
+                    r_dcache_in_dtlb[way*m_dcache_sets+set] = false;
                     break;
                 }
@@ -4738 +4738 @@
                 r_dcache_itlb_inval_req = r_dcache_in_itlb[m_dcache_sets*way+set];
                 r_dcache_itlb_inval_line = victim_index;
-                r_dcache_in_itlb[way*m_dcache_sets+set] = false;
 
                 // data tlb invalidate verification
                 r_dcache_dtlb_inval_req = r_dcache_in_dtlb[m_dcache_sets*way+set]; 
                 r_dcache_dtlb_inval_line = victim_index;
-                r_dcache_in_dtlb[way*m_dcache_sets+set] = false;
 
                 r_dcache_cleanup_req = true; 
@@ -4752 +4750 @@
                     r_dcache_fsm = DCACHE_TLB_CC_INVAL;
                     r_dcache_fsm_save = r_dcache_fsm;
+                    r_dcache_in_itlb[way*m_dcache_sets+set] = false;
+                    r_dcache_in_dtlb[way*m_dcache_sets+set] = false;
                     break;
                 }
@@ -5132 +5132 @@
     std::cout << name() << " Data Response: " << drsp << std::endl;
 #endif
-
     ////////////////////////////////////////////////////////////////////////////////////
     //      INVAL DTLB CHECK FSM 
@@ -6046 +6045 @@
 
     } // end switch TGT_FSM
-
 #ifdef SOCLIB_MODULE_DEBUG 
    std::cout << name()