Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/main.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/main.cpp	(revision 112)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/main.cpp	(revision 117)
@@ -9,5 +9,5 @@
 #include "Behavioural/include/Allocation.h"
 
-#define NB_PARAMS 24
+#define NB_PARAMS 23
 
 void usage (int argc, char * argv[])
@@ -22,5 +22,5 @@
   err (_(" * nb_inst_insert                    [nb_rename_unit]                      (uint32_t             )\n"));
   err (_(" * nb_inst_retire                    [nb_rename_unit]                      (uint32_t             )\n"));
-  err (_(" * nb_inst_issue                                                           (uint32_t             )\n"));
+//err (_(" * nb_inst_issue                                                           (uint32_t             )\n"));
   err (_(" * nb_inst_execute                   [nb_execute_loop]                     (uint32_t             )\n"));
   err (_(" * nb_inst_reexecute                                                       (uint32_t             )\n"));
@@ -43,18 +43,18 @@
   err (_(" * issue_priority                                                          (Tpriority_t          )\n"));
   err (_(" * issue_load_balancing                                                    (Tload_balancing_t    )\n"));
-  err (_(" * table_routing                     [nb_rename_unit][nb_inst_issue]       (bool                 )\n"));
-  err (_(" * table_issue_type                  [nb_inst_issue][nb_type]              (bool                 )\n"));
-  err (_("   * TYPE_ALU    \n"));
-  err (_("   * TYPE_SHIFT  \n"));
-  err (_("   * TYPE_MOVE   \n"));
-  err (_("   * TYPE_TEST   \n"));
-  err (_("   * TYPE_MUL    \n"));
-  err (_("   * TYPE_DIV    \n"));
-  err (_("   * TYPE_EXTEND \n"));
-  err (_("   * TYPE_FIND   \n"));
-  err (_("   * TYPE_SPECIAL\n"));
-  err (_("   * TYPE_CUSTOM \n"));
-  err (_("   * TYPE_BRANCH \n"));
-  err (_("   * TYPE_MEMORY \n"));
+//   err (_(" * table_routing                     [nb_rename_unit][nb_inst_issue]       (bool                 )\n"));
+//   err (_(" * table_issue_type                  [nb_inst_issue][nb_type]              (bool                 )\n"));
+//   err (_("   * TYPE_ALU    \n"));
+//   err (_("   * TYPE_SHIFT  \n"));
+//   err (_("   * TYPE_MOVE   \n"));
+//   err (_("   * TYPE_TEST   \n"));
+//   err (_("   * TYPE_MUL    \n"));
+//   err (_("   * TYPE_DIV    \n"));
+//   err (_("   * TYPE_EXTEND \n"));
+//   err (_("   * TYPE_FIND   \n"));
+//   err (_("   * TYPE_SPECIAL\n"));
+//   err (_("   * TYPE_CUSTOM \n"));
+//   err (_("   * TYPE_BRANCH \n"));
+//   err (_("   * TYPE_MEMORY \n"));
   err (_(" * size_reexecute_queue                                                    (uint32_t         )\n"));
   err (_(" * reexecute_priority                                                      (Tpriority_t      )\n"));
@@ -120,5 +120,5 @@
     _nb_inst_retire [i] = fromString<uint32_t>(argv[x++]);
 
-  uint32_t              _nb_inst_issue                     = fromString<uint32_t         >(argv[x++]);
+//uint32_t              _nb_inst_issue                     = fromString<uint32_t         >(argv[x++]);
   uint32_t            * _nb_inst_execute                   = new uint32_t [_nb_execute_loop];
   for (uint32_t i=0; i<_nb_execute_loop; i++)
@@ -152,35 +152,36 @@
   Tpriority_t           _issue_priority                    = fromString<Tpriority_t      >(argv[x++]);
   Tload_balancing_t     _issue_load_balancing              = fromString<Tload_balancing_t>(argv[x++]);
