Index: branches/v5/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp
===================================================================
--- branches/v5/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 364)
+++ branches/v5/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 366)
@@ -1285,6 +1285,5 @@
 #endif
 
-        r_icache.write_dir( 0,
-                            way,
+        r_icache.write_dir( way,
                             set,
                             CACHE_SLOT_STATE_ZOMBI );
@@ -1396,6 +1395,5 @@
 m_cpt_icache_dir_write++;
 #endif
-            r_icache.write_dir( 0,
-                                r_icache_miss_way.read(),
+            r_icache.write_dir( r_icache_miss_way.read(),
                                 r_icache_miss_set.read(),
                                 CACHE_SLOT_STATE_ZOMBI );
@@ -1491,6 +1489,5 @@
 m_cpt_icache_dir_write++;
 #endif
-        r_icache.write_dir( 0,
-                            r_icache_miss_way.read(),
+        r_icache.write_dir( r_icache_miss_way.read(),
                             r_icache_miss_set.read(),
                             CACHE_SLOT_STATE_ZOMBI);
@@ -1940,6 +1937,5 @@
         if (r_icache_cc_need_write.read())
         {
-            r_icache.write_dir( 0,
-	                            r_icache_cc_way.read(),
+            r_icache.write_dir( r_icache_cc_way.read(),
 	                            r_icache_cc_set.read(),
                                 CACHE_SLOT_STATE_ZOMBI );
@@ -2150,4 +2146,5 @@
                                &cache_word,
                                &cache_state );
+
 #ifdef INSTRUMENTATION
 m_cpt_dcache_dir_read++;
@@ -2370,5 +2367,5 @@
                 // checking processor mode:
                 if ( (m_dreq.mode  == iss_t::MODE_USER) &&
-                     (xtn_opcode != iss_t:: XTN_SYNC) &&
+                     (xtn_opcode != iss_t::XTN_SYNC) &&
                      (xtn_opcode != iss_t::XTN_DCACHE_INVAL) &&
                      (xtn_opcode != iss_t::XTN_DCACHE_FLUSH) &&
@@ -2577,4 +2574,5 @@
                     // The read requests are taken only if there is no cache update.
                     // We request a VCI transaction to CMD FSM if miss or uncachable
+
                     if ( ((m_dreq.type == iss_t::DATA_READ))
                           and not r_dcache_updt_req.read() )
@@ -3598,6 +3596,5 @@
 m_cpt_dcache_dir_write++;
 #endif
-        r_dcache.write_dir( 0,
-                            way,
+        r_dcache.write_dir( way,
                             set,
                             CACHE_SLOT_STATE_ZOMBI );
@@ -3734,6 +3731,5 @@
 m_cpt_dcache_dir_write++;
 #endif
-            r_dcache.write_dir( 0,
-                                way,
+            r_dcache.write_dir( way,
                                 set,
                                 CACHE_SLOT_STATE_ZOMBI );
@@ -3871,6 +3867,5 @@
 m_cpt_dcache_dir_read++;
 #endif
-        r_dcache.write_dir( 0,
-                            way,
+        r_dcache.write_dir( way,
                             set,
                             CACHE_SLOT_STATE_ZOMBI );
@@ -4675,6 +4670,5 @@
 m_cpt_dcache_dir_write++;
 #endif
-                r_dcache.write_dir( 0,
-                                    way,
+                r_dcache.write_dir( way,
                                     set,
                                     CACHE_SLOT_STATE_ZOMBI );
@@ -4877,5 +4871,6 @@
                         r_dcache_vci_ll_req.read() or
                         r_dcache_vci_unc_req.read())
-                     or r_vci_cmd_imiss_prio.read() ) ;
+                     or r_vci_cmd_imiss_prio.read() );
+
 
             // 1 - Data Read Miss