Changeset 549 for trunk/modules/vci_mem_cache/caba/source/include

Timestamp:

Oct 17, 2013, 8:50:46 PM (12 years ago)

Author:

alain

Message:

Compliance with mapping_table defined in release 2462
Introducing the dspin_router_tsar component used in tsar_generic_iob
platform to implement the RAM networt (between L2 & L3).

Location:

trunk/modules/vci_mem_cache/caba/source/include

Files:

• vci_mem_cache.h (modified) (1 diff)
• xram_transaction.h (modified) (5 diffs)

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

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

trunk/modules/vci_mem_cache/caba/source/include/xram_transaction.h

@@ -29 +29 @@
     bool                        proc_read;          // read request from processor
     size_t                  read_length;    // length of the read (for the response)
-    size_t                  word_index;         // index of the first read word (for the response)
+    size_t                  word_index;         // index of the first read word (for response)
     std::vector<data_t> wdata;          // write buffer (one cache line)
     std::vector<be_t>   wdata_be;       // be for each data in the write buffer
@@ -48 +48 @@
     /////////////////////////////////////////////////////////////////////
     // The alloc() function initializes the vectors of an entry
-    // Its arguments are :
-    // - n_words : number of words per line in the cache
+    // The "n_words" argument is the number of words in a cache line.
     /////////////////////////////////////////////////////////////////////
     void alloc(size_t n_words)
@@ -64 +63 @@
     ////////////////////////////////////////////////////////////////////
     // The copy() function copies an existing entry
-    // Its arguments are :
-    // - source : the transaction tab entry to copy
     ////////////////////////////////////////////////////////////////////
     void copy(const TransactionTabEntry &source)
@@ -86 +83 @@
 
     ////////////////////////////////////////////////////////////////////
-    // The print() function prints the entry 
-    ////////////////////////////////////////////////////////////////////
-    void print()
-    {
-        std::cout << "------- TRT entry -------" << std::endl;
-        std::cout << "valid       = " << valid        << std::endl;
-        std::cout << "xram_read   = " << xram_read    << std::endl;
-        std::cout << "nline       = " << std::hex << nline << std::endl;
-        std::cout << "srcid       = " << srcid        << std::endl;
-        std::cout << "trdid       = " << trdid        << std::endl;
-        std::cout << "pktid       = " << pktid        << std::endl;
-        std::cout << "proc_read   = " << proc_read    << std::endl;
-        std::cout << "read_length = " << read_length  << std::endl;
-        std::cout << "word_index  = " << word_index   << std::endl; 
-        for(size_t i=0; i<wdata_be.size() ; i++)
-        {
-            std::cout << "wdata_be[" << std::dec << i << "] = " 
-                      << std::hex << wdata_be[i] << std::endl;
-        }
-        for(size_t i=0; i<wdata.size() ; i++)
-        {
-            std::cout << "wdata[" << std::dec << i << "] = " 
-                      << std::hex << wdata[i] << std::endl;
-        }
-        std::cout << "rerror      = " << rerror       << std::endl;
-        std::cout << "ll_key      = " << ll_key       << std::endl;
-        std::cout << "config      = " << config       << std::endl;
-        std::cout << std::endl;
+    // The print() function prints the entry identified by "index". 
+    ////////////////////////////////////////////////////////////////////
+    void print( size_t index, size_t mode )
+    {
+        std::cout << "  TRT[" << std::dec << index << "] "
+                  << " valid = " << valid
+                  << " / error = " << rerror 
+                  << " / get = " << xram_read 
+                  << " / config = " << config << std::hex
+                  << " / address = " << nline*4*wdata.size()
+                  << " / srcid = " << srcid << std::endl;
+        if ( mode )
+        {
+            std::cout << "        trdid = " << trdid
+                      << " / pktid = " << pktid << std::dec 
+                      << " / proc_read = " << proc_read 
+                      << " / read_length = " << read_length
+                      << " / word_index  = " << word_index << std::hex 
+                      << " / ll_key = " << ll_key << std::endl;
+            std::cout << "        wdata = ";
+            for(size_t i=0; i<wdata.size() ; i++)
+            {
+                std::cout << std::hex << wdata[i] << " / ";
+            }
+            std::cout << std::endl;
+        }
     }
 
@@ -228 +223 @@
     }
     /////////////////////////////////////////////////////////////////////
-    // The print() function prints a transaction tab entry
-    // Arguments :
-    // - index : the index of the entry to print
-    /////////////////////////////////////////////////////////////////////
-    void print(const size_t index)
-    {
-        assert( (index < size_tab) and
-        "MEMC ERROR: The selected entry is out of range in TRT write_data_mask()");
-
-        tab[index].print();
-        return;
+    // The print() function prints TRT content.
+    // Detailed content if detailed argument is non zero.
+    /////////////////////////////////////////////////////////////////////
+    void print( size_t detailed = 0 )
+    {
+        std::cout << "  < TRT content in " <<  tab_name << " >" << std::endl;
+        for ( size_t id = 0 ; id < size_tab ; id++ )
+        {
+            tab[id].print( id , detailed );
+        }
     }
     /////////////////////////////////////////////////////////////////////