-  bool               ** _table_routing                     = new bool * [_nb_rename_unit];
-  for (uint32_t i=0; i<_nb_rename_unit; i++)
-    {
-      _table_routing [i] = new bool [_nb_inst_issue];
-      for (uint32_t j=0; j<_nb_inst_issue; j++)
-        _table_routing [i][j] = fromString<bool>(argv[x++]);
-    }
-
-  if (argc <= static_cast<int>(2+NB_PARAMS+3*_nb_front_end+2*_sum_nb_context+10*_nb_rename_unit+_nb_execute_loop+_nb_rename_unit*_nb_inst_issue+12*_nb_inst_issue))
+//   bool               ** _table_routing                     = new bool * [_nb_rename_unit];
+//   for (uint32_t i=0; i<_nb_rename_unit; i++)
+//     {
+//       _table_routing [i] = new bool [_nb_inst_issue];
+//       for (uint32_t j=0; j<_nb_inst_issue; j++)
+//         _table_routing [i][j] = fromString<bool>(argv[x++]);
+//     }
+
+  if (argc <= static_cast<int>(2+NB_PARAMS+3*_nb_front_end+2*_sum_nb_context+10*_nb_rename_unit+_nb_execute_loop//+_nb_rename_unit*_nb_inst_issue+12*_nb_inst_issue
+                               ))
     usage (argc, argv);
   
-  bool               ** _table_issue_type                  = new bool * [_nb_inst_issue];
-  for (uint32_t i=0; i<_nb_inst_issue; i++)    
-    {
-      _table_issue_type [i] = new bool [MAX_TYPE];
-      for (uint32_t j=0; j<MAX_TYPE; j++)
-        _table_issue_type [i][j] = false;
-
-      _table_issue_type [i][TYPE_ALU    ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_SHIFT  ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_MOVE   ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_TEST   ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_MUL    ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_DIV    ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_EXTEND ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_FIND   ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_SPECIAL] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_CUSTOM ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_BRANCH ] = fromString<bool>(argv[x++]);
-      _table_issue_type [i][TYPE_MEMORY ] = fromString<bool>(argv[x++]);
-    }
+//   bool               ** _table_issue_type                  = new bool * [_nb_inst_issue];
+//   for (uint32_t i=0; i<_nb_inst_issue; i++)    
+//     {
+//       _table_issue_type [i] = new bool [MAX_TYPE];
+//       for (uint32_t j=0; j<MAX_TYPE; j++)
+//         _table_issue_type [i][j] = false;
+
+//       _table_issue_type [i][TYPE_ALU    ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_SHIFT  ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_MOVE   ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_TEST   ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_MUL    ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_DIV    ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_EXTEND ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_FIND   ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_SPECIAL] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_CUSTOM ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_BRANCH ] = fromString<bool>(argv[x++]);
+//       _table_issue_type [i][TYPE_MEMORY ] = fromString<bool>(argv[x++]);
+//     }
   
   uint32_t              _size_reexecute_queue              = fromString<uint32_t         >(argv[x++]);
@@ -220,5 +221,6 @@
     }
 
-  if (argc != static_cast<int>(2+NB_PARAMS+3*_nb_front_end+2*_sum_nb_context+10*_nb_rename_unit+_nb_execute_loop+_nb_rename_unit*_nb_inst_issue+12*_nb_inst_issue+3*_sum_nb_load_store_queue))
+  if (argc != static_cast<int>(2+NB_PARAMS+3*_nb_front_end+2*_sum_nb_context+10*_nb_rename_unit+_nb_execute_loop+// _nb_rename_unit*_nb_inst_issue+12*_nb_inst_issue
+                               3*_sum_nb_load_store_queue))
     usage (argc, argv);
 
@@ -294,5 +296,5 @@
          _nb_inst_insert                   ,
          _nb_inst_retire                   ,
-         _nb_inst_issue                    ,
+//       _nb_inst_issue                    ,
          _nb_inst_execute                  ,
          _nb_inst_reexecute                ,
@@ -315,6 +317,6 @@
          _issue_priority                   ,
          _issue_load_balancing             ,
-         _table_routing                    ,
-         _table_issue_type                 ,
+//          _table_routing                    ,
+//          _table_issue_type                 ,
          _size_reexecute_queue             ,
          _reexecute_priority               ,
@@ -400,11 +402,11 @@
   delete [] _rename_select_priority            ;
 
-  for (uint32_t i=0; i<_nb_inst_issue; i++)    
-    delete [] _table_issue_type [i];
-  delete [] _table_issue_type;  
-
-  for (uint32_t i=0; i<_nb_rename_unit; i++)
-    delete [] _table_routing [i];
-  delete [] _table_routing;
+//   for (uint32_t i=0; i<_nb_inst_issue; i++)    
+//     delete [] _table_issue_type [i];
+//   delete [] _table_issue_type;  
+
+//   for (uint32_t i=0; i<_nb_rename_unit; i++)
+//     delete [] _table_routing [i];
+//   delete [] _table_routing;
 
   delete [] _link_rename_unit_with_front_end;
