Changeset 549 for trunk/modules/vci_cc_vcache_wrapper/caba
- Timestamp:
- Oct 17, 2013, 8:50:46 PM (11 years ago)
- Location:
- trunk/modules/vci_cc_vcache_wrapper/caba/source
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h
r487 r549 296 296 297 297 // STRUCTURAL PARAMETERS 298 soclib::common::AddressDecodingTable<uint 32_t, bool> m_cacheability_table;298 soclib::common::AddressDecodingTable<uint64_t, bool> m_cacheability_table; 299 299 300 300 const size_t m_srcid; … … 394 394 // communication between ICACHE FSM and CC_SEND FSM 395 395 sc_signal<bool> r_icache_cc_send_req; // ICACHE cc_send request 396 sc_signal< cc_send_t>r_icache_cc_send_type; // ICACHE cc_send request type396 sc_signal<int> r_icache_cc_send_type; // ICACHE cc_send request type 397 397 sc_signal<paddr_t> r_icache_cc_send_nline; // ICACHE cc_send nline 398 398 sc_signal<size_t> r_icache_cc_send_way; // ICACHE cc_send way … … 491 491 // communication between DCACHE FSM and CC_SEND FSM 492 492 sc_signal<bool> r_dcache_cc_send_req; // DCACHE cc_send request 493 sc_signal< cc_send_t>r_dcache_cc_send_type; // DCACHE cc_send request type493 sc_signal<int> r_dcache_cc_send_type; // DCACHE cc_send request type 494 494 sc_signal<paddr_t> r_dcache_cc_send_nline; // DCACHE cc_send nline 495 495 sc_signal<size_t> r_dcache_cc_send_way; // DCACHE cc_send way … … 542 542 // communication between CC_RECEIVE FSM and ICACHE FSM 543 543 sc_signal<bool> r_cc_receive_icache_req; // cc_receive to icache request 544 sc_signal< cc_receive_t>r_cc_receive_icache_type; // cc_receive type of request544 sc_signal<int> r_cc_receive_icache_type; // cc_receive type of request 545 545 sc_signal<size_t> r_cc_receive_icache_way; // cc_receive to icache way 546 546 sc_signal<size_t> r_cc_receive_icache_set; // cc_receive to icache set … … 550 550 // communication between CC_RECEIVE FSM and DCACHE FSM 551 551 sc_signal<bool> r_cc_receive_dcache_req; // cc_receive to dcache request 552 sc_signal< cc_receive_t>r_cc_receive_dcache_type; // cc_receive type of request552 sc_signal<int> r_cc_receive_dcache_type; // cc_receive type of request 553 553 sc_signal<size_t> r_cc_receive_dcache_way; // cc_receive to dcache way 554 554 sc_signal<size_t> r_cc_receive_dcache_set; // cc_receive to dcache set -
trunk/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp
r532 r549 1155 1155 // cacheability 1156 1156 if ( not (r_mmu_mode.read() & INS_CACHE_MASK) ) cacheable = false; 1157 else cacheable = m_cacheability_table[ m_ireq.addr];1157 else cacheable = m_cacheability_table[(uint64_t)m_ireq.addr]; 1158 1158 } 1159 1159 else // itlb activated … … 2647 2647 2648 2648 if ( not (r_mmu_mode.read() & DATA_CACHE_MASK) ) cacheable = false; 2649 else cacheable = m_cacheability_table[ m_dreq.addr];2649 else cacheable = m_cacheability_table[(uint64_t)m_dreq.addr]; 2650 2650 } 2651 2651 else // dtlb activated
Note: See TracChangeset
for help on using the changeset viewer.