Changeset 615 for branches/RWT/modules/vci_cc_vcache_wrapper/caba

Timestamp:

Jan 7, 2014, 4:08:36 PM (11 years ago)

Author:

devigne

Message:

Bug fixed: bad syncro enums states between .h and .cpp for debug...
Bug fixed: in DCACHE_CC_UPDT state, we did not check the rok of cc_receive fifo.

Location:

branches/RWT/modules/vci_cc_vcache_wrapper/caba/source

Files:

• include/vci_cc_vcache_wrapper.h (modified) (1 diff)
• src/vci_cc_vcache_wrapper.cpp (modified) (2 diffs)

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

@@ -179 +179 @@
         CC_RECEIVE_INS_UPDT_HEADER,
         CC_RECEIVE_INS_UPDT_NLINE,
+        CC_RECEIVE_INS_UPDT_DATA,
         CC_RECEIVE_DATA_INVAL_HEADER,
         CC_RECEIVE_DATA_INVAL_NLINE,
         CC_RECEIVE_DATA_UPDT_HEADER,
         CC_RECEIVE_DATA_UPDT_NLINE,
-        CC_RECEIVE_INS_UPDT_DATA,
         CC_RECEIVE_DATA_UPDT_DATA,
     };

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

@@ -160 +160 @@
 
 const char *cc_receive_fsm_state_str[] = {
-        "CC_RECEIVE_IDLE",
-        "CC_RECEIVE_BRDCAST_HEADER",
-        "CC_RECEIVE_BRDCAST_NLINE",
-        "CC_RECEIVE_INS_INVAL_HEADER",
-        "CC_RECEIVE_INS_INVAL_NLINE",
-        "CC_RECEIVE_INS_UPDT_HEADER",
-        "CC_RECEIVE_INS_UPDT_NLINE",
-        "CC_RECEIVE_INS_UPDT_DATA",
-        "CC_RECEIVE_DATA_INVAL_HEADER",
-        "CC_RECEIVE_DATA_INVAL_NLINE",
-        "CC_RECEIVE_DATA_UPDT_HEADER",
-        "CC_RECEIVE_DATA_UPDT_NLINE",
-        "CC_RECEIVE_DATA_UPDT_DATA",
+        "CC_RECEIVE_IDLE",                 
+        "CC_RECEIVE_BRDCAST_HEADER",       
+        "CC_RECEIVE_BRDCAST_NLINE",        
+        "CC_RECEIVE_INS_INVAL_HEADER",     
+        "CC_RECEIVE_INS_INVAL_NLINE",      
+        "CC_RECEIVE_INS_UPDT_HEADER",      
+        "CC_RECEIVE_INS_UPDT_NLINE",       
+        "CC_RECEIVE_INS_UPDT_DATA",        
+        "CC_RECEIVE_DATA_INVAL_HEADER",    
+        "CC_RECEIVE_DATA_INVAL_NLINE",     
+        "CC_RECEIVE_DATA_UPDT_HEADER",     
+        "CC_RECEIVE_DATA_UPDT_NLINE",      
+        "CC_RECEIVE_DATA_UPDT_DATA",       
     };
 
@@ -5519 +5519 @@
         }
 
+        if ( not r_cc_receive_updt_fifo_be.rok() ) break;
+
         if ( r_cc_receive_updt_fifo_eop.read() )  // last word
         {