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 487)
+++ trunk/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 488)
@@ -1634,12 +1634,4 @@
         if (m_ireq.valid) m_cost_ins_miss_frz++;
 
-        // coherence clack interrupt
-        if ( r_icache_clack_req.read() )
-        {
-            r_icache_fsm = ICACHE_CC_CHECK;
-            r_icache_fsm_save = r_icache_fsm.read();
-            break;
-        }
-        
         // send cleanup victim request
         if ( r_icache_cleanup_victim_req.read() and not r_icache_cc_send_req.read() )
@@ -1652,4 +1644,12 @@
         }   
 
+        // coherence clack interrupt
+        if ( r_icache_clack_req.read() )
+        {
+            r_icache_fsm = ICACHE_CC_CHECK;
+            r_icache_fsm_save = r_icache_fsm.read();
+            break;
+        }
+        
         // coherence interrupt
         if ( r_cc_receive_icache_req.read() and not r_icache_cc_send_req.read() and not r_icache_cleanup_victim_req.read() )
@@ -1723,12 +1723,4 @@
         if ( m_ireq.valid ) m_cost_ins_miss_frz++;
 
-        // coherence clack interrupt
-        if ( r_icache_clack_req.read() )
-        {
-            r_icache_fsm = ICACHE_CC_CHECK;
-            r_icache_fsm_save = r_icache_fsm.read();
-            break;
-        }
-
         // send cleanup victim request
         if ( r_icache_cleanup_victim_req.read() and not r_icache_cc_send_req.read() )
@@ -1740,4 +1732,12 @@
             r_icache_cleanup_victim_req = false;
         }   
+
+        // coherence clack interrupt
+        if ( r_icache_clack_req.read() )
+        {
+            r_icache_fsm = ICACHE_CC_CHECK;
+            r_icache_fsm_save = r_icache_fsm.read();
+            break;
+        }
 
         // coherence interrupt
@@ -4151,12 +4151,4 @@
         if ( m_dreq.valid) m_cost_data_miss_frz++;
 
-        // coherence clack request (from DSPIN CLACK)
-        if ( r_dcache_clack_req.read() )
-        {
-            r_dcache_fsm = DCACHE_CC_CHECK;
-            r_dcache_fsm_cc_save = r_dcache_fsm.read();
-            break;
-        }
-
         // send cleanup victim request
         if ( r_dcache_cleanup_victim_req.read() and not r_dcache_cc_send_req.read() )
@@ -4168,4 +4160,12 @@
             r_dcache_cleanup_victim_req = false;
         }   
+
+        // coherence clack request (from DSPIN CLACK)
+        if ( r_dcache_clack_req.read() )
+        {
+            r_dcache_fsm = DCACHE_CC_CHECK;
+            r_dcache_fsm_cc_save = r_dcache_fsm.read();
+            break;
+        }
 
         // coherence request (from CC_RECEIVE FSM)
@@ -4284,12 +4284,4 @@
         if ( m_dreq.valid) m_cost_data_miss_frz++;
 
-        // coherence clack request (from DSPIN CLACK)
-        if ( r_dcache_clack_req.read() )
-        {
-            r_dcache_fsm = DCACHE_CC_CHECK;
-            r_dcache_fsm_cc_save = r_dcache_fsm.read();
-            break;
-        }
-
         // send cleanup victim request
         if ( r_dcache_cleanup_victim_req.read() and not r_dcache_cc_send_req.read() )
@@ -4301,4 +4293,12 @@
             r_dcache_cleanup_victim_req = false;
         }   
+
+        // coherence clack request (from DSPIN CLACK)
+        if ( r_dcache_clack_req.read() )
+        {
+            r_dcache_fsm = DCACHE_CC_CHECK;
+            r_dcache_fsm_cc_save = r_dcache_fsm.read();
+            break;
+        }
 
         // coherence request (from CC_RECEIVE FSM)