Index: trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp
===================================================================
--- trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp	(revision 223)
+++ trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp	(revision 224)
@@ -799,6 +799,6 @@
 if( m_debug_tgt_cmd_fsm ) 
 {
-    std::cout << "  <MEMC.TGT_CMD_IDLE> Receive command from srcid " << p_vci_tgt.srcid.read()
-              << " / for address " << p_vci_tgt.address.read() << std::endl;
+    std::cout << "  <MEMC.TGT_CMD_IDLE> Receive command from srcid " << std::dec << p_vci_tgt.srcid.read()
+              << " / for address " << std::hex << p_vci_tgt.address.read() << std::endl;
 }
 #endif
@@ -849,7 +849,7 @@
     std::cout << "  <MEMC.TGT_CMD_READ> Push into read_fifo:" 
               << " address = " << std::hex << p_vci_tgt.address.read()
-              << " srcid = " << p_vci_tgt.srcid.read()
+              << " srcid = " << std::dec << p_vci_tgt.srcid.read()
               << " trdid = " << p_vci_tgt.trdid.read()
-              << " plen = " << p_vci_tgt.plen.read() << std::endl;
+              << " plen = " << std::dec << p_vci_tgt.plen.read() << std::endl;
 }
 #endif
@@ -871,9 +871,9 @@
     std::cout << "  <MEMC.TGT_CMD_WRITE> Push into write_fifo:" 
               << " address = " << std::hex << p_vci_tgt.address.read()
-              << " srcid = " << p_vci_tgt.srcid.read()
+              << " srcid = " << std::dec << p_vci_tgt.srcid.read()
               << " trdid = " << p_vci_tgt.trdid.read()
-              << " wdata = " << p_vci_tgt.wdata.read()
+              << " wdata = " << std::hex << p_vci_tgt.wdata.read()
               << " be = " << p_vci_tgt.be.read()
-              << " plen = " << p_vci_tgt.plen.read() << std::endl;
+              << " plen = " << std::dec << p_vci_tgt.plen.read() << std::endl;
 }
 #endif
@@ -901,9 +901,9 @@
     std::cout << "  <MEMC.TGT_CMD_ATOMIC> Pushing command into cmd_sc_fifo:"
               << " address = " << std::hex << p_vci_tgt.address.read()
-              << " srcid = " << p_vci_tgt.srcid.read()
+              << " srcid = " << std::dec << p_vci_tgt.srcid.read()
               << " trdid = " << p_vci_tgt.trdid.read()
-              << " wdata = " << p_vci_tgt.wdata.read()
+              << " wdata = " << std::hex << p_vci_tgt.wdata.read()
               << " be = " << p_vci_tgt.be.read()
-              << " plen = " << p_vci_tgt.plen.read() << std::endl;
+              << " plen = " << std::dec << p_vci_tgt.plen.read() << std::endl;
 }
 #endif
@@ -956,6 +956,6 @@
                               << " INIT_RSP_IDLE state" << std::endl
                               << "index too large for UPT: " 
-                              << " / rtrdid = " << p_vci_ini.rtrdid.read()
-                              << " / UPT size = " << m_update_tab.size() << std::endl;
+                              << " / rtrdid = " << std::dec << p_vci_ini.rtrdid.read()
+                              << " / UPT size = " << std::dec << m_update_tab.size() << std::endl;
                     exit(0);
                 }
@@ -1092,6 +1092,6 @@
 {
     std::cout << "  <MEMC.READ_IDLE> Read request:"
-              << " srcid = " << std::hex << m_cmd_read_srcid_fifo.read()
-              << " / address = " << m_cmd_read_addr_fifo.read()
+              << " srcid = " << std::dec << m_cmd_read_srcid_fifo.read()
+              << " / address = " << std::hex << m_cmd_read_addr_fifo.read()
               << " / nwords = " << std::dec << m_cmd_read_length_fifo.read() << std::endl;
 }
@@ -1142,5 +1142,5 @@
     std::cout << "  <MEMC.READ_DIR_LOCK> Accessing directory: "
               << " address = " << std::hex << m_cmd_read_addr_fifo.read() 
-              << " / hit = " << entry.valid 
+              << " / hit = " << std::dec << entry.valid 
               << " / count = " <<std::dec << entry.count
               << " / is_cnt = " << entry.is_cnt << std::endl;
