Changeset 457 for branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

Timestamp:

Jul 19, 2013, 12:05:33 PM (11 years ago)

Author:

lgarcia

Message:

fixing merging bug in vci_mem_cache.cpp

File:

• branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (4 diffs)

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

@@ -284 +284 @@
 {
   "ALLOC_DIR_RESET",
+  "ALLOC_DIR_CONFIG",
   "ALLOC_DIR_READ",
   "ALLOC_DIR_WRITE",
@@ -301 +302 @@
 const char *alloc_upt_fsm_str[] =
 {
+  "ALLOC_UPT_CONFIG",
   "ALLOC_UPT_WRITE",
   "ALLOC_UPT_XRAM_RSP",
@@ -6855 +6857 @@
 
         // WRITE
+        if(r_read_to_cc_send_req.read())
+        {
+          r_cc_send_fsm = CC_SEND_READ_NCC_INVAL_HEADER;
+          break;
+        }
+
+        if(r_write_to_cc_send_req.read())
+        {
+          r_cc_send_fsm = CC_SEND_WRITE_NCC_INVAL_HEADER;
+          break;
+        }
         if(m_write_to_cc_send_inst_fifo.rok() or
             r_write_to_cc_send_multi_req.read())
@@ -6934 +6947 @@
         }
         // WRITE
+        if(r_read_to_cc_send_req.read())
+        {
+          r_cc_send_fsm = CC_SEND_READ_NCC_INVAL_HEADER;
+          break;
+        }
+
+        if(r_write_to_cc_send_req.read())
+        {
+          r_cc_send_fsm = CC_SEND_WRITE_NCC_INVAL_HEADER;
+          break;
+        }
         if(m_write_to_cc_send_inst_fifo.rok() or
             r_write_to_cc_send_multi_req.read())