Changeset 134 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop

Timestamp:

Jul 15, 2009, 10:41:01 AM (15 years ago)

Author:

rosiere

Message:

1) valgrind fix
2) debug file on/off

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit

Files:

• Functionnal_unit/src/Functionnal_unit_transition.cpp (modified) (1 diff)
• Load_store_unit/src/Load_store_unit_allocation.cpp (modified) (1 diff)
• Load_store_unit/src/Load_store_unit_deallocation.cpp (modified) (1 diff)
• Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_transition.cpp

@@ -48 +48 @@
                   }
               }
+
+        _execute_operation_out->_context_id    = 0; // not necessary
+        _execute_operation_out->_front_end_id  = 0; // not necessary
+        _execute_operation_out->_ooo_engine_id = 0; // not necessary
+        _execute_operation_out->_packet_id     = 0; // not necessary
+  //    _execute_operation_out->_operation     = 0; // not necessary
+  //    _execute_operation_out->_type          = 0; // not necessary
+        _execute_operation_out->_write_rd      = 0; // not necessary
+        _execute_operation_out->_num_reg_rd    = 0; // not necessary
+        _execute_operation_out->_data_rd       = 0; // not necessary
+        _execute_operation_out->_write_re      = 0; // not necessary
+        _execute_operation_out->_num_reg_re    = 0; // not necessary
+        _execute_operation_out->_data_re       = 0; // not necessary
+        _execute_operation_out->_exception     = 0; // not necessary
+        _execute_operation_out->_no_sequence   = 0; // not necessary
+        _execute_operation_out->_address       = 0; // not necessary
       }
     else

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_allocation.cpp

@@ -179 +179 @@
 
 #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true)
-    directory_init ();
-
-    memory_log_file = new std::ofstream [_param->_nb_thread];
-    for (uint32_t i=0; i<_param->_nb_thread; ++i)
-      if (_param->_num_thread_valid [i])
-        {
-          
-          std::string filename = morpheo::filename(MORPHEO_LOG,
-                                                   "Memory_access-thread_"+toString(i),
-                                                   "",
-                                                   "log",
-                                                   _simulation_file_with_date,
-                                                   _simulation_file_with_pid ,
-                                                   true);
-          
-          memory_log_file [i].open(filename.c_str() ,std::ios::out | std::ios::trunc);
-        }
+    if (log_file_generate)
+      {
+        directory_init ();
+        
+        memory_log_file = new std::ofstream [_param->_nb_thread];
+        for (uint32_t i=0; i<_param->_nb_thread; ++i)
+          if (_param->_num_thread_valid [i])
+            {
+              
+              std::string filename = morpheo::filename(MORPHEO_LOG,
+                                                       "Memory_access-thread_"+toString(i),
+                                                       "",
+                                                       "log",
+                                                       _simulation_file_with_date,
+                                                       _simulation_file_with_pid ,
+                                                       true);
+              
+              memory_log_file [i].open(filename.c_str() ,std::ios::out | std::ios::trunc);
+            }
+      }
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_deallocation.cpp

@@ -122 +122 @@
 
 #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true)
-    {
-      for (uint32_t i=0; i<_param->_nb_thread; ++i)
-        if (_param->_num_thread_valid [i])
-          {
-            memory_log_file [i].close();
-          }
-      delete [] memory_log_file;
-    }
+    if (log_file_generate)
+      {
+        for (uint32_t i=0; i<_param->_nb_thread; ++i)
+          if (_param->_num_thread_valid [i])
+            {
+              memory_log_file [i].close();
+            }
+        delete [] memory_log_file;
+      }
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp

@@ -999 +999 @@
 
 #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true)
+                  if (log_file_generate)
                     {
                       // log file
@@ -1193 +1194 @@
                 
 #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true)
-                {
-                  // log file
-                  Tcontext_t num_thread    = get_num_thread(_load_queue [packet_id]._context_id   , _param->_size_context_id   ,
-                                                            _load_queue [packet_id]._front_end_id , _param->_size_front_end_id ,
-                                                            _load_queue [packet_id]._ooo_engine_id, _param->_size_ooo_engine_id);
-                  
-                  memory_log_file [num_thread] 
-                    << "[" << simulation_cycle() << "] "
-                    << std::hex
-                    << "@ 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._address << " -[ Read  ]-> 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._rdata << " "
-                    << std::dec
-                    << "{" << toString(_load_queue [packet_id]._operation) << "}";
-                  
-                  memory_log_file [num_thread] << std::endl;
-                }
+                if (log_file_generate)
+                  {
+                    // log file
+                    Tcontext_t num_thread    = get_num_thread(_load_queue [packet_id]._context_id   , _param->_size_context_id   ,
+                                                              _load_queue [packet_id]._front_end_id , _param->_size_front_end_id ,
+                                                              _load_queue [packet_id]._ooo_engine_id, _param->_size_ooo_engine_id);
+                    
+                    memory_log_file [num_thread] 
+                      << "[" << simulation_cycle() << "] "
+                      << std::hex
+                      << "@ 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._address << " -[ Read  ]-> 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._rdata << " "
+                      << std::dec
+                      << "{" << toString(_load_queue [packet_id]._operation) << "}";
+                    
+                    memory_log_file [num_thread] << std::endl;
+                  }
 #endif