@@ -1439,6 +1439,6 @@
 {
     std::cout << "  <MEMC.READ_RSP> Request the TGT_RSP FSM to return data:"
-              << " rsrcid = " << std::hex << m_cmd_read_srcid_fifo.read()
-              << " / address = " << m_cmd_read_addr_fifo.read()
+              << " rsrcid = " << std::dec << m_cmd_read_srcid_fifo.read()
+              << " / address = " << std::hex << m_cmd_read_addr_fifo.read()
               << " / nwords = " << std::dec << m_cmd_read_length_fifo.read() << std::endl;
 }
@@ -1503,6 +1503,7 @@
 {
     std::cout << "  <MEMC.READ_TRT_SET> Write in Transaction Table: " << std::hex
-              << " address = " << m_cmd_read_addr_fifo.read() 
-              << " / srcid = " << m_cmd_read_srcid_fifo.read() << std::endl;
+              << " address = " << std::hex << m_cmd_read_addr_fifo.read() 
+              << " / srcid = " << std::dec << m_cmd_read_srcid_fifo.read()
+	      << std::endl;
 }
 #endif
@@ -1527,5 +1528,5 @@
 {
     std::cout << "  <MEMC.READ_TRT_REQ> Request GET transaction for address " 
-              << m_cmd_read_addr_fifo.read() << std::endl;
+              << std::hex << m_cmd_read_addr_fifo.read() << std::endl;
 }
 #endif
@@ -1607,6 +1608,6 @@
 {
     std::cout << "  <MEMC.WRITE_IDLE> Write request " 
-              << " srcid = " << std::hex << m_cmd_write_srcid_fifo.read()
-              << " / address = " << m_cmd_write_addr_fifo.read() 
+              << " srcid = " << std::dec << m_cmd_write_srcid_fifo.read()
+              << " / address = " << std::hex << m_cmd_write_addr_fifo.read() 
               << " / data = " << m_cmd_write_data_fifo.read() << std::endl;
 }
@@ -1696,6 +1697,6 @@
     std::cout << "  <MEMC.WRITE_DIR_LOCK> Check the directory: "
               << " address = " << std::hex << r_write_address.read()
-              << " hit = " << entry.valid 
-              << " count = " << std::dec << entry.count 
+              << " hit = " << std::dec << entry.valid 
+              << " count = " << entry.count 
               << " is_cnt = " << entry.is_cnt << std::endl;
 }
