Changeset 494 for branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/include

Timestamp:

Aug 20, 2013, 2:13:08 PM (11 years ago)

Author:

devigne

Message:

Merge with the lastest version of trunk

Location:

branches/ODCCP/modules/vci_cc_vcache_wrapper

Files:

• . (modified) (1 prop)
• caba/source/include/vci_cc_vcache_wrapper.h (modified) (4 diffs)

branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h

@@ -179 +179 @@
         CC_RECEIVE_INS_UPDT_HEADER,
         CC_RECEIVE_INS_UPDT_NLINE,
-        CC_RECEIVE_INS_UPDT_DATA,
         CC_RECEIVE_DATA_INVAL_HEADER,
         CC_RECEIVE_DATA_INVAL_NLINE,
         CC_RECEIVE_DATA_UPDT_HEADER,
         CC_RECEIVE_DATA_UPDT_NLINE,
+        CC_RECEIVE_INS_UPDT_DATA,
         CC_RECEIVE_DATA_UPDT_DATA,
     };
@@ -404 +404 @@
     sc_signal<bool>         r_icache_tlb_rsp_error;      // tlb miss response error
 
+    // Filp-Flop in ICACHE FSM for saving the cleanup victim request
+    sc_signal<bool>         r_icache_cleanup_victim_req; 
+    sc_signal<paddr_t>      r_icache_cleanup_victim_nline;
+
     // communication between ICACHE FSM and CC_SEND FSM
     sc_signal<bool>         r_icache_cc_send_req;           // ICACHE cc_send request
@@ -497 +501 @@
     sc_signal<int>          r_dcache_xtn_opcode;        // xtn request type
 
+    // Filp-Flop in DCACHE FSM for saving the cleanup victim request
+    sc_signal<bool>         r_dcache_cleanup_victim_req; 
+    sc_signal<paddr_t>      r_dcache_cleanup_victim_nline;
+
     // communication between DCACHE FSM and CC_SEND FSM
     sc_signal<bool>         r_dcache_cc_send_req;           // DCACHE cc_send request
@@ -507 +515 @@
     sc_signal<bool>         r_dcache_cc_cleanup_updt_data;          // Register for cleanup with data (wb updt)
     sc_signal<bool>         r_dcache_cleanup_ncc;                   // Register for cleanup no coherent 
+    //sc_signal<bool>         r_miss_cleanup_ncc_pending;                   // Register for cleanup no coherent 
+    sc_signal<bool>         r_dcache_cleanup_will_contains_data;                   // Register for cleanup no coherent 
+    sc_signal<bool>         r_dcache_cleanup_will_ncc;                   // Register for cleanup no coherent 
     sc_signal<bool>         r_dcache_miss_victim_no_coherence;      // Register for victim in no coherence mode
     sc_signal<bool>         r_dcache_line_no_coherence;             // Register for line current in no coherence mode