Index: /trunk/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp
===================================================================
--- /trunk/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 383)
+++ /trunk/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 384)
@@ -96,5 +96,5 @@
         "DCACHE_XTN_DT_INVAL",
 
-        "DCACHE_DIRTY_PTE_GET",
+        "DCACHE_DIRTY_GET_PTE",
         "DCACHE_DIRTY_WAIT",
 
@@ -1230,4 +1230,12 @@
                        		        // A cleanup request is generated for each valid line
     {
+        // coherence request (from CC_RECEIVE FSM)
+        if ( r_cc_receive_icache_req.read() )
+        {
+            r_icache_fsm = ICACHE_CC_CHECK;
+            r_icache_fsm_save = r_icache_fsm.read();
+            break;
+        }
+
         if ( not r_icache_cc_send_req.read() ) // blocked until previous cc_send request is sent
         {
@@ -1249,5 +1257,5 @@
                 // request cleanup
                 r_icache_cc_send_req   = true;
-                r_icache_cc_send_nline = tag * m_icache_sets;
+                r_icache_cc_send_nline = tag * m_icache_sets + set;
                 r_icache_cc_send_way   = way;
                 r_icache_cc_send_type  = CC_TYPE_CLEANUP;
@@ -3541,4 +3549,12 @@
                                 // returns to IDLE and flush TLBs when last slot
     {
+        // coherence request (from CC_RECEIVE FSM)
+        if ( r_cc_receive_dcache_req.read() )
+        {
+            r_dcache_fsm = DCACHE_CC_CHECK;
+            r_dcache_fsm_cc_save = r_dcache_fsm.read();
+            break;
+        }
+
         if ( not r_dcache_cc_send_req.read() ) // blocked until previous cc_send request is sent
         {
@@ -3560,5 +3576,5 @@
                 // request cleanup
                 r_dcache_cc_send_req   = true;
-                r_dcache_cc_send_nline = tag * m_dcache_sets;
+                r_dcache_cc_send_nline = tag * m_dcache_sets + set;
                 r_dcache_cc_send_way   = way;
                 r_dcache_cc_send_type  = CC_TYPE_CLEANUP;