Changeset 222 for trunk/modules

Timestamp:

Mar 29, 2012, 1:44:05 PM (13 years ago)

Author:

bouyer

Message:

make the cache monitor function print the FSM state which does the update,
and print the srcid if it makes sense.
In the XRAM_RSP_DIR_UPDT, print the right data.

Location:

trunk/modules/vci_mem_cache_v4/caba/source

Files:

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

trunk/modules/vci_mem_cache_v4/caba/source/include/vci_mem_cache_v4.h

@@ -363 +363 @@
       void transition();
       void genMoore();
-      void check_monitor(vci_addr_t addr, data_t data);
+      void check_monitor( const char *buf, vci_addr_t addr, data_t data);
 
       // Component attributes

trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp

@@ -461 +461 @@
 
 ///////////////////////////////////////////////////////////////////////
-tmpl(void)::check_monitor( vci_addr_t addr, data_t data )
+tmpl(void)::check_monitor( const char *buf, vci_addr_t addr, data_t data )
 ///////////////////////////////////////////////////////////////////////
 {
@@ -467 +467 @@
          (addr < m_monitor_base + m_monitor_length) )
     {
-        std::cout << " MEMC Write Monitor : Address = " << std::hex << addr
+        std::cout << " MEMC Write Monitor : " << buf << " Address = " << std::hex << addr
                   << " / Data = " << data << std::endl; 
     }
@@ -1792 +1792 @@
                         {
                             vci_addr_t address = (r_write_address.read() & ~(vci_addr_t)0x3F) | i<<2; 
-                            check_monitor( address, r_write_data[i].read() );
+                            char buf[80];
+                            snprintf(buf, 80, "WRITE_DIR_HIT srcid %d", r_write_srcid.read());
+                            check_monitor( buf, address, r_write_data[i].read() );
                         }
                     }
@@ -1865 +1867 @@
                             {
                                 vci_addr_t address = (r_write_address.read() & ~(vci_addr_t)0x3F) | i<<2; 
-                                check_monitor( address, r_write_data[i].read() );
+                                char buf[80];
+                                snprintf(buf, 80, "WRITE_UPT_LOCK srcid %d", srcid);
+                                check_monitor(buf, address, r_write_data[i].read() );
                             }
                         }
@@ -2875 +2879 @@
                 {
                     vci_addr_t address = r_xram_rsp_trt_buf.nline<<6 | i<<2; 
-                    check_monitor( address, r_write_data[i].read() );
+                    check_monitor("XRAM_RSP_DIR_UPDT", address, r_xram_rsp_trt_buf.wdata[i]);
                 }
             }
@@ -3951 +3955 @@
             {
                 vci_addr_t address = m_cmd_sc_addr_fifo.read();
-                check_monitor( address, r_sc_wdata.read() );
+                char buf[80];
+                snprintf(buf, 80, "SC_DIR_HIT_WRITE srcid %d", m_cmd_sc_srcid_fifo.read());
+                check_monitor( buf, address, r_sc_wdata.read() );
                 if ( r_sc_cpt.read()==4 )
-                    check_monitor( address+4, m_cmd_sc_wdata_fifo.read() );
+                    check_monitor( buf, address+4, m_cmd_sc_wdata_fifo.read() );
             }