Changeset 318 for branches/v5/modules

Timestamp:

Mar 13, 2013, 3:12:46 PM (11 years ago)

Author:

joannou

Message:

vci_cc_vcache_wrapper_dspin_coherence now use DspinDhccpParam::* types for coherence requests type checking

File:

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

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

@@ -5348 +5348 @@
                 uint64_t receive_data = p_dspin_in.data.read();
                 // initialize coherence packet type
-                uint64_t receive_type = (DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::FROM_MC_TYPE) & 0x7);
-                // initialize data/ins flip_flop
+                uint64_t receive_type = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::FROM_MC_TYPE);
+                // initialize data/ins flip_flop (0 data / 1 ins)
                 r_cc_receive_data_ins = (bool)(receive_type & 0x1);
                 // test for a broadcast
@@ -5355 +5355 @@
                     r_cc_receive_fsm = CC_RECEIVE_BRDCAST_HEADER;
                 // test for a CLACK
-                else if(receive_type & 0x4)
+                else if(receive_type == DspinDhccpParam::TYPE_CLEANUP_ACK)
                     r_cc_receive_fsm = CC_RECEIVE_CLACK;
                 // test for a multi updt
-                else if(receive_type & 0x2)
+                else if(receive_type == DspinDhccpParam::TYPE_MULTI_UPDT)
                     r_cc_receive_fsm = CC_RECEIVE_UPDT_HEADER;
                 // test for a multi inval
@@ -5833 +5833 @@
             DspinDhccpParam::dspin_set(dspin_send_data,1,DspinDhccpParam::FROM_L1_EOP);
             DspinDhccpParam::dspin_set(dspin_send_data,0,DspinDhccpParam::FROM_L1_BC);
+            DspinDhccpParam::dspin_set(dspin_send_data,
+                DspinDhccpParam::TYPE_MULTI_ACK,
+                DspinDhccpParam::FROM_L1_TYPE);
             // dcache active request
             if(r_cc_send_last_client.read() == 0)