Changeset 515 for branches/RWT

Timestamp:

Sep 4, 2013, 4:35:03 PM (11 years ago)

Author:

haoliu

Message:

bug fixed in vci_cc_vcache_wrapper(RWT),
when we have to modify the bit L/R(flag in pte1 or pte2) in using the cas operation,
with RWT if the ligne of the pte2 is not coherent, the cas will be done locally.

We forgot to modify locally in case of pte1 update.

File:

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

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

@@ -343 +343 @@
       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 +3170 @@
                 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 +3449 @@
                 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 +3567 @@
         // 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