@@ -1955,6 +1956,6 @@
 {
     std::cout << "  <MEMC.WRITE_UPT_REQ> Post first request to INIT_CMD FSM" 
-              << " / srcid = " << r_write_copy.read() 
-              << " / inst = "  << r_write_copy_inst.read() << std::endl;
+              << " / srcid = " << std::dec << r_write_copy.read() 
+              << " / inst = "  << std::dec << r_write_copy_inst.read() << std::endl;
     if ( r_write_count.read() == 1)
     std::cout << "         ... and this is the last" << std::endl;
@@ -1997,6 +1998,6 @@
     std::cout << "  <MEMC.WRITE_UPT_NEXT> Post another request to INIT_CMD FSM" 
               << " / heap_index = " << std::dec << r_write_ptr.read()
-              << " / srcid = " << r_write_copy.read() 
-              << " / inst = "  << r_write_copy_inst.read() << std::endl;
+              << " / srcid = " << std::dec << r_write_copy.read() 
+              << " / inst = "  << std::dec << r_write_copy_inst.read() << std::endl;
     if( entry.next == r_write_ptr.read() ) 
     std::cout << "        ... and this is the last" << std::endl;
@@ -2013,6 +2014,6 @@
     std::cout << "  <MEMC.WRITE_UPT_NEXT> Skip one entry in heap matching the writer" 
               << " / heap_index = " << std::dec << r_write_ptr.read()
-              << " / srcid = " << r_write_copy.read() 
-              << " / inst = "  << r_write_copy_inst.read() << std::endl;
+              << " / srcid = " << std::dec << r_write_copy.read() 
+              << " / inst = "  << std::dec << r_write_copy_inst.read() << std::endl;
     if( entry.next == r_write_ptr.read() ) 
     std::cout << "        ... and this is the last" << std::endl;
@@ -2111,10 +2112,10 @@
 {
     std::cout << "  <MEMC.WRITE_RSP> Post a request to TGT_RSP FSM: rsrcid = "
-              << std::hex << r_write_srcid.read() << std::endl;
+              << std::dec << r_write_srcid.read() << std::endl;
     if ( m_cmd_write_addr_fifo.rok() ) 
     {
         std::cout << "                    New Write request: " 
-              << " srcid = " << std::hex << m_cmd_write_srcid_fifo.read()
-              << " / address = " << m_cmd_write_addr_fifo.read() 
+              << " srcid = " << std::dec << m_cmd_write_srcid_fifo.read()
+              << " / address = " << std::hex << m_cmd_write_addr_fifo.read() 
               << " / data = " << m_cmd_write_data_fifo.read() << std::endl;
     }
@@ -3044,6 +3045,6 @@
 {
     std::cout << "  <MEMC.XRAM_RSP_DIR_RSP> Request the TGT_RSP FSM to return data:" 
-              << " rsrcid = " << std::hex << r_xram_rsp_trt_buf.srcid
-              << " / address = " << r_xram_rsp_trt_buf.nline*m_words*4
+              << " rsrcid = " << std::dec << r_xram_rsp_trt_buf.srcid
+              << " / address = " << std::hex << r_xram_rsp_trt_buf.nline*m_words*4
               << " / nwords = " << std::dec << r_xram_rsp_trt_buf.read_length << std::endl;
 }
@@ -3149,6 +3150,6 @@
 {
     std::cout << "  <MEMC.XRAM_RSP_HEAP_ERASE> Erase the list of copies:" 
-              << " srcid = " << entry.owner.srcid
-              << " / inst = " << entry.owner.inst << std::endl;
+              << " srcid = " << std::dec << entry.owner.srcid
+              << " / inst = " << std::dec << entry.owner.inst << std::endl;
 }
 #endif
@@ -3233,5 +3234,5 @@
 {
     std::cout << "  <MEMC.XRAM_RSP_ERROR_RSP> Request a response error to TGT_RSP FSM:"
-              << " srcid = " << r_xram_rsp_trt_buf.srcid << std::endl;
+              << " srcid = " << std::dec << r_xram_rsp_trt_buf.srcid << std::endl;
 }
 #endif
@@ -3774,6 +3775,6 @@
 {
     std::cout << "  <MEMC.CLEANUP_WRITE_RSP> Send a response to a cleanup request:"
-              << " rsrcid = " << r_cleanup_write_srcid.read()
-              << " / rtrdid = " << r_cleanup_write_trdid.read() << std::endl;
+              << " rsrcid = " << std::dec << r_cleanup_write_srcid.read()
+              << " / rtrdid = " << std::dec << r_cleanup_write_trdid.read() << std::endl;
 }
 #endif
@@ -3792,5 +3793,5 @@
 {
     std::cout << "  <MEMC.CLEANUP_RSP> Send the response to a cleanup request:"
-              << " rsrcid = " << r_cleanup_write_srcid.read()
+              << " rsrcid = " << std::dec << r_cleanup_write_srcid.read()
               << " / rtrdid = " << r_cleanup_write_trdid.read() << std::endl;
 }
@@ -3838,8 +3839,8 @@
 {
     std::cout << "  <MEMC.SC_IDLE> SC command: " << std::hex
-              << " srcid = " <<  m_cmd_sc_srcid_fifo.read() 
-              << " addr = " <<  m_cmd_sc_addr_fifo.read() 
+              << " srcid = " <<  std::dec << m_cmd_sc_srcid_fifo.read() 
+              << " addr = " << std::hex << m_cmd_sc_addr_fifo.read() 
               << " wdata = " << m_cmd_sc_wdata_fifo.read()
-              << " eop = " << m_cmd_sc_eop_fifo.read()
+              << " eop = " << std::dec << m_cmd_sc_eop_fifo.read()
               << " cpt  = " << std::dec << r_sc_cpt.read() << std::endl;
 }
@@ -3902,6 +3903,6 @@
 {
     std::cout << "  <MEMC.SC_DIR_LOCK> Directory acces"
-              << " / address = " << m_cmd_sc_addr_fifo.read()
-              << " / hit = " << entry.valid 
+              << " / address = " << std::hex << m_cmd_sc_addr_fifo.read()
+              << " / hit = " << std::dec << entry.valid 
               << " / count = " << entry.count
               << " / is_cnt = " << entry.is_cnt << std::endl;
@@ -4169,6 +4170,6 @@
               << " / address = " << std::hex << m_cmd_sc_addr_fifo.read()
               << " / wdata = " << std::hex << r_sc_wdata.read()
-              << " / srcid = " << std::hex << r_sc_copy.read() 
-              << " / inst = " << r_sc_copy_inst.read() << std::endl;
+              << " / srcid = " << std::dec << r_sc_copy.read() 
+              << " / inst = " << std::dec << r_sc_copy_inst.read() << std::endl;
 }
 #endif
@@ -4209,6 +4210,6 @@
               << " / address = " << std::hex << m_cmd_sc_addr_fifo.read()
               << " / wdata = " << std::hex << r_sc_wdata.read()
-              << " / srcid = " << std::hex << entry.owner.srcid
-              << " / inst = " << entry.owner.inst << std::endl;
+              << " / srcid = " << std::dec << entry.owner.srcid
+              << " / inst = " << std::dec << entry.owner.inst << std::endl;
 }
 #endif
@@ -5008,7 +5009,7 @@
 {
     std::cout << "  <MEMC.TGT_RSP_READ> Read response"
-              << " / rsrcid = " << std::hex << r_read_to_tgt_rsp_srcid.read()
+              << " / rsrcid = " << std::dec << r_read_to_tgt_rsp_srcid.read()
               << " / rtrdid = " << r_read_to_tgt_rsp_trdid.read()
-              << " / rdata = " << r_read_to_tgt_rsp_data[r_tgt_rsp_cpt.read()].read()
+              << " / rdata = " << std::hex << r_read_to_tgt_rsp_data[r_tgt_rsp_cpt.read()].read()
               << " / cpt = " << std::dec << r_tgt_rsp_cpt.read() << std::endl;
 }
@@ -5036,5 +5037,5 @@
 {
     std::cout << "  <MEMC.TGT_RSP_WRITE> Write response"
-              << " / rsrcid = " << r_write_to_tgt_rsp_srcid.read()
+              << " / rsrcid = " << std::dec << r_write_to_tgt_rsp_srcid.read()
               << " / rtrdid = " << r_write_to_tgt_rsp_trdid.read() << std::endl;
 }
@@ -5055,5 +5056,5 @@
 {
     std::cout << "  <MEMC.TGT_RSP_CLEANUP> Cleanup response"
-              << " / rsrcid = " << r_cleanup_to_tgt_rsp_srcid.read()
+              << " / rsrcid = " << std::dec << r_cleanup_to_tgt_rsp_srcid.read()
               << " / rtrdid = " << r_cleanup_to_tgt_rsp_trdid.read() << std::endl;
 }
@@ -5074,5 +5075,5 @@
 {
     std::cout << "  <MEMC.TGT_RSP_SC> SC response"
-              << " / rsrcid = " << r_sc_to_tgt_rsp_srcid.read()
+              << " / rsrcid = " << std::dec << r_sc_to_tgt_rsp_srcid.read()
               << " / rtrdid = " << r_sc_to_tgt_rsp_trdid.read() << std::endl;
 }
@@ -5094,8 +5095,8 @@
 {
     std::cout << "  <MEMC.TGT_RSP_XRAM> Response following XRAM access"
-              << " / rsrcid = " << r_xram_rsp_to_tgt_rsp_srcid.read()
+              << " / rsrcid = " << std::dec << r_xram_rsp_to_tgt_rsp_srcid.read()
               << " / rtrdid = " << r_xram_rsp_to_tgt_rsp_trdid.read()
-              << " / rdata = " << r_xram_rsp_to_tgt_rsp_data[r_tgt_rsp_cpt.read()].read()
-              << " / cpt = " << r_tgt_rsp_cpt.read() << std::endl;
+              << " / rdata = " << std::hex << r_xram_rsp_to_tgt_rsp_data[r_tgt_rsp_cpt.read()].read()
+              << " / cpt = " << std::dec << r_tgt_rsp_cpt.read() << std::endl;
 }
 #endif
@@ -5124,5 +5125,5 @@
 {
     std::cout << "  <MEMC.TGT_RSP_INIT> Write response after coherence transaction"
-              << " / rsrcid = " << r_init_rsp_to_tgt_rsp_srcid.read()
+              << " / rsrcid = " << std::dec << r_init_rsp_to_tgt_rsp_srcid.read()
               << " / rtrdid = " << r_init_rsp_to_tgt_rsp_trdid.read() << std::endl;
 }