Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/OOO_Engine.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/OOO_Engine.cpp	(revision 137)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/OOO_Engine.cpp	(revision 138)
@@ -71,5 +71,5 @@
 #endif
 
-#ifdef SYSTEMC
+#if defined(SYSTEMC) and (defined(STATISTICS) or defined(VHDL_TESTBENCH))
     if (usage_is_set(_usage,USE_SYSTEMC))
       {
@@ -83,7 +83,6 @@
 	// List dependency information
 # endif    
-	
+      }
 #endif
-      }
     log_end(OOO_Engine,FUNCTION);
   };
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp	(revision 137)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp	(revision 138)
@@ -40,4 +40,6 @@
                           uint32_t              size_re_order_buffer             ,
                           uint32_t              nb_re_order_buffer_bank          ,
+                          commit_unit::Tretire_ooo_scheme_t
+                                                retire_ooo_scheme                ,
                           Tpriority_t           commit_priority                  ,
                           Tload_balancing_t     commit_load_balancing            ,
@@ -53,6 +55,4 @@
                           // Reexecute
                           uint32_t              size_reexecute_queue             ,
-                          Tpriority_t           reexecute_priority               ,
-                          Tload_balancing_t     reexecute_load_balancing         ,
                           // Rename_unit
                           Tpriority_t         * rename_select_priority           ,//[nb_rename_unit]
@@ -100,4 +100,5 @@
     _size_re_order_buffer              = size_re_order_buffer             ;
     _nb_re_order_buffer_bank           = nb_re_order_buffer_bank          ;
+    _retire_ooo_scheme                 = retire_ooo_scheme                ;
     _commit_priority                   = commit_priority                  ;
     _commit_load_balancing             = commit_load_balancing            ;
@@ -110,6 +111,4 @@
 //     _table_issue_type                  = table_issue_type                 ;
     _size_reexecute_queue              = size_reexecute_queue             ;
-    _reexecute_priority                = reexecute_priority               ;
-    _reexecute_load_balancing          = reexecute_load_balancing         ;
     _rename_select_priority            = rename_select_priority           ;
     _rename_select_load_balancing      = rename_select_load_balancing     ;
@@ -256,4 +255,5 @@
        _size_re_order_buffer    ,
        _nb_re_order_buffer_bank ,
+       _retire_ooo_scheme       ,
        _nb_inst_insert          ,
        _nb_inst_retire          ,
@@ -268,6 +268,6 @@
         size_general_register   ,
         size_special_register   ,
-       _commit_priority         ,
-       _commit_load_balancing   ,
+       _issue_priority          ,
+       _issue_load_balancing    ,
        _nb_rename_unit_select   ,
        _nb_thread               ,
@@ -312,6 +312,6 @@
        _nb_inst_reexecute       ,
        _nb_execute_loop_select  ,
-       _reexecute_priority      ,
-       _reexecute_load_balancing,
+       _commit_priority         ,
+       _commit_load_balancing   ,
         size_general_register   ,//+_size_rename_id
         size_special_register   ,//+_size_rename_id
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters_print.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters_print.cpp	(revision 137)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters_print.cpp	(revision 138)
@@ -65,6 +65,4 @@
 //  str+= toString(MSG_INFORMATION)+"   * table_issue_type                   ["+toString(i)+"]["+toString(j)+"] : "+toString<bool             >(_table_issue_type [i][j]          )+"\n";//[nb_inst_issue][nb_type]
     str+= toString(MSG_INFORMATION)+"   * size_reexecute_queue             : "+toString<uint32_t         >(_size_reexecute_queue             )+"\n";
-    str+= toString(MSG_INFORMATION)+"   * reexecute_priority               : "+toString<Tpriority_t      >(_reexecute_priority               )+"\n";
-    str+= toString(MSG_INFORMATION)+"   * reexecute_load_balancing         : "+toString<Tload_balancing_t>(_reexecute_load_balancing         )+"\n";
     for (uint32_t i=0; i<_nb_rename_unit; ++i)
     str+= toString(MSG_INFORMATION)+"   * rename_select_priority             ["+toString(i)+"] : "+toString<Tpriority_t      >(_rename_select_priority           [i])+"\n";//[nb_rename_unit]
