Changeset 752 for trunk/modules/vci_cc_vcache_wrapper/caba

Timestamp:

Jul 18, 2014, 11:38:54 AM (10 years ago)

Author:

meunier

Message:

• Added initialization to some components in order to avoid valgrind errors
• Corrected two bugs which caused the simulations to be non-deterministic:
  • one in the memcache (possibly uninitialized paddr variable used for cache access, modifying LRU bits)
  • one in the run_simus.py script (replacing a file with an identical file in a hdd image does modify its size)

File:

• trunk/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (modified) (7 diffs)

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

@@ -29 +29 @@
 
 #include <cassert>
+#include <signal.h>
+
 #include "arithmetics.h"
 #include "../include/vci_cc_vcache_wrapper.h"
@@ -1142 +1144 @@
             // We register processor request
             r_icache_vaddr_save = m_ireq.addr;
+            paddr = (paddr_t) m_ireq.addr;
 
             // sytematic itlb access (if activated)
@@ -1157 +1160 @@
                                             &tlb_set ); // unused
             }
-            else
-            {
-                if (vci_param::N > 32)
-                {
-                    paddr =  (paddr_t)m_ireq.addr |
-                            ((paddr_t)r_icache_paddr_ext.read() << 32);
-                }
-                else
-                {
-                    paddr = (paddr_t)m_ireq.addr;
-                }
+            else if (vci_param::N > 32)
+            {
+                paddr = paddr | ((paddr_t) r_icache_paddr_ext.read() << 32);
             }
 
@@ -2249 +2244 @@
                       // updt_request, wbuf_request, wbuf_write_miss.
     {
-        paddr_t     paddr;                          // physical address
+        paddr_t     paddr;
         pte_info_t      tlb_flags;
         size_t          tlb_way;
@@ -2267 +2262 @@
 
         // physical address computation : systematic DTLB access if activated)
+        paddr = (paddr_t) m_dreq.addr;
         if ( m_dreq.valid )
         {
@@ -2283 +2279 @@
             else                                    // identity mapping
             {
-                paddr = (paddr_t)m_dreq.addr;
                 // we take into account the paddr extension
                 if (vci_param::N > 32) 
@@ -2293 +2288 @@
         if ( r_mmu_mode.read() & DATA_CACHE_MASK)
         {
+
             if ( m_dreq.valid and r_dcache_updt_req.read() ) // read DIR and write DATA
             {