Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp	(revision 133)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp	(revision 134)
@@ -358,21 +358,24 @@
 
 #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
 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp	(revision 133)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp	(revision 134)
@@ -239,12 +239,13 @@
 
 #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
 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp	(revision 133)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp	(revision 134)
@@ -831,19 +831,20 @@
 
 #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	    
 
