Index: branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp
===================================================================
--- branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 513)
+++ branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 515)
@@ -343,7 +343,7 @@
       r_dcache_tlb_pte_flags("r_dcache_tlb_pte_flags"),
       r_dcache_tlb_pte_ppn("r_dcache_tlb_pte_ppn"),
-      r_dcache_tlb_cache_way("r_dcache_tlb_cache_way"),
-      r_dcache_tlb_cache_set("r_dcache_tlb_cache_set"),
-      r_dcache_tlb_cache_word("r_dcache_tlb_cache_word"),
+//     r_dcache_tlb_cache_way("r_dcache_tlb_cache_way"),
+//     r_dcache_tlb_cache_set("r_dcache_tlb_cache_set"),
+//     r_dcache_tlb_cache_word("r_dcache_tlb_cache_word"),
       r_dcache_tlb_way("r_dcache_tlb_way"),
       r_dcache_tlb_set("r_dcache_tlb_set"),
@@ -3170,8 +3170,13 @@
                 r_dcache_content_state[m_icache_sets*way+set] = LINE_CACHE_IN_TLB;
                 r_dcache_tlb_pte_flags  = entry;
-                r_dcache_tlb_cache_way  = way;
-                r_dcache_tlb_cache_set  = set;
-                r_dcache_tlb_cache_word = word;
+               //r_dcache_tlb_cache_way  = way;
+               //r_dcache_tlb_cache_set  = set;
+               //r_dcache_tlb_cache_word = word;
                 r_dcache_fsm            = DCACHE_TLB_PTE1_SELECT;
+
+                r_cas_islocal    = (cache_state == CACHE_SLOT_STATE_VALID_NCC);//do not check L2 if NCC: the CAS is necessarily a success
+                r_cas_local_way  = way;
+                r_cas_local_set  = set;
+                r_cas_local_word = word;
 
 #if DEBUG_DCACHE
@@ -3444,9 +3449,14 @@
                 r_dcache_tlb_pte_flags  = pte_flags;
                 r_dcache_tlb_pte_ppn    = pte_ppn;
-                r_dcache_tlb_cache_way  = way;
-                r_dcache_tlb_cache_set  = set;
-                r_dcache_tlb_cache_word = word;
+               //r_dcache_tlb_cache_way  = way;
+               //r_dcache_tlb_cache_set  = set;
+               //r_dcache_tlb_cache_word = word;
                 r_dcache_fsm            = DCACHE_TLB_PTE2_SELECT;
 
+                r_cas_islocal    = (cache_state == CACHE_SLOT_STATE_VALID_NCC);//do not check L2 if NCC: the CAS is necessarily a success
+                r_cas_local_way  = way;
+                r_cas_local_set  = set;
+                r_cas_local_word = word;
+         
 #if DEBUG_DCACHE
 if ( m_debug_activated )
@@ -3557,18 +3567,4 @@
         // and can be obtained in the mapping table.
         // As long as this computation is not done, all access are local.
-
-        int  state;
-        size_t way;
-        size_t set;
-        size_t word;
-        r_dcache.read_dir(r_dcache_tlb_paddr.read(),
-                          &state,
-                          &way,
-                          &set,
-                          &word);
-        r_cas_islocal = (state == CACHE_SLOT_STATE_VALID_NCC);//do not check L2 if NCC: the CAS is necessarily a success
-        r_cas_local_way = way;
-        r_cas_local_set = set;
-        r_cas_local_word = word;
 
         if ( local )						// local access