Changeset 492 for branches/ODCCP/modules/vci_mem_cache/caba/source/src

Timestamp:

Aug 12, 2013, 11:43:13 AM (11 years ago)

Author:

devigne

Message:

generic_tlb : pte flag CC => NCC
vci_cc_vcache_wrapper : Fixing deadlock
(go to CC_CHECK only when CC_SEND is available)
vci_mem_cache : merge modification on llsc.sw(args)

File:

• branches/ODCCP/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (2 diffs)

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

@@ -2770 +2770 @@
         // erase any possible new reservation when we release the lock on the
         // directory
-        m_llsc_table.sw(r_write_address.read());
+        m_llsc_table.sw(m_nline[(addr_t)r_write_address.read()],r_write_word_index.read(),r_write_word_index.read()+r_write_word_count.read());
 
         r_write_fsm = WRITE_DIR_LOCK;
@@ -5882 +5882 @@
     {
       // The CAS is a success => sw access to the llsc_global_table
-      m_llsc_table.sw(m_cmd_cas_addr_fifo.read());
+      m_llsc_table.sw(m_nline[(addr_t)m_cmd_cas_addr_fifo.read()],m_x[(addr_t)(m_cmd_cas_addr_fifo.read())],m_x[(addr_t)(m_cmd_cas_addr_fifo.read())]);
 
       // test coherence request