Changeset 788

Timestamp:

Sep 3, 2014, 10:56:02 AM (10 years ago)

Author:

meunier

Message:

MESI Branch:

• Frozen cycle correction (Hao)

Location:

branches/MESI/modules/vci_mem_cache/caba/source

Files:

• include/vci_mem_cache.h (modified) (1 diff)
• src/vci_mem_cache.cpp (modified) (6 diffs)

branches/MESI/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h

@@ -542 +542 @@
       void reset_counters();
       void print_stats(bool activity_counters, bool stats);
-      void print_trace( size_t detailled = 0 );
+      void print_trace(size_t detailled = 0);
       void cache_monitor(addr_t addr);
       void start_monitor(addr_t addr, addr_t length);

branches/MESI/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -891 +891 @@
 
     /////////////////////////////////////////
-    tmpl(void)::print_stats(bool activity_counters)
+    tmpl(void)::print_stats(bool activity_counters, bool stats)
+    /////////////////////////////////////////
+    // @param stats is unused at the moment
     {
         std::cout << "**********************************" << std::dec << std::endl;
@@ -7683 +7685 @@
             case CC_SEND_CONFIG_IDLE:    // XRAM_RSP FSM has highest priority
                 {
-                    bool cc_send_updt_delay = not r_read_to_cc_send_type.read() and r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
+                    bool cc_send_updt_delay = r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
                                               r_read_to_cc_send_nline.read() == r_cleanup_to_tgt_rsp_nline.read() and
                                               m_read_to_cc_send_srcid_fifo.read() == r_cleanup_to_tgt_rsp_srcid.read();
@@ -7752 +7754 @@
             case CC_SEND_WRITE_IDLE:     // CONFIG FSM has highest priority
                 {
-                    bool cc_send_updt_delay = not r_read_to_cc_send_type.read() and r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
+                    bool cc_send_updt_delay = r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
                                               r_read_to_cc_send_nline.read() == r_cleanup_to_tgt_rsp_nline.read() and
                                               m_read_to_cc_send_srcid_fifo.read() == r_cleanup_to_tgt_rsp_srcid.read();
@@ -7819 +7821 @@
             case CC_SEND_XRAM_RSP_IDLE:   // CAS FSM has highest priority
                 {
-                    bool cc_send_updt_delay = not r_read_to_cc_send_type.read() and r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
+                    bool cc_send_updt_delay = r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
                                               r_read_to_cc_send_nline.read() == r_cleanup_to_tgt_rsp_nline.read() and
                                               m_read_to_cc_send_srcid_fifo.read() == r_cleanup_to_tgt_rsp_srcid.read();
@@ -7886 +7888 @@
             case CC_SEND_CAS_IDLE:   // CLEANUP FSM has highest priority
                 {
-                    bool cc_send_updt_delay = not r_read_to_cc_send_type.read() and r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
+                    bool cc_send_updt_delay = r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
                                               r_read_to_cc_send_nline.read() == r_cleanup_to_tgt_rsp_nline.read() and
                                               m_read_to_cc_send_srcid_fifo.read() == r_cleanup_to_tgt_rsp_srcid.read();
@@ -7953 +7955 @@
             case CC_SEND_READ_IDLE:    // WRITE FSM has highest priority  
                 {
-                    bool cc_send_updt_delay = not r_read_to_cc_send_type.read() and r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
+                    bool cc_send_updt_delay = r_tgt_rsp_fsm.read() == TGT_RSP_CLEANUP and
                                               r_read_to_cc_send_nline.read() == r_cleanup_to_tgt_rsp_nline.read() and
                                               m_read_to_cc_send_srcid_fifo.read() == r_cleanup_to_tgt_rsp_srcid.read();