Changeset 134 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit

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_OOO_Engine/OOO_Engine/Commit_unit/src

Files:

• Commit_unit_allocation.cpp (modified) (1 diff)
• Commit_unit_deallocation.cpp (modified) (1 diff)
• Commit_unit_transition.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp

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

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp

@@ -239 +239 @@
 
 #if defined(DEBUG) and defined(DEBUG_Commit_unit) and (DEBUG_Commit_unit == true)
-    {   
-      for (uint32_t i=0; i<_param->_nb_thread; ++i)
-        if (_param->_have_thread [i])
-          {
-            instruction_log_file [i].close();
-          }
-      delete [] instruction_log_file;
-    }
+    if (log_file_generate)
+      {   
+        for (uint32_t i=0; i<_param->_nb_thread; ++i)
+          if (_param->_have_thread [i])
+            {
+              instruction_log_file [i].close();
+            }
+        delete [] instruction_log_file;
+      }
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp

@@ -831 +831 @@
 
 #if defined(DEBUG) and defined(DEBUG_Commit_unit) and (DEBUG_Commit_unit == true)
-                    {
-                      // log file
-                      instruction_log_file [num_thread] 
-                        << "[" << simulation_cycle() << "] "
-                        << std::hex
-                        << (entry->address<<2) << " (" << (entry->address) << ") "
-                        << std::dec
-                        << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] "
-                        << "{" << ((retire_ok)?"OK":"KO") << "} ";
-                      
-                      if ((type == TYPE_MEMORY) and  is_operation_memory_load(entry->operation))
-                        instruction_log_file [num_thread] << std::hex << entry->load_data << std::dec;
-                      
-                      instruction_log_file [num_thread] << std::endl;
-                    }
+                    if (log_file_generate)
+                      {
+                        // log file
+                        instruction_log_file [num_thread] 
+                          << "[" << simulation_cycle() << "] "
+                          << std::hex
+                          << (entry->address<<2) << " (" << (entry->address) << ") "
+                          << std::dec
+                          << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] "
+                          << "{" << ((retire_ok)?"OK":"KO") << "} ";
+                        
+                        if ((type == TYPE_MEMORY) and  is_operation_memory_load(entry->operation))
+                          instruction_log_file [num_thread] << std::hex << entry->load_data << std::dec;
+                        
+                        instruction_log_file [num_thread] << std::endl;
+                      }
 #endif