Changeset 742 for branches/fault_tolerance/modules/vci_cc_vcache_wrapper/caba

Timestamp:

Jul 9, 2014, 5:36:08 PM (10 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/vci_cc_vcache_wrapper/caba/source

Files:

• include/vci_cc_vcache_wrapper.h (modified) (1 diff)
• src/vci_cc_vcache_wrapper.cpp (modified) (3 diffs)

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;
     }
 }