Changeset 444

Timestamp:

Jul 17, 2013, 2:46:46 PM (11 years ago)

Author:

cfuguet

Message:

Modifications in branches/v5/modules/vci_cc_vcache_wrapper:

• Renaming FROM_MC DSPIN flits fields in M2P
• Renaming FROM_L1 DSPIN flits fields in P2M
• Renaming CLEANUP_ACK DSPIN flits fields in CLACK

File:

• branches/v5/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (modified) (9 diffs)

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

@@ -5451 +5451 @@
                 // initialize coherence packet type
                 uint64_t receive_type = DspinDhccpParam::dspin_get(receive_data,
-                                            DspinDhccpParam::FROM_MC_TYPE);
+                                            DspinDhccpParam::M2P_TYPE);
                 // initialize data/ins flip_flop (0 data / 1 ins)
                 r_cc_receive_data_ins = (bool)(receive_type & 0x1);
                 // test for a broadcast
-                if (DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::FROM_MC_BC))
+                if (DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::M2P_BC))
                 {
                     r_cc_receive_fsm = CC_RECEIVE_BRDCAST_HEADER;
                 }
                 // test for a CLACK
-                else if ((receive_type == DspinDhccpParam::TYPE_CLEANUP_ACK_DATA) or
-                         (receive_type == DspinDhccpParam::TYPE_CLEANUP_ACK_INST))
+                else if ((receive_type == DspinDhccpParam::TYPE_CLACK_DATA) or
+                         (receive_type == DspinDhccpParam::TYPE_CLACK_INST))
                 {
                     r_cc_receive_fsm = CC_RECEIVE_CLACK;
@@ -5492 +5492 @@
                 r_cc_receive_dcache_req  = true;
                 r_cc_receive_dcache_set  = DspinDhccpParam::dspin_get(receive_data,
-                                           DspinDhccpParam::CLEANUP_ACK_SET) & 
+                                           DspinDhccpParam::CLACK_SET) & 
                                            ((1ULL<<(uint32_log2(m_dcache_sets)))-1);
                 r_cc_receive_dcache_way  = DspinDhccpParam::dspin_get(receive_data,
-                                           DspinDhccpParam::CLEANUP_ACK_WAY) & 
+                                           DspinDhccpParam::CLACK_WAY) & 
                                            ((1ULL<<(uint32_log2(m_dcache_ways)))-1);
                 r_cc_receive_dcache_type = CC_TYPE_CLACK;
@@ -5509 +5509 @@
                 r_cc_receive_icache_req  = true;
                 r_cc_receive_icache_set  = DspinDhccpParam::dspin_get(receive_data,
-                                           DspinDhccpParam::CLEANUP_ACK_SET) & 
+                                           DspinDhccpParam::CLACK_SET) & 
                                            ((1ULL<<(uint32_log2(m_icache_sets)))-1);
                 r_cc_receive_icache_way  = DspinDhccpParam::dspin_get(receive_data,
-                                           DspinDhccpParam::CLEANUP_ACK_WAY) & 
+                                           DspinDhccpParam::CLACK_WAY) & 
                                            ((1ULL<<(uint32_log2(m_icache_ways)))-1);
                 r_cc_receive_icache_type = CC_TYPE_CLACK;
@@ -5906 +5906 @@
 //            DspinDhccpParam::dspin_set(dspin_send_data,
 //                                       0,
-//                                       DspinDhccpParam::FROM_L1_EOP);
+//                                       DspinDhccpParam::P2M_EOP);
             DspinDhccpParam::dspin_set(dspin_send_data,
                                        m_cc_global_id,
@@ -5912 +5912 @@
             DspinDhccpParam::dspin_set(dspin_send_data,
                                        0,
-                                       DspinDhccpParam::FROM_L1_BC);
+                                       DspinDhccpParam::P2M_BC);
 
             if(r_cc_send_last_client.read() == 0) // dcache active request
@@ -5934 +5934 @@
                 DspinDhccpParam::dspin_set(dspin_send_data,
                                            DspinDhccpParam::TYPE_CLEANUP_DATA,
-                                           DspinDhccpParam::FROM_L1_TYPE);
+                                           DspinDhccpParam::P2M_TYPE);
             }
             else                                // icache active request
@@ -5956 +5956 @@
                 DspinDhccpParam::dspin_set(dspin_send_data,
                                            DspinDhccpParam::TYPE_CLEANUP_INST,
-                                           DspinDhccpParam::FROM_L1_TYPE);
+                                           DspinDhccpParam::P2M_TYPE);
             }
             // send flit
@@ -5970 +5970 @@
 //            DspinDhccpParam::dspin_set(dspin_send_data,
 //                                       1,
-//                                       DspinDhccpParam::FROM_L1_EOP);
+//                                       DspinDhccpParam::P2M_EOP);
 
             if(r_cc_send_last_client.read() == 0) // dcache active request
@@ -5996 +5996 @@
 //            DspinDhccpParam::dspin_set(dspin_send_data,
 //                                       1,
-//                                       DspinDhccpParam::FROM_L1_EOP);
+//                                       DspinDhccpParam::P2M_EOP);
             DspinDhccpParam::dspin_set(dspin_send_data,
                                        0,
-                                       DspinDhccpParam::FROM_L1_BC);
+                                       DspinDhccpParam::P2M_BC);
             DspinDhccpParam::dspin_set(dspin_send_data,
                                        DspinDhccpParam::TYPE_MULTI_ACK,
-                                       DspinDhccpParam::FROM_L1_TYPE);
+                                       DspinDhccpParam::P2M_TYPE);
 
             if(r_cc_send_last_client.read() == 0) // dcache active request