Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fault_tolerance/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h

    r724 r742  
    342342    bool                                m_debug_dcache_fsm;
    343343    bool                                m_debug_cmd_fsm;
     344    uint32_t                            m_previous_status;
     345
    344346
    345347    ///////////////////////////////
  • branches/fault_tolerance/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp

    r724 r742  
    476476{
    477477    // b0 : write buffer trace
     478    // b1 : dump processor registers
    478479    // b2 : dcache trace
    479480    // b3 : icache trace
    480481    // b4 : dtlb trace
    481482    // b5 : itlb trace
     483    // b6 : SR (ISS register 32)
    482484
    483485    std::cout << std::dec << "PROC " << name() << std::endl;
     
    509511        r_wbuf.printTrace((mode>>1)&1);
    510512    }
     513    if(mode & 0x02)
     514    {
     515        r_iss.dump();
     516    }
    511517    if(mode & 0x04)
    512518    {
     
    528534        std::cout << "  Instruction TLB" << std::endl;
    529535        r_itlb.printTrace();
     536    }
     537    if(mode & 0x40)
     538    {
     539        uint32_t status = r_iss.debugGetRegisterValue( 32 );
     540        std::cout << name();
     541        if ( status != m_previous_status ) std::cout << " NEW ";
     542        std::cout << " status = " << std::hex << status << " " << std::endl;
     543        m_previous_status = status;
    530544    }
    531545}
Note: See TracChangeset for help on using the changeset viewer.