Changeset 742 for branches/fault_tolerance/modules

Timestamp:

Jul 9, 2014, 5:36:08 PM (11 years ago)

Author:

cfuguet

Message:

Merge 'trunk' into 'fault_tolerance'

• Introducing last bugfixes of trunk into the fault_tolerance branch

Location:

branches/fault_tolerance/modules

Files:

• vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h (modified) (2 diffs)
• vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (modified) (1 diff)
• vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (modified) (3 diffs)
• vci_io_bridge/caba/source/src/vci_io_bridge.cpp (modified) (1 diff)
• vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (1 diff)

branches/fault_tolerance/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h

@@ -33 +33 @@
 // contain 32 bits words. It supports VCI addresss lartger than 32 bits.
 //
-// This component can perform data transfers between one single file belonging 
-// to the host system and a buffer in the memory of the virtual prototype.
-// The file name is an argument of the constructor.
+// This component can perform data transfers between one single file (belonging 
+// to the host system) and a buffer in the memory of the virtual prototype.
+// The name of the file containing the disk image is a constructor argument.
 // This component has a DMA capability, and is both a target and an initiator.
 // The block size (bytes), and the burst size (bytes) must be power of 2.
@@ -54 +54 @@
 // - BLOCK_DEVICE_SIZE          0x18 (read-only)   Number of addressable blocks.
 // - BLOCK_DEVICE_BLOCK_SIZE    0x1C (read_only)   Block size in bytes.
-// - BLOCK_DEVICE_BUFFER_EXT    0x20 (read_only)   Memory buffer base address (MSB bits)
+// - BLOCK_DEVICE_BUFFER_EXT    0x20 (read/write)  Memory buffer base address (MSB bits)
 //
 // The following operations codes are supported: 

branches/fault_tolerance/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h

@@ -342 +342 @@
     bool                                m_debug_dcache_fsm;
     bool                                m_debug_cmd_fsm;
+    uint32_t                            m_previous_status;
+
 
     ///////////////////////////////

branches/fault_tolerance/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp

@@ -476 +476 @@
 {
     // b0 : write buffer trace
+    // b1 : dump processor registers
     // b2 : dcache trace
     // b3 : icache trace
     // b4 : dtlb trace
     // b5 : itlb trace
+    // b6 : SR (ISS register 32)
 
     std::cout << std::dec << "PROC " << name() << std::endl;
@@ -509 +511 @@
         r_wbuf.printTrace((mode>>1)&1);
     }
+    if(mode & 0x02)
+    {
+        r_iss.dump();
+    }
     if(mode & 0x04)
     {
@@ -528 +534 @@
         std::cout << "  Instruction TLB" << std::endl;
         r_itlb.printTrace();
+    }
+    if(mode & 0x40)
+    {
+        uint32_t status = r_iss.debugGetRegisterValue( 32 );
+        std::cout << name();
+        if ( status != m_previous_status ) std::cout << " NEW ";
+        std::cout << " status = " << std::hex << status << " " << std::endl;
+        m_previous_status = status;
     }
 }

branches/fault_tolerance/modules/vci_io_bridge/caba/source/src/vci_io_bridge.cpp

@@ -736 +736 @@
                         {
                             assert( p_vci_tgt_iox.eop.read() and
-                                   (p_vci_tgt_iox.cmd == vci_param_int::CMD_WRITE) and
+                                   (p_vci_tgt_iox.cmd.read() == vci_param_int::CMD_WRITE) and
                             "ERROR in VCI_IOB illegal VCI WTI command from IOX network");
 

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

@@ -3940 +3940 @@
                     if (m_debug)
                         std::cout << "  <MEMC " << name() << " WRITE_BC_DIR_INVAL> Inval DIR and register in TRT:"
-                            << " address = " << r_write_address.read() << std::endl;
+                            << " address = " << std::hex << r_write_address.read() << std::endl;
 #endif
                     r_write_fsm = WRITE_BC_CC_SEND;