Changeset 523 for trunk

Timestamp:

Sep 14, 2013, 1:06:56 PM (11 years ago)

Author:

cfuguet

Message:

Bugfix in GenericLLSCGlobal table and vci_mem_cache:

• Two bugs have been fixed in this commit:

The first one is in the Generic LLSC global table. The method SW
does not shift the NLINE during the concatenation with the word
index.

The second one is during the call of this function (SW) in the WRITE
FSM. The max word index passed as argument was incorrectly always over

incremented by one.

To solve this problem, the SW function has been changed. It does not

accept anymore the nline, min and max arguments but two complete
addresses (address min and address max). This way, it is avoided the
add of a new NWORDS argument to the table which would be needed to
shift the NLINE.

Location:

trunk

Files:

• lib/generic_llsc_global_table/include/generic_llsc_global_table.h (modified) (2 diffs)
• modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (2 diffs)

trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h

@@ -453 +453 @@
     }
     */
-    inline void sw(const addr_t nline, unsigned int min, unsigned int max)
+    inline void sw(const addr_t ad_min, const addr_t ad_max)
     //  This method checks if there is / are valid registration(s) for the given
     //  range and, in case of hit(s), invalidates the registration(s)
@@ -466 +466 @@
 
         // for every address in the given range ...
-        for (unsigned int i = min; i <= max; i++)
+        for (addr_t i = ad_min; i <= ad_max; i++)
         {
             //  Is there a registration for the given address ?
-            int pos = hitAddr(nline + i * 4);
+            int pos = hitAddr(i);
+
             //  If there is one, invalidate it
             if (pos >= 0)

trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -2757 +2757 @@
                         {
                             // We enter here if it is a SW command or an already tested SC command 
-
-                            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());
+                            addr_t min = r_write_address.read();
+                            addr_t max = r_write_address.read() + r_write_word_count.read() - 1; 
+
+                            m_llsc_table.sw(min, max);
 
                             r_write_fsm = WRITE_DIR_LOCK;
@@ -5278 +5278 @@
 
                     // The CAS is a success => sw access to the llsc_global_table
-                    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())] );
+                    m_llsc_table.sw(m_cmd_cas_addr_fifo.read(), m_cmd_cas_addr_fifo.read());
 
                     // test coherence request