Index: branches/reconfiguration/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h =================================================================== --- branches/reconfiguration/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 861) +++ branches/reconfiguration/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 862) @@ -25,5 +25,5 @@ * SOCLIB_LGPL_HEADER_END * - * Maintainers: alain.greiner@lip6.fr + * Maintainers: alain.greiner@lip6.fr * eric.guthmuller@polytechnique.edu * cesar.fuguet-tortolero@lip6.fr @@ -62,5 +62,5 @@ using namespace sc_core; - template p_read_fsm; - sc_out p_write_fsm; - sc_out p_xram_rsp_fsm; - sc_out p_cas_fsm; - sc_out p_cleanup_fsm; - sc_out p_config_fsm; - sc_out p_alloc_heap_fsm; - sc_out p_alloc_dir_fsm; - sc_out p_alloc_trt_fsm; - sc_out p_alloc_upt_fsm; - sc_out p_alloc_ivt_fsm; - sc_out p_tgt_cmd_fsm; - sc_out p_tgt_rsp_fsm; - sc_out p_ixr_cmd_fsm; - sc_out p_ixr_rsp_fsm; - sc_out p_cc_send_fsm; - sc_out p_cc_receive_fsm; - sc_out p_multi_ack_fsm; + sc_out p_read_fsm; + sc_out p_write_fsm; + sc_out p_xram_rsp_fsm; + sc_out p_cas_fsm; + sc_out p_cleanup_fsm; + sc_out p_config_fsm; + sc_out p_alloc_heap_fsm; + sc_out p_alloc_dir_fsm; + sc_out p_alloc_trt_fsm; + sc_out p_alloc_upt_fsm; + sc_out p_alloc_ivt_fsm; + sc_out p_tgt_cmd_fsm; + sc_out p_tgt_rsp_fsm; + sc_out p_ixr_cmd_fsm; + sc_out p_ixr_rsp_fsm; + sc_out p_cc_send_fsm; + sc_out p_cc_receive_fsm; + sc_out p_multi_ack_fsm; #endif @@ -508,7 +508,7 @@ const size_t max_copies, // max number of copies const size_t heap_size=HEAP_ENTRIES, - const size_t trt_lines=TRT_ENTRIES, - const size_t upt_lines=UPT_ENTRIES, - const size_t ivt_lines=IVT_ENTRIES, + const size_t trt_lines=TRT_ENTRIES, + const size_t upt_lines=UPT_ENTRIES, + const size_t ivt_lines=IVT_ENTRIES, const size_t debug_start_cycle=0, const bool debug_ok=false ); @@ -534,5 +534,5 @@ // Component attributes - std::list m_seglist; // segments allocated + std::list m_seglist; // segments allocated size_t m_nseg; // number of segments soclib::common::Segment **m_seg; // array of segments pointers @@ -607,5 +607,5 @@ // Fifo between CC_RECEIVE fsm and CLEANUP fsm GenericFifo m_cc_receive_to_cleanup_fifo; - + // Fifo between CC_RECEIVE fsm and MULTI_ACK fsm GenericFifo m_cc_receive_to_multi_ack_fifo; @@ -636,5 +636,5 @@ sc_signal r_config_fsm; // FSM state sc_signal r_config_lock; // lock protecting exclusive access - sc_signal r_config_cmd; // config request type + sc_signal r_config_cmd; // config request type sc_signal r_config_address; // target buffer physical address sc_signal r_config_srcid; // config request srcid @@ -652,5 +652,5 @@ sc_signal r_config_heap_next; // current pointer to scan HEAP sc_signal r_config_trt_index; // selected entry in TRT - sc_signal r_config_ivt_index; // selected entry in IVT + sc_signal r_config_ivt_index; // selected entry in IVT // Buffer between CONFIG fsm and IXR_CMD fsm @@ -694,5 +694,5 @@ sc_signal r_read_ll_key; // LL key from llsc_global_table - // Buffer between READ fsm and IXR_CMD fsm + // Buffer between READ fsm and IXR_CMD fsm sc_signal r_read_to_ixr_cmd_req; // valid request sc_signal r_read_to_ixr_cmd_index; // TRT index @@ -746,7 +746,7 @@ sc_signal r_write_to_tgt_rsp_sc_fail; // sc command failed - // Buffer between WRITE fsm and IXR_CMD fsm + // Buffer between WRITE fsm and IXR_CMD fsm sc_signal r_write_to_ixr_cmd_req; // valid request - sc_signal r_write_to_ixr_cmd_index; // TRT index + sc_signal r_write_to_ixr_cmd_index; // TRT index // Buffer between WRITE fsm and CC_SEND fsm (Update/Invalidate L1 caches) @@ -849,7 +849,7 @@ sc_signal * r_cas_data; // cache line data - // Buffer between CAS fsm and IXR_CMD fsm + // Buffer between CAS fsm and IXR_CMD fsm sc_signal r_cas_to_ixr_cmd_req; // valid request - sc_signal r_cas_to_ixr_cmd_index; // TRT index + sc_signal r_cas_to_ixr_cmd_index; // TRT index // Buffer between CAS fsm and TGT_RSP fsm @@ -881,5 +881,5 @@ // Buffer between IXR_RSP fsm and CONFIG fsm (response from the XRAM) - sc_signal r_ixr_rsp_to_config_ack; // one single bit + sc_signal r_ixr_rsp_to_config_ack; // one single bit // Buffer between IXR_RSP fsm and XRAM_RSP fsm (response from the XRAM) @@ -931,7 +931,7 @@ GenericFifo m_xram_rsp_to_cc_send_srcid_fifo; // fifo for srcids - // Buffer between XRAM_RSP fsm and IXR_CMD fsm + // Buffer between XRAM_RSP fsm and IXR_CMD fsm sc_signal r_xram_rsp_to_ixr_cmd_req; // Valid request - sc_signal r_xram_rsp_to_ixr_cmd_index; // TRT index + sc_signal r_xram_rsp_to_ixr_cmd_index; // TRT index //////////////////////////////////////////////////// @@ -941,5 +941,5 @@ sc_signal r_ixr_cmd_fsm; sc_signal r_ixr_cmd_word; // word index for a put - sc_signal r_ixr_cmd_trdid; // TRT index value + sc_signal r_ixr_cmd_trdid; // TRT index value sc_signal r_ixr_cmd_address; // address to XRAM sc_signal * r_ixr_cmd_wdata; // cache line buffer