Index: branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd =================================================================== --- branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd (revision 452) +++ branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd (revision 453) @@ -32,5 +32,5 @@ parameter.Reference('addr_size')) ), - Uses('caba:dspin_dhccp_param'), + Uses('caba:dspin_odccp_param'), ], Index: branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h =================================================================== --- branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (revision 452) +++ branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (revision 453) @@ -42,5 +42,5 @@ #include "vci_initiator.h" #include "dspin_interface.h" -#include "dspin_dhccp_param.h" +#include "dspin_odccp_param.h" #include "mapping_table.h" #include "static_assert.h" Index: branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp =================================================================== --- branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (revision 452) +++ branches/ODCCP/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (revision 453) @@ -5992,22 +5992,22 @@ 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); + uint64_t receive_type = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::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 - if (DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::FROM_MC_BC)) + if (DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::FROM_MC_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 == DspinOdccpParam::TYPE_CLEANUP_ACK_DATA) or + (receive_type == DspinOdccpParam::TYPE_CLEANUP_ACK_INST)) { r_cc_receive_fsm = CC_RECEIVE_CLACK; } // test for a multi updt - else if ((receive_type == DspinDhccpParam::TYPE_MULTI_UPDT_DATA) or - (receive_type == DspinDhccpParam::TYPE_MULTI_UPDT_INST)) + else if ((receive_type == DspinOdccpParam::TYPE_MULTI_UPDT_DATA) or + (receive_type == DspinOdccpParam::TYPE_MULTI_UPDT_INST)) { r_cc_receive_fsm = CC_RECEIVE_UPDT_HEADER; @@ -6033,9 +6033,9 @@ // request dcache to handle the CLACK r_cc_receive_dcache_req = true; - r_cc_receive_dcache_set = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::CLEANUP_ACK_SET) & + r_cc_receive_dcache_set = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::CLEANUP_ACK_SET) & ((1ULL<<(uint32_log2(m_dcache_sets)))-1); - r_cc_receive_dcache_way = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::CLEANUP_ACK_WAY) & + r_cc_receive_dcache_way = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::CLEANUP_ACK_WAY) & ((1ULL<<(uint32_log2(m_dcache_ways)))-1); r_cc_receive_dcache_type = CC_TYPE_CLACK; @@ -6050,9 +6050,9 @@ // request icache to handle the CLACK r_cc_receive_icache_req = true; - r_cc_receive_icache_set = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::CLEANUP_ACK_SET) & + r_cc_receive_icache_set = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::CLEANUP_ACK_SET) & ((1ULL<<(uint32_log2(m_icache_sets)))-1); - r_cc_receive_icache_way = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::CLEANUP_ACK_WAY) & + r_cc_receive_icache_way = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::CLEANUP_ACK_WAY) & ((1ULL<<(uint32_log2(m_icache_ways)))-1); r_cc_receive_icache_type = CC_TYPE_CLACK; @@ -6086,11 +6086,11 @@ // request dcache to handle the BROADCAST r_cc_receive_dcache_req = true; - r_cc_receive_dcache_nline = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::BROADCAST_NLINE); + r_cc_receive_dcache_nline = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::BROADCAST_NLINE); r_cc_receive_dcache_type = CC_TYPE_BRDCAST; // request icache to handle the BROADCAST r_cc_receive_icache_req = true; - r_cc_receive_icache_nline = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::BROADCAST_NLINE); + r_cc_receive_icache_nline = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::BROADCAST_NLINE); r_cc_receive_icache_type = CC_TYPE_BRDCAST; // get back to idle state @@ -6110,6 +6110,6 @@ not (r_cc_receive_dcache_req.read())) { - r_cc_receive_dcache_updt_tab_idx = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::MULTI_INVAL_UPDT_INDEX); + r_cc_receive_dcache_updt_tab_idx = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::MULTI_INVAL_UPDT_INDEX); r_cc_receive_fsm = CC_RECEIVE_INVAL_NLINE; break; @@ -6119,6 +6119,6 @@ not (r_cc_receive_icache_req.read())) { - r_cc_receive_icache_updt_tab_idx = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::MULTI_INVAL_UPDT_INDEX); + r_cc_receive_icache_updt_tab_idx = DspinOdccpParam::dspin_get(receive_data, + DspinOdccpParam::MULTI_INVAL_UPDT_INDEX); r_cc_receive_fsm = CC_RECEIVE_INVAL_NLINE; break; @@ -6139,5 +6139,5 @@ // request dcache to handle the INVAL r_cc_receive_dcache_req = true; - r_cc_receive_dcache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_INVAL_NLINE); + r_cc_receive_dcache_nline = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_INVAL_NLINE); r_cc_receive_dcache_type = CC_TYPE_INVAL; // get back to idle state @@ -6150,5 +6150,5 @@ // request icache to handle the INVAL r_cc_receive_icache_req = true; - r_cc_receive_icache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_INVAL_NLINE); + r_cc_receive_icache_nline = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_INVAL_NLINE); r_cc_receive_icache_type = CC_TYPE_INVAL; // get back to idle state @@ -6168,5 +6168,5 @@ if ((r_cc_receive_data_ins.read() == 0) and not r_cc_receive_dcache_req.read() and r_cc_receive_updt_fifo_be.empty()) { - r_cc_receive_dcache_updt_tab_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); + r_cc_receive_dcache_updt_tab_idx = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_UPDT_INDEX); r_cc_receive_fsm = CC_RECEIVE_UPDT_NLINE; break; @@ -6176,5 +6176,5 @@ if ((r_cc_receive_data_ins.read() == 1) and not r_cc_receive_icache_req.read() and r_cc_receive_updt_fifo_be.empty()) { - r_cc_receive_icache_updt_tab_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); + r_cc_receive_icache_updt_tab_idx = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_UPDT_INDEX); r_cc_receive_fsm = CC_RECEIVE_UPDT_NLINE; break; @@ -6195,6 +6195,6 @@ (p_dspin_in.write.read()) ) { - r_cc_receive_dcache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_NLINE); - r_cc_receive_word_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_WORD_INDEX); + r_cc_receive_dcache_nline = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_NLINE); + r_cc_receive_word_idx = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_WORD_INDEX); r_cc_receive_dcache_type = CC_TYPE_UPDT; // get back to idle state @@ -6209,6 +6209,6 @@ (p_dspin_in.write.read())) { - r_cc_receive_icache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_NLINE); - r_cc_receive_word_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_WORD_INDEX); + r_cc_receive_icache_nline = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_NLINE); + r_cc_receive_word_idx = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_WORD_INDEX); r_cc_receive_icache_type = CC_TYPE_UPDT; // get back to idle state @@ -6233,6 +6233,6 @@ uint64_t receive_data = p_dspin_in.data.read(); bool receive_eop = p_dspin_in.eop.read(); - cc_receive_updt_fifo_be = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_BE); - cc_receive_updt_fifo_data = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_DATA); + cc_receive_updt_fifo_be = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_BE); + cc_receive_updt_fifo_data = DspinOdccpParam::dspin_get(receive_data,DspinOdccpParam::MULTI_UPDT_DATA); cc_receive_updt_fifo_eop = receive_eop; cc_receive_updt_fifo_put = true; @@ -6454,10 +6454,10 @@ { // initialize dspin send data - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, m_cc_global_id, - DspinDhccpParam::CLEANUP_SRCID); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::CLEANUP_SRCID); + DspinOdccpParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::FROM_L1_BC); + DspinOdccpParam::FROM_L1_BC); if(r_cc_send_last_client.read() == 0) // dcache active request @@ -6465,32 +6465,32 @@ uint64_t dest = (uint64_t) r_dcache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); - DspinDhccpParam::dspin_set(dspin_send_data, + << (DspinOdccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); + DspinOdccpParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::CLEANUP_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::CLEANUP_DEST); + + DspinOdccpParam::dspin_set(dspin_send_data, (r_dcache_cc_send_nline.read() & 0x300000000ULL)>>32, - DspinDhccpParam::CLEANUP_NLINE_MSB); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::CLEANUP_NLINE_MSB); + + DspinOdccpParam::dspin_set(dspin_send_data, r_dcache_cc_send_way.read(), - DspinDhccpParam::CLEANUP_WAY_INDEX); - - DspinDhccpParam::dspin_set(dspin_send_data, - DspinDhccpParam::TYPE_CLEANUP_DATA, - DspinDhccpParam::FROM_L1_TYPE); + DspinOdccpParam::CLEANUP_WAY_INDEX); + + DspinOdccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::TYPE_CLEANUP_DATA, + DspinOdccpParam::FROM_L1_TYPE); /*ODCCP*/ // If cleanup on NCC line we set the CLEANUP_NCC bit in cleanup flit if (r_dcache_cleanup_ncc.read()) { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, 1, - DspinDhccpParam::CLEANUP_NCC); + DspinOdccpParam::CLEANUP_NCC); } else { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::CLEANUP_NCC); + DspinOdccpParam::CLEANUP_NCC); } @@ -6500,25 +6500,25 @@ uint64_t dest = (uint64_t) r_icache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); - - DspinDhccpParam::dspin_set(dspin_send_data, + << (DspinOdccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); + + DspinOdccpParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::CLEANUP_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::CLEANUP_DEST); + + DspinOdccpParam::dspin_set(dspin_send_data, (r_icache_cc_send_nline.read() & 0x300000000ULL)>>32, - DspinDhccpParam::CLEANUP_NLINE_MSB); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::CLEANUP_NLINE_MSB); + + DspinOdccpParam::dspin_set(dspin_send_data, r_icache_cc_send_way.read(), - DspinDhccpParam::CLEANUP_WAY_INDEX); - - DspinDhccpParam::dspin_set(dspin_send_data, - DspinDhccpParam::TYPE_CLEANUP_INST, - DspinDhccpParam::FROM_L1_TYPE); + DspinOdccpParam::CLEANUP_WAY_INDEX); + + DspinOdccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::TYPE_CLEANUP_INST, + DspinOdccpParam::FROM_L1_TYPE); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::CLEANUP_NCC); + DspinOdccpParam::CLEANUP_NCC); } // send flit @@ -6544,13 +6544,13 @@ if(r_cc_send_last_client.read() == 0) // dcache active request { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, r_dcache_cc_send_nline.read() & 0xFFFFFFFFULL, - DspinDhccpParam::CLEANUP_NLINE_LSB); + DspinOdccpParam::CLEANUP_NLINE_LSB); } else // icache active request { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, r_icache_cc_send_nline.read() & 0xFFFFFFFFULL, - DspinDhccpParam::CLEANUP_NLINE_LSB); + DspinOdccpParam::CLEANUP_NLINE_LSB); } // send flit @@ -6571,7 +6571,7 @@ } - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, r_cc_send_data_fifo.read(), - DspinDhccpParam::CLEANUP_DATA_UPDT); + DspinOdccpParam::CLEANUP_DATA_UPDT); p_dspin_out.data = dspin_send_data; @@ -6583,13 +6583,13 @@ { // initialize dspin send data -// DspinDhccpParam::dspin_set(dspin_send_data, +// DspinOdccpParam::dspin_set(dspin_send_data, // 1, -// DspinDhccpParam::FROM_L1_EOP); - DspinDhccpParam::dspin_set(dspin_send_data, +// DspinOdccpParam::FROM_L1_EOP); + DspinOdccpParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::FROM_L1_BC); - DspinDhccpParam::dspin_set(dspin_send_data, - DspinDhccpParam::TYPE_MULTI_ACK, - DspinDhccpParam::FROM_L1_TYPE); + DspinOdccpParam::FROM_L1_BC); + DspinOdccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::TYPE_MULTI_ACK, + DspinOdccpParam::FROM_L1_TYPE); if(r_cc_send_last_client.read() == 0) // dcache active request @@ -6597,13 +6597,13 @@ uint64_t dest = (uint64_t) r_dcache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); + << (DspinOdccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::MULTI_ACK_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::MULTI_ACK_DEST); + + DspinOdccpParam::dspin_set(dspin_send_data, r_dcache_cc_send_updt_tab_idx.read(), - DspinDhccpParam::MULTI_ACK_UPDT_INDEX); + DspinOdccpParam::MULTI_ACK_UPDT_INDEX); } else // icache active request @@ -6611,14 +6611,14 @@ uint64_t dest = (uint64_t) r_icache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); + << (DspinOdccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::MULTI_ACK_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinOdccpParam::MULTI_ACK_DEST); + + DspinOdccpParam::dspin_set(dspin_send_data, r_icache_cc_send_updt_tab_idx.read(), - DspinDhccpParam::MULTI_ACK_UPDT_INDEX); + DspinOdccpParam::MULTI_ACK_UPDT_INDEX); } // send flit Index: branches/ODCCP/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd =================================================================== --- branches/ODCCP/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd (revision 452) +++ branches/ODCCP/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd (revision 453) @@ -40,5 +40,5 @@ Uses('caba:generic_fifo'), Uses('caba:generic_llsc_global_table'), - Uses('caba:dspin_dhccp_param') + Uses('caba:dspin_odccp_param') ], Index: branches/ODCCP/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h =================================================================== --- branches/ODCCP/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 452) +++ branches/ODCCP/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 453) @@ -50,5 +50,5 @@ #include "update_tab.h" #include "dspin_interface.h" -#include "dspin_dhccp_param.h" +#include "dspin_odccp_param.h" #define TRT_ENTRIES 4 // Number of entries in TRT Index: branches/ODCCP/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp =================================================================== --- branches/ODCCP/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (revision 452) +++ branches/ODCCP/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (revision 453) @@ -1438,6 +1438,6 @@ { uint64_t flit = m_cc_receive_to_multi_ack_fifo.read(); - updt_index = DspinDhccpParam::dspin_get(flit, - DspinDhccpParam::MULTI_ACK_UPDT_INDEX); + updt_index = DspinOdccpParam::dspin_get(flit, + DspinOdccpParam::MULTI_ACK_UPDT_INDEX); cc_receive_to_multi_ack_fifo_get = true; @@ -4552,30 +4552,30 @@ uint64_t flit = m_cc_receive_to_cleanup_fifo.read(); uint32_t srcid = - DspinDhccpParam::dspin_get( + DspinOdccpParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_SRCID); + DspinOdccpParam::CLEANUP_SRCID); uint8_t type = - DspinDhccpParam::dspin_get( + DspinOdccpParam::dspin_get( flit, - DspinDhccpParam::FROM_L1_TYPE); + DspinOdccpParam::FROM_L1_TYPE); r_cleanup_way_index = - DspinDhccpParam::dspin_get( + DspinOdccpParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_WAY_INDEX); + DspinOdccpParam::CLEANUP_WAY_INDEX); r_cleanup_nline = - DspinDhccpParam::dspin_get( + DspinOdccpParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_NLINE_MSB) << 32; + DspinOdccpParam::CLEANUP_NLINE_MSB) << 32; /*ODCCP*/ // Cleanup on no coherent line if 1 r_cleanup_ncc = - DspinDhccpParam::dspin_get( + DspinOdccpParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_NCC); - - r_cleanup_inst = (type == DspinDhccpParam::TYPE_CLEANUP_INST); + DspinOdccpParam::CLEANUP_NCC); + + r_cleanup_inst = (type == DspinOdccpParam::TYPE_CLEANUP_INST); r_cleanup_srcid = srcid; @@ -4599,5 +4599,5 @@ << " CLEANUP_IDLE> Cleanup request:" << std::hex << " / owner_id = " << srcid - << " / owner_ins = " << (type == DspinDhccpParam::TYPE_CLEANUP_INST) << std::endl; + << " / owner_ins = " << (type == DspinOdccpParam::TYPE_CLEANUP_INST) << std::endl; #endif break; @@ -4613,7 +4613,7 @@ addr_t nline = r_cleanup_nline.read() | - DspinDhccpParam::dspin_get(flit, DspinDhccpParam::CLEANUP_NLINE_LSB); + DspinOdccpParam::dspin_get(flit, DspinOdccpParam::CLEANUP_NLINE_LSB); - bool eop = DspinDhccpParam::dspin_get(flit, DspinDhccpParam::FROM_L1_EOP); + bool eop = DspinOdccpParam::dspin_get(flit, DspinOdccpParam::FROM_L1_EOP); /*ODCCP*/ // if not eop (more than 2 flits) there is a cleanup no coherent with data @@ -4652,5 +4652,5 @@ uint32_t data = - DspinDhccpParam::dspin_get (flit, DspinDhccpParam::CLEANUP_DATA_UPDT); + DspinOdccpParam::dspin_get (flit, DspinOdccpParam::CLEANUP_DATA_UPDT); r_cleanup_data[r_cleanup_data_index.read()] = data; @@ -6982,10 +6982,10 @@ uint8_t type = - DspinDhccpParam::dspin_get( + DspinOdccpParam::dspin_get( p_dspin_in.data.read(), - DspinDhccpParam::FROM_L1_TYPE); - - if((type == DspinDhccpParam::TYPE_CLEANUP_DATA) or - (type == DspinDhccpParam::TYPE_CLEANUP_INST)) + DspinOdccpParam::FROM_L1_TYPE); + + if((type == DspinOdccpParam::TYPE_CLEANUP_DATA) or + (type == DspinOdccpParam::TYPE_CLEANUP_INST)) { r_cc_receive_fsm = CC_RECEIVE_CLEANUP; @@ -6993,5 +6993,5 @@ } - if(type == DspinDhccpParam::TYPE_MULTI_ACK) + if(type == DspinOdccpParam::TYPE_MULTI_ACK) { r_cc_receive_fsm = CC_RECEIVE_MULTI_ACK; @@ -8713,30 +8713,30 @@ if(m_config_to_cc_send_inst_fifo.read()) { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_INST; + multi_inval_type = DspinOdccpParam::TYPE_MULTI_INVAL_INST; } else { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_DATA; + multi_inval_type = DspinOdccpParam::TYPE_MULTI_INVAL_DATA; } uint64_t flit = 0; uint64_t dest = m_config_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( flit, + (DspinOdccpParam::SRCID_WIDTH - vci_param_int::S); + + DspinOdccpParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_INVAL_DEST); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::MULTI_INVAL_DEST); + + DspinOdccpParam::dspin_set( flit, m_cc_global_id, - DspinDhccpParam::MULTI_INVAL_SRCID); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::MULTI_INVAL_SRCID); + + DspinOdccpParam::dspin_set( flit, r_config_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_INVAL_UPDT_INDEX); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::MULTI_INVAL_UPDT_INDEX); + + DspinOdccpParam::dspin_set( flit, multi_inval_type, - DspinDhccpParam::FROM_MC_TYPE); + DspinOdccpParam::FROM_MC_TYPE); p_dspin_out.write = true; p_dspin_out.data = flit; @@ -8747,7 +8747,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, r_config_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_INVAL_NLINE); + DspinOdccpParam::MULTI_INVAL_NLINE); p_dspin_out.eop = true; p_dspin_out.write = true; @@ -8761,9 +8761,9 @@ if(r_cleanup_to_cc_send_inst.read()) { - cleanup_ack_type = DspinDhccpParam::TYPE_CLEANUP_ACK_INST; + cleanup_ack_type = DspinOdccpParam::TYPE_CLEANUP_ACK_INST; } else { - cleanup_ack_type = DspinDhccpParam::TYPE_CLEANUP_ACK_DATA; + cleanup_ack_type = DspinOdccpParam::TYPE_CLEANUP_ACK_DATA; } @@ -8771,25 +8771,25 @@ uint64_t dest = r_cleanup_to_cc_send_srcid.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( + (DspinOdccpParam::SRCID_WIDTH - vci_param_int::S); + + DspinOdccpParam::dspin_set( flit, dest, - DspinDhccpParam::CLEANUP_ACK_DEST); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::CLEANUP_ACK_DEST); + + DspinOdccpParam::dspin_set( flit, r_cleanup_to_cc_send_set_index.read(), - DspinDhccpParam::CLEANUP_ACK_SET); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::CLEANUP_ACK_SET); + + DspinOdccpParam::dspin_set( flit, r_cleanup_to_cc_send_way_index.read(), - DspinDhccpParam::CLEANUP_ACK_WAY); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::CLEANUP_ACK_WAY); + + DspinOdccpParam::dspin_set( flit, cleanup_ack_type, - DspinDhccpParam::FROM_MC_TYPE); + DspinOdccpParam::FROM_MC_TYPE); p_dspin_out.eop = true; @@ -8808,30 +8808,30 @@ if(m_xram_rsp_to_cc_send_inst_fifo.read()) { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_INST; + multi_inval_type = DspinOdccpParam::TYPE_MULTI_INVAL_INST; } else { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_DATA; + multi_inval_type = DspinOdccpParam::TYPE_MULTI_INVAL_DATA; } uint64_t flit = 0; uint64_t dest = m_xram_rsp_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( flit, + (DspinOdccpParam::SRCID_WIDTH - vci_param_int::S); + + DspinOdccpParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_INVAL_DEST); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::MULTI_INVAL_DEST); + + DspinOdccpParam::dspin_set( flit, m_cc_global_id, - DspinDhccpParam::MULTI_INVAL_SRCID); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::MULTI_INVAL_SRCID); + + DspinOdccpParam::dspin_set( flit, r_xram_rsp_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_INVAL_UPDT_INDEX); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::MULTI_INVAL_UPDT_INDEX); + + DspinOdccpParam::dspin_set( flit, multi_inval_type, - DspinDhccpParam::FROM_MC_TYPE); + DspinOdccpParam::FROM_MC_TYPE); p_dspin_out.write = true; p_dspin_out.data = flit; @@ -8844,7 +8844,7 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, r_xram_rsp_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_INVAL_NLINE); + DspinOdccpParam::MULTI_INVAL_NLINE); p_dspin_out.eop = true; p_dspin_out.write = true; @@ -8861,15 +8861,15 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, m_broadcast_boundaries, - DspinDhccpParam::BROADCAST_BOX); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::BROADCAST_BOX); + + DspinOdccpParam::dspin_set( flit, m_cc_global_id, - DspinDhccpParam::BROADCAST_SRCID); - - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::BROADCAST_SRCID); + + DspinOdccpParam::dspin_set( flit, 1ULL, - DspinDhccpParam::FROM_MC_BC); + DspinOdccpParam::FROM_MC_BC); p_dspin_out.write = true; p_dspin_out.data = flit; @@ -8880,7 +8880,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, r_xram_rsp_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinOdccpParam::BROADCAST_NLINE); p_dspin_out.write = true; p_dspin_out.eop = true; @@ -8892,7 +8892,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, r_config_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinOdccpParam::BROADCAST_NLINE); p_dspin_out.write = true; p_dspin_out.eop = true; @@ -8904,7 +8904,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, r_write_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinOdccpParam::BROADCAST_NLINE); p_dspin_out.write = true; p_dspin_out.eop = true; @@ -8916,7 +8916,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinOdccpParam::dspin_set( flit, r_cas_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinOdccpParam::BROADCAST_NLINE); p_dspin_out.write = true; p_dspin_out.eop = true; @@ -8932,9 +8932,9 @@ if(m_write_to_cc_send_inst_fifo.read()) { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_INST; + multi_updt_type = DspinOdccpParam::TYPE_MULTI_UPDT_INST; } else { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_DATA; + multi_updt_type = DspinOdccpParam::TYPE_MULTI_UPDT_DATA; } @@ -8942,25 +8942,25 @@ uint64_t dest = m_write_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( + (DspinOdccpParam::SRCID_WIDTH - vci_param_int::S); + + DspinOdccpParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_UPDT_DEST); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_DEST); + + DspinOdccpParam::dspin_set( flit, m_cc_global_id, - DspinDhccpParam::MULTI_UPDT_SRCID); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_SRCID); + + DspinOdccpParam::dspin_set( flit, r_write_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_UPDT_INDEX); + + DspinOdccpParam::dspin_set( flit, multi_updt_type, - DspinDhccpParam::FROM_MC_TYPE); + DspinOdccpParam::FROM_MC_TYPE); p_dspin_out.write = true; @@ -8974,13 +8974,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinOdccpParam::dspin_set( flit, r_write_to_cc_send_index.read(), - DspinDhccpParam::MULTI_UPDT_WORD_INDEX); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_WORD_INDEX); + + DspinOdccpParam::dspin_set( flit, r_write_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_UPDT_NLINE); + DspinOdccpParam::MULTI_UPDT_NLINE); p_dspin_out.write = true; @@ -9001,13 +9001,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinOdccpParam::dspin_set( flit, multi_updt_be, - DspinDhccpParam::MULTI_UPDT_BE); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_BE); + + DspinOdccpParam::dspin_set( flit, multi_updt_data, - DspinDhccpParam::MULTI_UPDT_DATA); + DspinOdccpParam::MULTI_UPDT_DATA); p_dspin_out.write = true; @@ -9025,9 +9025,9 @@ if(m_cas_to_cc_send_inst_fifo.read()) { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_INST; + multi_updt_type = DspinOdccpParam::TYPE_MULTI_UPDT_INST; } else { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_DATA; + multi_updt_type = DspinOdccpParam::TYPE_MULTI_UPDT_DATA; } @@ -9035,25 +9035,25 @@ uint64_t dest = m_cas_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( + (DspinOdccpParam::SRCID_WIDTH - vci_param_int::S); + + DspinOdccpParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_UPDT_DEST); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_DEST); + + DspinOdccpParam::dspin_set( flit, m_cc_global_id, - DspinDhccpParam::MULTI_UPDT_SRCID); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_SRCID); + + DspinOdccpParam::dspin_set( flit, r_cas_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_UPDT_INDEX); + + DspinOdccpParam::dspin_set( flit, multi_updt_type, - DspinDhccpParam::FROM_MC_TYPE); + DspinOdccpParam::FROM_MC_TYPE); p_dspin_out.write = true; @@ -9067,13 +9067,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinOdccpParam::dspin_set( flit, r_cas_to_cc_send_index.read(), - DspinDhccpParam::MULTI_UPDT_WORD_INDEX); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_WORD_INDEX); + + DspinOdccpParam::dspin_set( flit, r_cas_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_UPDT_NLINE); + DspinOdccpParam::MULTI_UPDT_NLINE); p_dspin_out.write = true; @@ -9087,13 +9087,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinOdccpParam::dspin_set( flit, 0xF, - DspinDhccpParam::MULTI_UPDT_BE); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_BE); + + DspinOdccpParam::dspin_set( flit, r_cas_to_cc_send_wdata.read(), - DspinDhccpParam::MULTI_UPDT_DATA); + DspinOdccpParam::MULTI_UPDT_DATA); p_dspin_out.write = true; @@ -9108,13 +9108,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinOdccpParam::dspin_set( flit, 0xF, - DspinDhccpParam::MULTI_UPDT_BE); - - DspinDhccpParam::dspin_set( + DspinOdccpParam::MULTI_UPDT_BE); + + DspinOdccpParam::dspin_set( flit, r_cas_to_cc_send_wdata_high.read(), - DspinDhccpParam::MULTI_UPDT_DATA); + DspinOdccpParam::MULTI_UPDT_DATA); p_dspin_out.write = true;