Changeset 239 for trunk/modules/vci_cc_vcache_wrapper_v4/caba

Timestamp:

Jul 19, 2012, 3:32:18 PM (12 years ago)

Author:

cfuguet

Message:

Bug fix: When there is a pending write in the stage 1 of the write pipeline (DCACHE_IDLE) and the pipeline is frozen (write uncacheable and pending unc write or not write ok in the wbuf), we must not invalidate this write with the next requests to the DCACHE

File:

• trunk/modules/vci_cc_vcache_wrapper_v4/caba/source/src/vci_cc_vcache_wrapper_v4.cpp (modified) (3 diffs)

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

@@ -2155 +2155 @@
             r_dcache_fsm_scan_save = r_dcache_fsm.read();
             r_dcache_fsm           = DCACHE_INVAL_TLB_SCAN;
-            r_dcache_p0_valid      = false;
+            r_dcache_p0_valid      = r_dcache_p0_valid.read() and write_pipe_frozen;
         }
         // external coherence request 
@@ -2162 +2162 @@
             r_dcache_fsm_cc_save = r_dcache_fsm.read();
             r_dcache_fsm         = DCACHE_CC_CHECK;
-            r_dcache_p0_valid    = false;
+            r_dcache_p0_valid    = r_dcache_p0_valid.read() and write_pipe_frozen;
         }        
 
@@ -2714 +2714 @@
             r_dcache_tlb_vaddr  = r_icache_vaddr_save.read();
             r_dcache_fsm        = DCACHE_TLB_MISS;
-            r_dcache_p0_valid = false;
+            r_dcache_p0_valid   = r_dcache_p0_valid.read() and write_pipe_frozen;
         }
         else
         {
-            r_dcache_p0_valid = false;
+            r_dcache_p0_valid = r_dcache_p0_valid.read() and write_pipe_frozen;
         } // end P0 pipe stage
         break;