Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop.cpp	(revision 88)
@@ -36,4 +36,10 @@
     log_printf(FUNC,Execute_loop,FUNCTION,"Begin");
 
+#if DEBUG_Execute_loop == true
+    log_printf(INFO,Execute_loop,FUNCTION,_("<%s> Parameters"),_name.c_str());
+
+    std::cout << *param << std::endl;
+#endif    
+
     log_printf(INFO,Execute_loop,FUNCTION,"Allocation");
 
@@ -45,5 +51,5 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       {	
 	log_printf(INFO,Execute_loop,FUNCTION,"Allocation of statistics");
@@ -54,5 +60,5 @@
 
 #ifdef VHDL
-    if (_usage & USE_VHDL)
+    if (usage_is_set(_usage,USE_VHDL))
       {
 	// generate the vhdl
@@ -64,5 +70,5 @@
 
 #ifdef SYSTEMC
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
 	log_printf(INFO,Execute_loop,FUNCTION,"Method - transition");
@@ -88,5 +94,5 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       {
 	log_printf(INFO,Execute_loop,FUNCTION,"Generate Statistics file");
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_allocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_allocation.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_allocation.cpp	(revision 88)
@@ -62,10 +62,10 @@
        ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_FRONT_END_ID         ,"front_end_id"         ,Tcontext_t        ,_param->_size_front_end_id);
        ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_OOO_ENGINE_ID        ,"ooo_engine_id"        ,Tcontext_t        ,_param->_size_ooo_engine_id);
-       ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_PACKET_ID            ,"packet_id"            ,Tpacket_t         ,_param->_size_packet_id);
+       ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_PACKET_ID            ,"packet_id"            ,Tpacket_t         ,_param->_size_rob_ptr  );
        ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_OPERATION            ,"operation"            ,Toperation_t      ,_param->_size_operation);
        ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_TYPE                 ,"type"                 ,Ttype_t           ,_param->_size_type);         
-       ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_STORE_QUEUE_PTR_WRITE,"store_queue_ptr_write",Tlsq_ptr_t        ,_param->_max_size_store_queue);
+       ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_STORE_QUEUE_PTR_WRITE,"store_queue_ptr_write",Tlsq_ptr_t        ,_param->_size_store_queue_ptr);
        if (_param->_have_port_load_queue_ptr)
-       ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_LOAD_QUEUE_PTR_WRITE ,"load_queue_ptr_write" ,Tlsq_ptr_t        ,_param->_max_size_load_queue);
+       ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_LOAD_QUEUE_PTR_WRITE ,"load_queue_ptr_write" ,Tlsq_ptr_t        ,_param->_size_load_queue_ptr);
        ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_HAS_IMMEDIAT         ,"has_immediat"         ,Tcontrol_t        ,1);
        ALLOC1_SIGNAL_IN ( in_EXECUTE_LOOP_IN_IMMEDIAT             ,"immediat"             ,Tgeneral_data_t   ,_param->_size_general_data);
@@ -90,5 +90,5 @@
        ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_FRONT_END_ID ,"front_end_id" ,Tcontext_t     ,_param->_size_front_end_id);
        ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_OOO_ENGINE_ID,"ooo_engine_id",Tcontext_t     ,_param->_size_ooo_engine_id);
-       ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_PACKET_ID    ,"packet_id"    ,Tpacket_t      ,_param->_size_packet_id);
+       ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_PACKET_ID    ,"packet_id"    ,Tpacket_t      ,_param->_size_rob_ptr  );
 //     ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_OPERATION    ,"operation"    ,Toperation_t   ,_param->_size_operation);
 //     ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_TYPE         ,"type"         ,Ttype_t        ,_param->_size_type);
@@ -97,59 +97,79 @@
        ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_NO_SEQUENCE  ,"no_sequence"  ,Tcontrol_t     ,1);
        ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_ADDRESS      ,"address"      ,Tgeneral_data_t,_param->_size_general_data);
+       ALLOC1_SIGNAL_OUT(out_EXECUTE_LOOP_OUT_DATA         ,"data"         ,Tgeneral_data_t,_param->_size_general_data);
      }
     // ~~~~~[ Interface "dcache_req" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      {
-       ALLOC1_INTERFACE("dcache_req",OUT, NORTH, "Data cache port : request", _param->_nb_load_store_unit);
-       
-       ALLOC1_VALACK_OUT(out_DCACHE_REQ_VAL,VAL);
-       ALLOC1_VALACK_IN ( in_DCACHE_REQ_ACK,ACK);
-       ALLOC1_SIGNAL_OUT(out_DCACHE_REQ_CONTEXT_ID,"context_id",Tcontext_t       ,_param->_max_size_dcache_context_id);
-       ALLOC1_SIGNAL_OUT(out_DCACHE_REQ_PACKET_ID ,"packet_id" ,Tpacket_t        ,_param->_max_size_dcache_packet_id );
-       ALLOC1_SIGNAL_OUT(out_DCACHE_REQ_ADDRESS   ,"address"   ,Tdcache_address_t,_param->_size_general_data);
-       ALLOC1_SIGNAL_OUT(out_DCACHE_REQ_TYPE      ,"type"      ,Tdcache_type_t   ,_param->_size_dcache_type);
-       ALLOC1_SIGNAL_OUT(out_DCACHE_REQ_WDATA     ,"wdata"     ,Tdcache_data_t   ,_param->_size_general_data);
+       ALLOC2_INTERFACE("dcache_req",OUT, NORTH, "Data cache port : request", _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       
+       _ALLOC2_VALACK_OUT(out_DCACHE_REQ_VAL,VAL, _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_VALACK_IN ( in_DCACHE_REQ_ACK,ACK, _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_OUT(out_DCACHE_REQ_CONTEXT_ID,"context_id",Tcontext_t       ,_param->_max_size_dcache_context_id, _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_OUT(out_DCACHE_REQ_PACKET_ID ,"packet_id" ,Tpacket_t        ,_param->_max_size_dcache_packet_id , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_OUT(out_DCACHE_REQ_ADDRESS   ,"address"   ,Tdcache_address_t,_param->_size_general_data         , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_OUT(out_DCACHE_REQ_TYPE      ,"type"      ,Tdcache_type_t   ,_param->_size_dcache_type          , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_OUT(out_DCACHE_REQ_WDATA     ,"wdata"     ,Tdcache_data_t   ,_param->_size_general_data         , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
      }
     // ~~~~~[ Interface "dcache_rsp" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      {
-       ALLOC1_INTERFACE("dcache_rsp",IN, NORTH, "Data cache port : respons", _param->_nb_load_store_unit);
-
-       ALLOC1_VALACK_IN ( in_DCACHE_RSP_VAL,VAL);
-       ALLOC1_VALACK_OUT(out_DCACHE_RSP_ACK,ACK);
-       ALLOC1_SIGNAL_IN ( in_DCACHE_RSP_CONTEXT_ID,"context_id",Tcontext_t     ,_param->_max_size_dcache_context_id);
-       ALLOC1_SIGNAL_IN ( in_DCACHE_RSP_PACKET_ID ,"packet_id" ,Tpacket_t      ,_param->_max_size_dcache_packet_id);
-       ALLOC1_SIGNAL_IN ( in_DCACHE_RSP_RDATA     ,"rdata"     ,Tdcache_data_t ,_param->_size_general_data);
-       ALLOC1_SIGNAL_IN ( in_DCACHE_RSP_ERROR     ,"error"     ,Tdcache_error_t,_param->_size_dcache_error);
+       ALLOC2_INTERFACE("dcache_rsp",IN, NORTH, "Data cache port : respons", _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+
+       _ALLOC2_VALACK_IN ( in_DCACHE_RSP_VAL,VAL, _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_VALACK_OUT(out_DCACHE_RSP_ACK,ACK, _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_IN ( in_DCACHE_RSP_CONTEXT_ID,"context_id",Tcontext_t     ,_param->_max_size_dcache_context_id, _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_IN ( in_DCACHE_RSP_PACKET_ID ,"packet_id" ,Tpacket_t      ,_param->_max_size_dcache_packet_id , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_IN ( in_DCACHE_RSP_RDATA     ,"rdata"     ,Tdcache_data_t ,_param->_size_general_data         , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
+       _ALLOC2_SIGNAL_IN ( in_DCACHE_RSP_ERROR     ,"error"     ,Tdcache_error_t,_param->_size_dcache_error         , _param->_nb_load_store_unit, _param->_nb_cache_port[it1]);
      }
     // ~~~~~[ Interface "insert_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      {
-       ALLOC2_INTERFACE("insert_rob",IN, EAST, "Rename's stage : insert a new instruction in the Re Order Buffer",_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_interface_it1]);
-       
-       _ALLOC2_VALACK_IN ( in_INSERT_ROB_VAL,VAL,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_signal_it1]);
-       _ALLOC2_VALACK_OUT(out_INSERT_ROB_ACK,ACK,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_signal_it1]);
-
-       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RD_USE    ,"rd_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RD_NUM_REG,"rd_num_reg",Tgeneral_address_t,_param->_size_general_register,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RE_USE    ,"re_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RE_NUM_REG,"re_num_reg",Tspecial_address_t,_param->_size_special_register,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[alloc_signal_it1]);
+       ALLOC2_INTERFACE("insert_rob",IN, EAST, "Rename's stage : insert a new instruction in the Re Order Buffer",_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
+       
+       _ALLOC2_VALACK_IN ( in_INSERT_ROB_VAL,VAL,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
+       _ALLOC2_VALACK_OUT(out_INSERT_ROB_ACK,ACK,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
+
+       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RD_USE    ,"rd_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
+       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RD_NUM_REG,"rd_num_reg",Tgeneral_address_t,_param->_size_general_register,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
+       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RE_USE    ,"re_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
+       _ALLOC2_SIGNAL_IN ( in_INSERT_ROB_RE_NUM_REG,"re_num_reg",Tspecial_address_t,_param->_size_special_register,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1]);
      }
-    // ~~~~~[ Interface "retire_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     {
-       ALLOC2_INTERFACE("retire_rob",IN, EAST, "Rename's stage : retire a new instruction in the Re Order Buffer",_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_interface_it1]);
-       
-       _ALLOC2_VALACK_IN ( in_RETIRE_ROB_VAL,VAL,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_VALACK_OUT(out_RETIRE_ROB_ACK,ACK,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_OLD_USE    ,"rd_old_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_OLD_NUM_REG,"rd_old_num_reg",Tgeneral_address_t,_param->_size_general_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_NEW_USE    ,"rd_new_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_NEW_NUM_REG,"rd_new_num_reg",Tgeneral_address_t,_param->_size_general_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_OLD_USE    ,"re_old_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_OLD_NUM_REG,"re_old_num_reg",Tspecial_address_t,_param->_size_special_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_NEW_USE    ,"re_new_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-       _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_NEW_NUM_REG,"re_new_num_reg",Tspecial_address_t,_param->_size_special_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[alloc_signal_it1]);
-     }
+//     // ~~~~~[ Interface "retire_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//      {
+//        ALLOC2_INTERFACE("retire_rob",IN, EAST, "Rename's stage : retire a new instruction in the Re Order Buffer",_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+       
+//        _ALLOC2_VALACK_IN ( in_RETIRE_ROB_VAL,VAL,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_VALACK_OUT(out_RETIRE_ROB_ACK,ACK,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_OLD_USE    ,"rd_old_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_OLD_NUM_REG,"rd_old_num_reg",Tgeneral_address_t,_param->_size_general_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_NEW_USE    ,"rd_new_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RD_NEW_NUM_REG,"rd_new_num_reg",Tgeneral_address_t,_param->_size_general_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_OLD_USE    ,"re_old_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_OLD_NUM_REG,"re_old_num_reg",Tspecial_address_t,_param->_size_special_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_NEW_USE    ,"re_new_use"    ,Tcontrol_t        ,1                             ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//        _ALLOC2_SIGNAL_IN ( in_RETIRE_ROB_RE_NEW_NUM_REG,"re_new_num_reg",Tspecial_address_t,_param->_size_special_register,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1]);
+//      }
 
      // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
      std::string name;
+
+     {
+       name = _name+"_glue";
+       log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
+       
+       _component_glue = new morpheo::behavioural::core::multi_execute_loop::execute_loop::execute_loop_glue::Execute_loop_Glue
+	 (name.c_str()
+#ifdef STATISTICS
+	  ,param_statistics
+#endif
+	  ,_param->_param_glue
+	  ,_usage);
+       
+       _component->set_component (_component_glue->_component
+#ifdef POSITION
+				  , 50, 50, 10, 10
+#endif
+				  );
+     }
 	
      _component_read_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::Read_unit * [_param->_nb_read_unit];
@@ -157,5 +177,5 @@
        {
 	 name = _name+"_read_unit_"+toString(i);
-	 std::cout << "Create   : " << name << std::endl;
+	 log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
 
 	 _component_read_unit [i] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::Read_unit
@@ -178,5 +198,5 @@
        {
 	 name = _name+"_functionnal_unit_"+toString(i);
-	 std::cout << "Create   : " << name << std::endl;
+	 log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
 
 	 _component_functionnal_unit [i] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::functionnal_unit::Functionnal_unit
@@ -199,5 +219,5 @@
        {
 	 name = _name+"_load_store_unit_"+toString(i);
-	 std::cout << "Create   : " << name << std::endl;
+	 log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
 
 	 _component_load_store_unit [i] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::Load_store_unit
@@ -220,5 +240,5 @@
        {
 	 name = _name+"_write_unit_"+toString(i);
-	 std::cout << "Create   : " << name << std::endl;
+	 log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
 
 	 _component_write_unit [i] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_write_unit::write_unit::Write_unit
@@ -239,5 +259,5 @@
      {
        name = _name+"_read_unit_to_execution_unit";
-       std::cout << "Create   : " << name << std::endl;
+       log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
        
        _component_read_unit_to_execution_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::network::read_unit_to_execution_unit::Read_unit_to_Execution_unit
@@ -258,5 +278,5 @@
      {
        name = _name+"_execution_unit_to_write_unit";
-       std::cout << "Create   : " << name << std::endl;
+       log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
        
        _component_execution_unit_to_write_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::network::execution_unit_to_write_unit::Execution_unit_to_Write_unit
@@ -277,5 +297,5 @@
      {
        name = _name+"_register_unit";
-       std::cout << "Create   : " << name << std::endl;
+       log_printf(INFO,Core,FUNCTION,_("Create   : %s"),name.c_str());
        
        _component_register_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::Register_unit
@@ -296,4 +316,116 @@
      // ~~~~~[ Instanciation ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
      std::string src,dest;
+
+     // ===================================================================
+     // =====[ GLUE ]======================================================
+     // ===================================================================
+     {
+       src = _name+"_glue";
+       log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
+       
+       {
+	 dest = _name;
+#ifdef POSITION
+	 _component->interface_map (src ,"",
+				    dest,"");
+#endif
+	 PORT_MAP(_component ,src , "in_CLOCK" ,dest, "in_CLOCK");
+	 PORT_MAP(_component ,src , "in_NRESET",dest, "in_NRESET");
+       }
+
+       for (uint32_t i=0; i<_param->_nb_gpr_write; i++)
+	 {
+	   {
+	     dest = _name+"_write_unit_"+toString(i);
+	     
+#ifdef POSITION
+	     _component->interface_map (src ,"gpr_write_write_unit_"+toString(i),
+					dest,"gpr_write");
+#endif
+
+	     //  in_GPR_WRITE_WRITE_UNIT_VAL               
+	     // out_GPR_WRITE_WRITE_UNIT_ACK               
+	     //  in_GPR_WRITE_WRITE_UNIT_OOO_ENGINE_ID     
+	     //  in_GPR_WRITE_WRITE_UNIT_NUM_REG           
+	     //  in_GPR_WRITE_WRITE_UNIT_DATA              
+	   }
+
+	   {
+	     dest = _name+"_register_unit";
+	     
+#ifdef POSITION
+	     _component->interface_map (src ,"gpr_write_register_file_"+toString(i),
+					dest,"gpr_write_"+toString(i));
+#endif
+	     // out_GPR_WRITE_REGISTER_FILE_VAL            
+	     //  in_GPR_WRITE_REGISTER_FILE_ACK            
+	     // out_GPR_WRITE_REGISTER_FILE_OOO_ENGINE_ID  
+	     // out_GPR_WRITE_REGISTER_FILE_NUM_REG        
+	     // out_GPR_WRITE_REGISTER_FILE_DATA           
+	   }
+
+	   {
+	     dest = _name+"_read_unit_0";
+
+#ifdef POSITION
+	     _component->interface_map (src ,"gpr_write_read_unit_"+toString(i),
+					dest,"gpr_write");
+#endif
+
+	     // out_GPR_WRITE_READ_UNIT_VAL                
+	     // out_GPR_WRITE_READ_UNIT_OOO_ENGINE_ID      
+	     // out_GPR_WRITE_READ_UNIT_NUM_REG            
+	     // out_GPR_WRITE_READ_UNIT_DATA               
+	   }
+	 }
+
+       for (uint32_t i=0; i<_param->_nb_spr_write; i++)
+	 {
+	   {
+	     dest = _name+"_write_unit_"+toString(i);
+	     
+#ifdef POSITION
+	     _component->interface_map (src ,"spr_write_write_unit_"+toString(i),
+					dest,"spr_write");
+#endif
+
+	     //  in_SPR_WRITE_WRITE_UNIT_VAL               
+	     // out_SPR_WRITE_WRITE_UNIT_ACK               
+	     //  in_SPR_WRITE_WRITE_UNIT_OOO_ENGINE_ID     
+	     //  in_SPR_WRITE_WRITE_UNIT_NUM_REG           
+	     //  in_SPR_WRITE_WRITE_UNIT_DATA              
+	   }
+
+	   {
+	     dest = _name+"_register_unit";
+	     
+#ifdef POSITION
+	     _component->interface_map (src ,"spr_write_register_file_"+toString(i),
+					dest,"spr_write_"+toString(i));
+#endif
+	     // out_SPR_WRITE_REGISTER_FILE_VAL            
+	     //  in_SPR_WRITE_REGISTER_FILE_ACK            
+	     // out_SPR_WRITE_REGISTER_FILE_OOO_ENGINE_ID  
+	     // out_SPR_WRITE_REGISTER_FILE_NUM_REG        
+	     // out_SPR_WRITE_REGISTER_FILE_DATA           
+	   }
+
+	   {
+	     dest = _name+"_read_unit_0";
+
+#ifdef POSITION
+	     _component->interface_map (src ,"spr_write_read_unit_"+toString(i),
+					dest,"spr_write");
+#endif
+
+	     // out_SPR_WRITE_READ_UNIT_VAL                
+	     // out_SPR_WRITE_READ_UNIT_OOO_ENGINE_ID      
+	     // out_SPR_WRITE_READ_UNIT_NUM_REG            
+	     // out_SPR_WRITE_READ_UNIT_DATA               
+	   }
+	 }
+
+       
+     }
 
      // ===================================================================
@@ -306,5 +438,5 @@
 	 {
 	   src = _name+"_read_unit_"+toString(i);
-	   std::cout << "Instance : " << src << std::endl;
+	   log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
 	   
 	   {
@@ -334,5 +466,5 @@
 	     if (_param->_have_port_ooo_engine_id)
 	     PORT_MAP(_component ,src , "in_READ_UNIT_IN_OOO_ENGINE_ID"        ,dest , "in_EXECUTE_LOOP_IN_"+toString(i)+"_OOO_ENGINE_ID"        );
-	     if (_param->_have_port_packet_id)
+	     if (_param->_have_port_rob_ptr  )
 	     PORT_MAP(_component ,src , "in_READ_UNIT_IN_PACKET_ID"            ,dest , "in_EXECUTE_LOOP_IN_"+toString(i)+"_PACKET_ID"            );
 	     PORT_MAP(_component ,src , "in_READ_UNIT_IN_OPERATION"            ,dest , "in_EXECUTE_LOOP_IN_"+toString(i)+"_OPERATION"            );
@@ -361,54 +493,54 @@
 	       
 #ifdef POSITION
-	       _component->interface_map (src ,"read_unit_"+toString(i),
+	       _component->interface_map (src ,"read_unit_"+toString(j),
 					  dest,"read_unit_"+toString(it_read_unit_out));
 #endif
 	     
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_VAL"                  ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_VAL"                  );
-	       PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(i               )+"_ACK"                  ,
-				    dest,"out_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_ACK"                  );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_VAL"                  ,
+			                 dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_VAL"                  );
+	       COMPONENT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(j               )+"_ACK"                  ,
+				         dest,"out_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_ACK"                  );
 	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_CONTEXT_ID"           ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_CONTEXT_ID"           );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_CONTEXT_ID"           ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_CONTEXT_ID"           );
 	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_FRONT_END_ID"         ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_FRONT_END_ID"         );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_FRONT_END_ID"         ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_FRONT_END_ID"         );
 	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_OOO_ENGINE_ID"        ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_OOO_ENGINE_ID"        );
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_PACKET_ID"            ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_PACKET_ID"            );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_OPERATION"            ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_OPERATION"            );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_TYPE"                 ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_TYPE"                 );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_STORE_QUEUE_PTR_WRITE",
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_STORE_QUEUE_PTR_WRITE");
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_OOO_ENGINE_ID"        ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_OOO_ENGINE_ID"        );
+	       if (_param->_have_port_rob_ptr  )
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_PACKET_ID"            ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_PACKET_ID"            );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_OPERATION"            ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_OPERATION"            );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_TYPE"                 ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_TYPE"                 );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_STORE_QUEUE_PTR_WRITE",
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_STORE_QUEUE_PTR_WRITE");
 	       if (_param->_have_port_load_queue_ptr)
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_LOAD_QUEUE_PTR_WRITE" ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_LOAD_QUEUE_PTR_WRITE" );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_HAS_IMMEDIAT"         ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_HAS_IMMEDIAT"         );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_IMMEDIAT"             ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_IMMEDIAT"             );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_DATA_RA"              ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RA"              );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_DATA_RB"              ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RB"              );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_DATA_RC"              ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RC"              );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_WRITE_RD"             ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_WRITE_RD"             );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_NUM_REG_RD"           ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_NUM_REG_RD"           );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_WRITE_RE"             ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_WRITE_RE"             );
-	       PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(i               )+"_NUM_REG_RE"           ,
-				    dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_NUM_REG_RE"           );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_LOAD_QUEUE_PTR_WRITE" ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_LOAD_QUEUE_PTR_WRITE" );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_HAS_IMMEDIAT"         ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_HAS_IMMEDIAT"         );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_IMMEDIAT"             ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_IMMEDIAT"             );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RA"              ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_DATA_RA"              );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RB"              ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_DATA_RB"              );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RC"              ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_DATA_RC"              );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_WRITE_RD"             ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_WRITE_RD"             );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_NUM_REG_RD"           ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_NUM_REG_RD"           );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_WRITE_RE"             ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_WRITE_RE"             );
+	       COMPONENT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(j               )+"_NUM_REG_RE"           ,
+				         dest, "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_"+toString(j)+"_NUM_REG_RE"           );
 	     
-	     it_read_unit_out ++;
 	   }
+	   it_read_unit_out ++;
 	   
 	   // ~~~~~[ Interface "gpr_read" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -421,18 +553,18 @@
 					dest,"gpr_read_"+toString(2*i+1));
 #endif
-	     PORT_MAP(_component ,src ,"out_GPR_READ_0_VAL"          , dest, "in_GPR_READ_"+toString(2*i  )+"_VAL"          );
-	     PORT_MAP(_component ,src , "in_GPR_READ_0_ACK"          , dest,"out_GPR_READ_"+toString(2*i  )+"_ACK"          );
+	     COMPONENT_MAP(_component ,src ,"out_GPR_READ_0_VAL"          , dest, "in_GPR_READ_"+toString(2*i  )+"_VAL"          );
+	     COMPONENT_MAP(_component ,src , "in_GPR_READ_0_ACK"          , dest,"out_GPR_READ_"+toString(2*i  )+"_ACK"          );
 	     if (_param->_have_port_ooo_engine_id)
-	     PORT_MAP(_component ,src ,"out_GPR_READ_0_OOO_ENGINE_ID", dest, "in_GPR_READ_"+toString(2*i  )+"_OOO_ENGINE_ID");
-	     PORT_MAP(_component ,src ,"out_GPR_READ_0_NUM_REG"      , dest, "in_GPR_READ_"+toString(2*i  )+"_NUM_REG"      );
-	     PORT_MAP(_component ,src , "in_GPR_READ_0_DATA"         , dest,"out_GPR_READ_"+toString(2*i  )+"_DATA"         );
-	     PORT_MAP(_component ,src , "in_GPR_READ_0_DATA_VAL"     , dest,"out_GPR_READ_"+toString(2*i  )+"_DATA_VAL"     );
-	     PORT_MAP(_component ,src ,"out_GPR_READ_1_VAL"          , dest, "in_GPR_READ_"+toString(2*i+1)+"_VAL"          );
-	     PORT_MAP(_component ,src , "in_GPR_READ_1_ACK"          , dest,"out_GPR_READ_"+toString(2*i+1)+"_ACK"          );
+	     COMPONENT_MAP(_component ,src ,"out_GPR_READ_0_OOO_ENGINE_ID", dest, "in_GPR_READ_"+toString(2*i  )+"_OOO_ENGINE_ID");
+	     COMPONENT_MAP(_component ,src ,"out_GPR_READ_0_NUM_REG"      , dest, "in_GPR_READ_"+toString(2*i  )+"_NUM_REG"      );
+	     COMPONENT_MAP(_component ,src , "in_GPR_READ_0_DATA"         , dest,"out_GPR_READ_"+toString(2*i  )+"_DATA"         );
+	     COMPONENT_MAP(_component ,src , "in_GPR_READ_0_DATA_VAL"     , dest,"out_GPR_READ_"+toString(2*i  )+"_DATA_VAL"     );
+	     COMPONENT_MAP(_component ,src ,"out_GPR_READ_1_VAL"          , dest, "in_GPR_READ_"+toString(2*i+1)+"_VAL"          );
+	     COMPONENT_MAP(_component ,src , "in_GPR_READ_1_ACK"          , dest,"out_GPR_READ_"+toString(2*i+1)+"_ACK"          );
 	     if (_param->_have_port_ooo_engine_id)
-	     PORT_MAP(_component ,src ,"out_GPR_READ_1_OOO_ENGINE_ID", dest, "in_GPR_READ_"+toString(2*i+1)+"_OOO_ENGINE_ID");
-	     PORT_MAP(_component ,src ,"out_GPR_READ_1_NUM_REG"      , dest, "in_GPR_READ_"+toString(2*i+1)+"_NUM_REG"      );
-	     PORT_MAP(_component ,src , "in_GPR_READ_1_DATA"         , dest,"out_GPR_READ_"+toString(2*i+1)+"_DATA"         );
-	     PORT_MAP(_component ,src , "in_GPR_READ_1_DATA_VAL"     , dest,"out_GPR_READ_"+toString(2*i+1)+"_DATA_VAL"     );
+	     COMPONENT_MAP(_component ,src ,"out_GPR_READ_1_OOO_ENGINE_ID", dest, "in_GPR_READ_"+toString(2*i+1)+"_OOO_ENGINE_ID");
+	     COMPONENT_MAP(_component ,src ,"out_GPR_READ_1_NUM_REG"      , dest, "in_GPR_READ_"+toString(2*i+1)+"_NUM_REG"      );
+	     COMPONENT_MAP(_component ,src , "in_GPR_READ_1_DATA"         , dest,"out_GPR_READ_"+toString(2*i+1)+"_DATA"         );
+	     COMPONENT_MAP(_component ,src , "in_GPR_READ_1_DATA_VAL"     , dest,"out_GPR_READ_"+toString(2*i+1)+"_DATA_VAL"     );
 	   }
 	   
@@ -442,13 +574,13 @@
 #ifdef POSITION
 	     _component->interface_map (src ,"spr_read_0",
-					dest,"spr_read_"+toString(2*i  ));
-#endif
-	     PORT_MAP(_component ,src ,"out_SPR_READ_0_VAL"          , dest, "in_SPR_READ_"+toString(2*i  )+"_VAL"          );
-	     PORT_MAP(_component ,src , "in_SPR_READ_0_ACK"          , dest,"out_SPR_READ_"+toString(2*i  )+"_ACK"          );
+					dest,"spr_read_"+toString(i));
+#endif
+	     COMPONENT_MAP(_component ,src ,"out_SPR_READ_0_VAL"          , dest, "in_SPR_READ_"+toString(i)+"_VAL"          );
+	     COMPONENT_MAP(_component ,src , "in_SPR_READ_0_ACK"          , dest,"out_SPR_READ_"+toString(i)+"_ACK"          );
 	     if (_param->_have_port_ooo_engine_id)
-	     PORT_MAP(_component ,src ,"out_SPR_READ_0_OOO_ENGINE_ID", dest, "in_SPR_READ_"+toString(2*i  )+"_OOO_ENGINE_ID");
-	     PORT_MAP(_component ,src ,"out_SPR_READ_0_NUM_REG"      , dest, "in_SPR_READ_"+toString(2*i  )+"_NUM_REG"      );
-	     PORT_MAP(_component ,src , "in_SPR_READ_0_DATA"         , dest,"out_SPR_READ_"+toString(2*i  )+"_DATA"         );
-	     PORT_MAP(_component ,src , "in_SPR_READ_0_DATA_VAL"     , dest,"out_SPR_READ_"+toString(2*i  )+"_DATA_VAL"     );
+	     COMPONENT_MAP(_component ,src ,"out_SPR_READ_0_OOO_ENGINE_ID", dest, "in_SPR_READ_"+toString(i)+"_OOO_ENGINE_ID");
+	     COMPONENT_MAP(_component ,src ,"out_SPR_READ_0_NUM_REG"      , dest, "in_SPR_READ_"+toString(i)+"_NUM_REG"      );
+	     COMPONENT_MAP(_component ,src , "in_SPR_READ_0_DATA"         , dest,"out_SPR_READ_"+toString(i)+"_DATA"         );
+	     COMPONENT_MAP(_component ,src , "in_SPR_READ_0_DATA_VAL"     , dest,"out_SPR_READ_"+toString(i)+"_DATA_VAL"     );
 	   }
 	   
@@ -459,35 +591,21 @@
 		it++)
 	     {
-	       dest = _name+"_write_unit_"+toString(*it);
+	       uint32_t num_port = (*it);
+
+	       dest = _name+"_glue";
 #ifdef POSITION
 	       _component->interface_map (src ,"gpr_write_"+toString(it_gpr_write),
-					  dest,"gpr_write");
+					  dest,"gpr_write_read_unit_"+toString(num_port));
 #endif
 	       
-	       PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_VAL"          ,
-				    dest,"out_GPR_WRITE_0_VAL"          );
+	       COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_VAL"          ,
+			                 dest,"out_GPR_WRITE_READ_UNIT_"+toString(num_port)+"_VAL"          );
 	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_OOO_ENGINE_ID",
-				    dest,"out_GPR_WRITE_0_OOO_ENGINE_ID");
-	       PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_NUM_REG"      ,
-				    dest,"out_GPR_WRITE_0_NUM_REG"      );
-	       PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_DATA"         ,
-				    dest,"out_GPR_WRITE_0_DATA"         );
-
-	       // PORT MAP to the "write_unit" component
-#ifdef POSITION
-	       _component->interface_map (dest,"gpr_write",
-					  src ,"gpr_write_"+toString(it_gpr_write));
-#endif
-	       
-	       PORT_MAP(_component ,dest,"out_GPR_WRITE_0_VAL"          ,
-				    src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_VAL"          );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,dest,"out_GPR_WRITE_0_OOO_ENGINE_ID",
-				    src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_OOO_ENGINE_ID");
-	       PORT_MAP(_component ,dest,"out_GPR_WRITE_0_NUM_REG"      ,
-				    src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_NUM_REG"      );
-	       PORT_MAP(_component ,dest,"out_GPR_WRITE_0_DATA"         ,
-				    src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_DATA"         );
+	       COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_OOO_ENGINE_ID",
+				         dest,"out_GPR_WRITE_READ_UNIT_"+toString(num_port)+"_OOO_ENGINE_ID");
+	       COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_NUM_REG"      ,
+				         dest,"out_GPR_WRITE_READ_UNIT_"+toString(num_port)+"_NUM_REG"      );
+	       COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(it_gpr_write)+"_DATA"         ,
+				         dest,"out_GPR_WRITE_READ_UNIT_"+toString(num_port)+"_DATA"         );
 	       
 	       it_gpr_write ++;
@@ -500,35 +618,23 @@
 		it++)
 	     {
-	       dest = _name+"_write_unit_"+toString(*it);
+	       uint32_t num_port = (*it);
+
+	       dest = _name+"_glue";
 #ifdef POSITION
 	       _component->interface_map (src ,"spr_write_"+toString(it_spr_write),
-					  dest,"spr_write");
+					  dest,"spr_write_read_unit_"+toString(num_port));
 #endif
 	       
-	       PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_VAL"          ,
-				    dest,"out_SPR_WRITE_0_VAL"          );
+	       COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_VAL"          ,
+			                 dest,"out_SPR_WRITE_READ_UNIT_"+toString(num_port)+"_VAL"          );
+
 	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_OOO_ENGINE_ID",
-				    dest,"out_SPR_WRITE_0_OOO_ENGINE_ID");
-	       PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_NUM_REG"      ,
-				    dest,"out_SPR_WRITE_0_NUM_REG"      );
-	       PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_DATA"         ,
-				    dest,"out_SPR_WRITE_0_DATA"         );
-
-	       // PORT MAP to the "write_unit" component
-#ifdef POSITION
-	       _component->interface_map (dest,"spr_write",
-					  src ,"spr_write_"+toString(it_spr_write));
-#endif
-	       PORT_MAP(_component ,dest,"out_SPR_WRITE_0_VAL"          ,
-				    src , "in_SPR_WRITE_"+toString(it_spr_write)+"_VAL"          );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,dest,"out_SPR_WRITE_0_OOO_ENGINE_ID",
-				    src , "in_SPR_WRITE_"+toString(it_spr_write)+"_OOO_ENGINE_ID");
-	       PORT_MAP(_component ,dest,"out_SPR_WRITE_0_NUM_REG"      ,
-				    src , "in_SPR_WRITE_"+toString(it_spr_write)+"_NUM_REG"      );
-	       PORT_MAP(_component ,dest,"out_SPR_WRITE_0_DATA"         ,
-				    src , "in_SPR_WRITE_"+toString(it_spr_write)+"_DATA"         );
-
+	       COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_OOO_ENGINE_ID",
+				         dest,"out_SPR_WRITE_READ_UNIT_"+toString(num_port)+"_OOO_ENGINE_ID");
+	       COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_NUM_REG"      ,
+				         dest,"out_SPR_WRITE_READ_UNIT_"+toString(num_port)+"_NUM_REG"      );
+	       COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(it_spr_write)+"_DATA"         ,
+				         dest,"out_SPR_WRITE_READ_UNIT_"+toString(num_port)+"_DATA"         );
+	       
 	       it_spr_write ++;
 	     }
@@ -550,18 +656,18 @@
 		   
 		   if (_param->_have_port_ooo_engine_id)
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_OOO_ENGINE_ID",
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_OOO_ENGINE_ID");
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_VAL"      ,
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_VAL"      );
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_NUM_REG"  ,
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_NUM_REG"  );
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_DATA"     ,
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_DATA"     );
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_VAL"      ,
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_VAL"      );
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_NUM_REG"  ,
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_NUM_REG"  );
-		   PORT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_DATA"     ,
-					dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_DATA"     );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_OOO_ENGINE_ID",
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_OOO_ENGINE_ID");
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_VAL"      ,
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_VAL"      );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_NUM_REG"  ,
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_NUM_REG"  );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_DATA"     ,
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_DATA"     );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_VAL"      ,
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_VAL"      );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_NUM_REG"  ,
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_NUM_REG"  );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_DATA"     ,
+					     dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_DATA"     );
 
 #ifdef POSITION
@@ -570,19 +676,19 @@
 #endif
 		   
-		   if (_param->_have_port_ooo_engine_id)
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_OOO_ENGINE_ID",
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_OOO_ENGINE_ID");
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_VAL"      ,
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_VAL"      );
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_NUM_REG"  ,
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_NUM_REG"  );
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_DATA"     ,
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_DATA"     );
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_VAL"      ,
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_VAL"      );
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_NUM_REG"  ,
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_NUM_REG"  );
-		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_DATA"     ,
-					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_DATA"     );
+// 		   if (_param->_have_port_ooo_engine_id)
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_OOO_ENGINE_ID",
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_OOO_ENGINE_ID");
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_VAL"      ,
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_VAL"      );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_NUM_REG"  ,
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_NUM_REG"  );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_GPR_DATA"     ,
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_GPR_DATA"     );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_VAL"      ,
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_VAL"      );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_NUM_REG"  ,
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_NUM_REG"  );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_WRITE_"+toString(j              )+"_SPR_DATA"     ,
+// 					src , "in_BYPASS_WRITE_"+toString(it_bypass_write)+"_SPR_DATA"     );
 
 		   it_bypass_write ++;
@@ -606,12 +712,12 @@
 		   
 		   if (_param->_have_port_ooo_engine_id)
-		   PORT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_OOO_ENGINE_ID",
-					dest,"out_BYPASS_MEMORY_"+toString(j               )+"_OOO_ENGINE_ID");
-		   PORT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_VAL"          ,
-					dest,"out_BYPASS_MEMORY_"+toString(j               )+"_VAL"          );
-		   PORT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_NUM_REG"      ,
-					dest,"out_BYPASS_MEMORY_"+toString(j               )+"_NUM_REG"      );
-		   PORT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_DATA"         ,
-					dest,"out_BYPASS_MEMORY_"+toString(j               )+"_DATA"         );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_OOO_ENGINE_ID",
+					     dest,"out_BYPASS_MEMORY_"+toString(j               )+"_OOO_ENGINE_ID");
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_VAL"          ,
+					     dest,"out_BYPASS_MEMORY_"+toString(j               )+"_VAL"          );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_NUM_REG"      ,
+					     dest,"out_BYPASS_MEMORY_"+toString(j               )+"_NUM_REG"      );
+		   COMPONENT_MAP(_component ,src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_DATA"         ,
+				             dest,"out_BYPASS_MEMORY_"+toString(j               )+"_DATA"         );
 
 		   // port map to the "load_store_unit" component
@@ -621,13 +727,13 @@
 #endif
 		   
-		   if (_param->_have_port_ooo_engine_id)
-		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_OOO_ENGINE_ID",
-					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_OOO_ENGINE_ID");
-		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_VAL"          ,
-					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_VAL"          );
-		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_NUM_REG"      ,
-					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_NUM_REG"      );
-		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_DATA"         ,
-					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_DATA"         );
+// 		   if (_param->_have_port_ooo_engine_id)
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_OOO_ENGINE_ID",
+// 					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_OOO_ENGINE_ID");
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_VAL"          ,
+// 					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_VAL"          );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_NUM_REG"      ,
+// 					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_NUM_REG"      );
+// 		   PORT_MAP(_component ,dest,"out_BYPASS_MEMORY_"+toString(j               )+"_DATA"         ,
+// 					src , "in_BYPASS_MEMORY_"+toString(it_bypass_memory)+"_DATA"         );
 
 		   it_bypass_memory ++;
@@ -651,5 +757,5 @@
 
 	     src = _name+"_functionnal_unit_"+toString(x);
-	     std::cout << "Instance : " << src << std::endl;
+	     log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
 	     
 	     {
@@ -669,50 +775,50 @@
 #ifdef POSITION
 	       _component->interface_map (src ,"execute_in",
-					  dest,"execute_unit_in_"+toString(i));
-#endif
-
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_VAL"                  ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_VAL"                  );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_IN_ACK"                  ,
-				    dest, "in_EXECUTE_UNIT_IN_"+toString(i)+"_ACK"                  );
+					  dest,"execute_unit_in_"+toString(i)+"_0");
+#endif
+
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_VAL"                  ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_VAL"                  );
+	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_IN_ACK"                  ,
+				         dest, "in_EXECUTE_UNIT_IN_"+toString(i)+"_0_ACK"                  );
 	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_CONTEXT_ID"           ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"           );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_CONTEXT_ID"           ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_CONTEXT_ID"           );
 	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_FRONT_END_ID"         ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_FRONT_END_ID"         );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_FRONT_END_ID"         ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_FRONT_END_ID"         );
 	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_OOO_ENGINE_ID"        ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID"        );
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_PACKET_ID"            ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_PACKET_ID"            );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_OPERATION"            ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OPERATION"            );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_TYPE"                 ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_TYPE"                 );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE",
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_STORE_QUEUE_PTR_WRITE");
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_OOO_ENGINE_ID"        ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_OOO_ENGINE_ID"        );
+	       if (_param->_have_port_rob_ptr  )
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_PACKET_ID"            ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_PACKET_ID"            );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_OPERATION"            ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_OPERATION"            );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_TYPE"                 ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_TYPE"                 );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE",
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_STORE_QUEUE_PTR_WRITE");
 	       if (_param->_have_port_load_queue_ptr)
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE" ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_LOAD_QUEUE_PTR_WRITE" );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_HAS_IMMEDIAT"         ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_HAS_IMMEDIAT"         );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_IMMEDIAT"             ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_IMMEDIAT"             );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_DATA_RA"              ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RA"              );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_DATA_RB"              ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RB"              );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_DATA_RC"              ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RC"              );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_WRITE_RD"             ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RD"             );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_NUM_REG_RD"           ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"           );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_WRITE_RE"             ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RE"             );
-	       PORT_MAP(_component ,src , "in_EXECUTE_IN_NUM_REG_RE"           ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"           );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE" ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_LOAD_QUEUE_PTR_WRITE" );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_HAS_IMMEDIAT"         ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_HAS_IMMEDIAT"         );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_IMMEDIAT"             ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_IMMEDIAT"             );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_DATA_RA"              ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_DATA_RA"              );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_DATA_RB"              ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_DATA_RB"              );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_DATA_RC"              ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_DATA_RC"              );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_WRITE_RD"             ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_WRITE_RD"             );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_NUM_REG_RD"           ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_NUM_REG_RD"           );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_WRITE_RE"             ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_WRITE_RE"             );
+	       COMPONENT_MAP(_component ,src , "in_EXECUTE_IN_NUM_REG_RE"           ,
+				         dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_0_NUM_REG_RE"           );
 	     }
 	     
@@ -723,45 +829,45 @@
 #ifdef POSITION
 	       _component->interface_map (src ,"execute_out",
-					  dest,"execute_unit_out_"+toString(i));
-#endif
-
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_VAL"          ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_VAL"          );
-  	       PORT_MAP(_component ,src , "in_EXECUTE_OUT_ACK"          ,
-				    dest,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_ACK"          );
+					  dest,"execute_unit_out_"+toString(i)+"_0");
+#endif
+
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_VAL"          ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_VAL"          );
+  	       COMPONENT_MAP(_component ,src , "in_EXECUTE_OUT_ACK"          ,
+				         dest,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_0_ACK"          );
 	       if (_param->_have_port_context_id)
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_CONTEXT_ID"   ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_CONTEXT_ID"   );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_CONTEXT_ID"   ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_CONTEXT_ID"   );
 	       if (_param->_have_port_front_end_id)
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_FRONT_END_ID" ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_FRONT_END_ID" );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_FRONT_END_ID" ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_FRONT_END_ID" );
 	       if (_param->_have_port_ooo_engine_id)
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_OOO_ENGINE_ID",
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OOO_ENGINE_ID");
-	       if (_param->_have_port_packet_id)
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_PACKET_ID"    ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_PACKET_ID"    );
-//	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_OPERATION"    ,
-// 				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OPERATION"    );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_TYPE"         ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_TYPE"         );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_WRITE_RD"     ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RD"     );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_NUM_REG_RD"   ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RD"   );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_DATA_RD"      ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RD"      );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_WRITE_RE"     ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RE"     );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_NUM_REG_RE"   ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RE"   );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_DATA_RE"      ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RE"      );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_EXCEPTION"    ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_EXCEPTION"    );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_NO_SEQUENCE"  ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NO_SEQUENCE"  );
-  	       PORT_MAP(_component ,src ,"out_EXECUTE_OUT_ADDRESS"      ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_ADDRESS"      );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_OOO_ENGINE_ID",
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_OOO_ENGINE_ID");
+	       if (_param->_have_port_rob_ptr  )
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_PACKET_ID"    ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_PACKET_ID"    );
+//	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_OPERATION"    ,
+// 				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_OPERATION"    );
+	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_TYPE"         ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_TYPE"         );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_WRITE_RD"     ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_WRITE_RD"     );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_NUM_REG_RD"   ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_NUM_REG_RD"   );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_DATA_RD"      ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_DATA_RD"      );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_WRITE_RE"     ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_WRITE_RE"     );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_NUM_REG_RE"   ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_NUM_REG_RE"   );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_DATA_RE"      ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_DATA_RE"      );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_EXCEPTION"    ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_EXCEPTION"    );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_NO_SEQUENCE"  ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_NO_SEQUENCE"  );
+  	       COMPONENT_MAP(_component ,src ,"out_EXECUTE_OUT_ADDRESS"      ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_0_ADDRESS"      );
 	     }
 	   }
@@ -773,5 +879,5 @@
   
 	     src = _name+"_load_store_unit_"+toString(x);
-	     std::cout << "Instance : " << src << std::endl;
+	     log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
 
 	     // ~~~~~[ Interface "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -787,139 +893,143 @@
 	 
 	     // ~~~~~[ Interface "memory_in" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	     {
-	       dest = _name+"_read_unit_to_execution_unit";
-
-#ifdef POSITION
-	       _component->interface_map (src ,"memory_in",
-					  dest,"execute_unit_in_"+toString(i));
-#endif
-
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_VAL"                  ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_VAL"                  );
-	       PORT_MAP(_component ,src ,"out_MEMORY_IN_ACK"                  ,
-				    dest, "in_EXECUTE_UNIT_IN_"+toString(i)+"_ACK"                  );
-	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_CONTEXT_ID"           ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"           );
-	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_FRONT_END_ID"         ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_FRONT_END_ID"         );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_OOO_ENGINE_ID"        ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID"        );
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_PACKET_ID"            ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_PACKET_ID"            );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_OPERATION"            ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OPERATION"            );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_TYPE"                 ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_TYPE"                 );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_STORE_QUEUE_PTR_WRITE",
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_STORE_QUEUE_PTR_WRITE");
-	       if (_param->_have_port_load_queue_ptr)
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_LOAD_QUEUE_PTR_WRITE" ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_LOAD_QUEUE_PTR_WRITE" );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_HAS_IMMEDIAT"         ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_HAS_IMMEDIAT"         );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_IMMEDIAT"             ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_IMMEDIAT"             );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_DATA_RA"              ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RA"              );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_DATA_RB"              ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RB"              );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_DATA_RC"              ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RC"              );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_WRITE_RD"             ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RD"             );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_NUM_REG_RD"           ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"           );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_WRITE_RE"             ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RE"             );
-	       PORT_MAP(_component ,src , "in_MEMORY_IN_NUM_REG_RE"           ,
-				    dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"           );
-	     }
+	     for (uint32_t j=0; j<_param->_nb_inst_memory [x]; j++)
+	       {
+		 dest = _name+"_read_unit_to_execution_unit";
+		 
+#ifdef POSITION
+		 _component->interface_map (src ,"memory_in_"+toString(j),
+					    dest,"execute_unit_in_"+toString(i)+"_"+toString(j));
+#endif
+
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_VAL"                  ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_VAL"                  );
+		 COMPONENT_MAP(_component ,src ,"out_MEMORY_IN_"+toString(j)+"_ACK"                  ,
+				           dest, "in_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_ACK"                  );
+		 if (_param->_have_port_context_id)
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_CONTEXT_ID"           ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_CONTEXT_ID"           );
+		 if (_param->_have_port_front_end_id)
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_FRONT_END_ID"         ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_FRONT_END_ID"         );
+		 if (_param->_have_port_ooo_engine_id)
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_OOO_ENGINE_ID"        ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_OOO_ENGINE_ID"        );
+		 if (_param->_have_port_rob_ptr  )
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_PACKET_ID"            ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_PACKET_ID"            );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_OPERATION"            ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_OPERATION"            );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_TYPE"                 ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_TYPE"                 );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_STORE_QUEUE_PTR_WRITE",
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_STORE_QUEUE_PTR_WRITE");
+		 if (_param->_have_port_load_queue_ptr)
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_LOAD_QUEUE_PTR_WRITE" ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_LOAD_QUEUE_PTR_WRITE" );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_HAS_IMMEDIAT"         ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_HAS_IMMEDIAT"         );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_IMMEDIAT"             ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_IMMEDIAT"             );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_DATA_RA"              ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_DATA_RA"              );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_DATA_RB"              ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_DATA_RB"              );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_DATA_RC"              ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_DATA_RC"              );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_WRITE_RD"             ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_WRITE_RD"             );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_NUM_REG_RD"           ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_NUM_REG_RD"           );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_WRITE_RE"             ,
+			                   dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_WRITE_RE"             );
+		 COMPONENT_MAP(_component ,src , "in_MEMORY_IN_"+toString(j)+"_NUM_REG_RE"           ,
+				           dest,"out_EXECUTE_UNIT_IN_"+toString(i)+"_"+toString(j)+"_NUM_REG_RE"           );
+	       }
 
 	     // ~~~~~[ Interface "memory_out" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	     {
+	     for (uint32_t j=0; j<_param->_nb_inst_memory [x]; j++)
+	       {
 	       dest = _name+"_execution_unit_to_write_unit";
 	       
 #ifdef POSITION
-	       _component->interface_map (src ,"memory_out",
-					  dest,"execute_unit_out_"+toString(i));
-#endif
-
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_VAL"          ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_VAL"          );
-  	       PORT_MAP(_component ,src , "in_MEMORY_OUT_ACK"          ,
-				    dest,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_ACK"          );
+	       _component->interface_map (src ,"memory_out_"+toString(j)
+					  dest,"execute_unit_out_"+toString(i)+"_"+toString(j));
+#endif
+
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_VAL"          ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_VAL"          );
+  	       COMPONENT_MAP(_component ,src , "in_MEMORY_OUT_"+toString(j)+"_ACK"          ,
+				         dest,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_ACK"          );
 	       if (_param->_have_port_context_id)
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_CONTEXT_ID"   ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_CONTEXT_ID"   );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_CONTEXT_ID"   ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_CONTEXT_ID"   );
 	       if (_param->_have_port_front_end_id)
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_FRONT_END_ID" ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_FRONT_END_ID" );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_FRONT_END_ID" ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_FRONT_END_ID" );
 	       if (_param->_have_port_ooo_engine_id)
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_OOO_ENGINE_ID",
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OOO_ENGINE_ID");
-	       if (_param->_have_port_packet_id)
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_PACKET_ID"    ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_PACKET_ID"    );
-//	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_OPERATION"    ,
-// 				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OPERATION"    );
-	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_TYPE"         ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_TYPE"         );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_WRITE_RD"     ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RD"     );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_NUM_REG_RD"   ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RD"   );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_DATA_RD"      ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RD"      );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_WRITE_RE"     ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RE"     );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_NUM_REG_RE"   ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RE"   );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_DATA_RE"      ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RE"      );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_EXCEPTION"    ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_EXCEPTION"    );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_NO_SEQUENCE"  ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NO_SEQUENCE"  );
-  	       PORT_MAP(_component ,src ,"out_MEMORY_OUT_ADDRESS"      ,
-				    dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_ADDRESS"      );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_OOO_ENGINE_ID",
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_OOO_ENGINE_ID");
+	       if (_param->_have_port_rob_ptr  )
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_PACKET_ID"    ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_PACKET_ID"    );
+//	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_OPERATION"    ,
+// 				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_OPERATION"    );
+	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_TYPE"         ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_TYPE"         );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_WRITE_RD"     ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_WRITE_RD"     );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_NUM_REG_RD"   ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_NUM_REG_RD"   );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_DATA_RD"      ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_DATA_RD"      );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_WRITE_RE"     ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_WRITE_RE"     );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_NUM_REG_RE"   ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_NUM_REG_RE"   );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_DATA_RE"      ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_DATA_RE"      );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_EXCEPTION"    ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_EXCEPTION"    );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_NO_SEQUENCE"  ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_NO_SEQUENCE"  );
+  	       COMPONENT_MAP(_component ,src ,"out_MEMORY_OUT_"+toString(j)+"_ADDRESS"      ,
+				         dest, "in_EXECUTE_UNIT_OUT_"+toString(i)+"_"+toString(j)+"_ADDRESS"      );
 	     }
-
+	     
 	     // ~~~~~[ Interface "dcache_req" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	     for (uint32_t j=0; j<_param->_nb_cache_port [x]; j++)
 	     {
 	       dest = _name;
 	       
 #ifdef POSITION
-	       _component->interface_map (src ,"dcache_req",
-					  dest,"dcache_req_"+toString(i));
-#endif
-  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_VAL"       ,dest,"out_DCACHE_REQ_"+toString(i)+"_VAL"       );
-  	       PORT_MAP(_component ,src , "in_DCACHE_REQ_ACK"       ,dest, "in_DCACHE_REQ_"+toString(i)+"_ACK"       );
+	       _component->interface_map (src ,"dcache_req_"+toString(j),
+					  dest,"dcache_req_"+toString(x)+"_"+toString(j));
+#endif
+  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_"+toString(j)+"_VAL"       ,dest,"out_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_VAL"       );
+  	       PORT_MAP(_component ,src , "in_DCACHE_REQ_"+toString(j)+"_ACK"       ,dest, "in_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_ACK"       );
   	       if (_param->_have_port_dcache_context_id)
-	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_CONTEXT_ID",dest,"out_DCACHE_REQ_"+toString(i)+"_CONTEXT_ID");
-  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_PACKET_ID" ,dest,"out_DCACHE_REQ_"+toString(i)+"_PACKET_ID" );
-  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_ADDRESS"   ,dest,"out_DCACHE_REQ_"+toString(i)+"_ADDRESS"   );
-  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_TYPE"      ,dest,"out_DCACHE_REQ_"+toString(i)+"_TYPE"      );
-  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_WDATA"     ,dest,"out_DCACHE_REQ_"+toString(i)+"_WDATA"     );
+	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_"+toString(j)+"_CONTEXT_ID",dest,"out_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_CONTEXT_ID");
+  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_"+toString(j)+"_PACKET_ID" ,dest,"out_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_PACKET_ID" );
+  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_"+toString(j)+"_ADDRESS"   ,dest,"out_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_ADDRESS"   );
+  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_"+toString(j)+"_TYPE"      ,dest,"out_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_TYPE"      );
+  	       PORT_MAP(_component ,src ,"out_DCACHE_REQ_"+toString(j)+"_WDATA"     ,dest,"out_DCACHE_REQ_"+toString(x)+"_"+toString(j)+"_WDATA"     );
 	     }
 
 	     // ~~~~~[ Interface "dcache_rsp" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	     for (uint32_t j=0; j<_param->_nb_cache_port [x]; j++)
 	     {
 	       dest = _name;
 	       
 #ifdef POSITION
-	       _component->interface_map (src ,"dcache_rsp",
-					  dest,"dcache_rsp_"+toString(i));
-#endif
-  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_VAL"       ,dest, "in_DCACHE_RSP_"+toString(i)+"_VAL"       );
-  	       PORT_MAP(_component ,src ,"out_DCACHE_RSP_ACK"       ,dest,"out_DCACHE_RSP_"+toString(i)+"_ACK"       );
+	       _component->interface_map (src ,"dcache_rsp_"+toString(j),
+					  dest,"dcache_rsp_"+toString(x)+"_"+toString(j));
+#endif
+  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_"+toString(j)+"_VAL"       ,dest, "in_DCACHE_RSP_"+toString(x)+"_"+toString(j)+"_VAL"       );
+  	       PORT_MAP(_component ,src ,"out_DCACHE_RSP_"+toString(j)+"_ACK"       ,dest,"out_DCACHE_RSP_"+toString(x)+"_"+toString(j)+"_ACK"       );
   	       if (_param->_have_port_dcache_context_id)
-  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_CONTEXT_ID",dest, "in_DCACHE_RSP_"+toString(i)+"_CONTEXT_ID");
-  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_PACKET_ID" ,dest, "in_DCACHE_RSP_"+toString(i)+"_PACKET_ID" );
-  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_RDATA"     ,dest, "in_DCACHE_RSP_"+toString(i)+"_RDATA"     );
-  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_ERROR"     ,dest, "in_DCACHE_RSP_"+toString(i)+"_ERROR"     );
+  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_"+toString(j)+"_CONTEXT_ID",dest, "in_DCACHE_RSP_"+toString(x)+"_"+toString(j)+"_CONTEXT_ID");
+  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_"+toString(j)+"_PACKET_ID" ,dest, "in_DCACHE_RSP_"+toString(x)+"_"+toString(j)+"_PACKET_ID" );
+  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_"+toString(j)+"_RDATA"     ,dest, "in_DCACHE_RSP_"+toString(x)+"_"+toString(j)+"_RDATA"     );
+  	       PORT_MAP(_component ,src , "in_DCACHE_RSP_"+toString(j)+"_ERROR"     ,dest, "in_DCACHE_RSP_"+toString(x)+"_"+toString(j)+"_ERROR"     );
 	     }
 
@@ -937,5 +1047,5 @@
        {
 	 src = _name+"_write_unit_"+toString(i);
-	 std::cout << "Instance : " << src << std::endl;
+	 log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
 	 
 	 {
@@ -957,42 +1067,42 @@
 #endif
 	   
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_VAL"          ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_VAL"          );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_ACK"          ,
-				dest, "in_WRITE_UNIT_IN_"+toString(i)+"_ACK"          );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_VAL"          ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_VAL"          );
+	   COMPONENT_MAP(_component ,src ,"out_WRITE_UNIT_IN_ACK"          ,
+				     dest, "in_WRITE_UNIT_IN_"+toString(i)+"_ACK"          );
 	   if (_param->_have_port_context_id)
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_CONTEXT_ID"   ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"   );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_CONTEXT_ID"   ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"   );
 	   if (_param->_have_port_front_end_id)
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_FRONT_END_ID" ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_FRONT_END_ID" );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_FRONT_END_ID" ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_FRONT_END_ID" );
 	   if (_param->_have_port_ooo_engine_id)
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_OOO_ENGINE_ID",
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID");
-	   if (_param->_have_port_packet_id)
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_PACKET_ID"    ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_PACKET_ID"    );
-// 	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_OPERATION"    ,
-// 				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_OPERATION"    );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_TYPE"         ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_TYPE"         );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_WRITE_RD"     ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RD"     );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_NUM_REG_RD"   ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"   );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_DATA_RD"      ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RD"      );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_WRITE_RE"     ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RE"     );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_NUM_REG_RE"   ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"   );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_DATA_RE"      ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RE"      );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_EXCEPTION"    ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_EXCEPTION"    );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_NO_SEQUENCE"  ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_NO_SEQUENCE"  );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_ADDRESS"      ,
-				dest,"out_WRITE_UNIT_IN_"+toString(i)+"_ADDRESS"      );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_OOO_ENGINE_ID",
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID");
+	   if (_param->_have_port_rob_ptr  )
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_PACKET_ID"    ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_PACKET_ID"    );
+// 	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_OPERATION"    ,
+// 				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_OPERATION"    );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_TYPE"         ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_TYPE"         );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_WRITE_RD"     ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RD"     );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_NUM_REG_RD"   ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"   );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_DATA_RD"      ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RD"      );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_WRITE_RE"     ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RE"     );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_NUM_REG_RE"   ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"   );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_DATA_RE"      ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RE"      );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_EXCEPTION"    ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_EXCEPTION"    );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_NO_SEQUENCE"  ,
+				     dest,"out_WRITE_UNIT_IN_"+toString(i)+"_NO_SEQUENCE"  );
+	   COMPONENT_MAP(_component ,src , "in_WRITE_UNIT_IN_ADDRESS"      ,
+			             dest,"out_WRITE_UNIT_IN_"+toString(i)+"_ADDRESS"      );
 	 }
 
@@ -1018,5 +1128,5 @@
   	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_OUT_OOO_ENGINE_ID",
 				dest,"out_EXECUTE_LOOP_OUT_"+toString(i)+"_OOO_ENGINE_ID");
-	   if (_param->_have_port_packet_id)
+	   if (_param->_have_port_rob_ptr  )
   	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_OUT_PACKET_ID"    ,
 				dest,"out_EXECUTE_LOOP_OUT_"+toString(i)+"_PACKET_ID"    );
@@ -1033,26 +1143,27 @@
   	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_OUT_ADDRESS"      ,
 				dest,"out_EXECUTE_LOOP_OUT_"+toString(i)+"_ADDRESS"      );
+  	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_OUT_DATA"         ,
+				dest,"out_EXECUTE_LOOP_OUT_"+toString(i)+"_DATA"         );
 	 }
+
 	 // -----[ Interface "gpr_write" ]-------------------------------------
 	 {
-	   // Port map with "read_unit" is ok!
-
-	   dest = _name+"_register_unit";
+	   dest = _name+"_glue";
 #ifdef POSITION
 	   _component->interface_map (src ,"gpr_write",
-				      dest,"gpr_write_"+toString(i));
-#endif
-
-  	   PORT_MAP(_component ,src ,"out_GPR_WRITE_0_VAL"          ,
-				dest, "in_GPR_WRITE_"+toString(i)+"_VAL"          );
-  	   PORT_MAP(_component ,src , "in_GPR_WRITE_0_ACK"          ,
-				dest,"out_GPR_WRITE_"+toString(i)+"_ACK"          );
-	   if (_param->_have_port_context_id)
-  	   PORT_MAP(_component ,src ,"out_GPR_WRITE_0_OOO_ENGINE_ID",
-				dest, "in_GPR_WRITE_"+toString(i)+"_OOO_ENGINE_ID");
-  	   PORT_MAP(_component ,src ,"out_GPR_WRITE_0_NUM_REG"      ,
-				dest, "in_GPR_WRITE_"+toString(i)+"_NUM_REG"      );
-  	   PORT_MAP(_component ,src ,"out_GPR_WRITE_0_DATA"         ,
-				dest, "in_GPR_WRITE_"+toString(i)+"_DATA"         );
+				      dest,"gpr_write_write_unit_"+toString(i));
+#endif
+
+  	   COMPONENT_MAP(_component ,src ,"out_GPR_WRITE_0_VAL"          ,
+			  	     dest, "in_GPR_WRITE_WRITE_UNIT_"+toString(i)+"_VAL"          );
+  	   COMPONENT_MAP(_component ,src , "in_GPR_WRITE_0_ACK"          ,
+				     dest,"out_GPR_WRITE_WRITE_UNIT_"+toString(i)+"_ACK"          );
+	   if (_param->_have_port_ooo_engine_id)
+  	   COMPONENT_MAP(_component ,src ,"out_GPR_WRITE_0_OOO_ENGINE_ID",
+				     dest, "in_GPR_WRITE_WRITE_UNIT_"+toString(i)+"_OOO_ENGINE_ID");
+  	   COMPONENT_MAP(_component ,src ,"out_GPR_WRITE_0_NUM_REG"      ,
+				     dest, "in_GPR_WRITE_WRITE_UNIT_"+toString(i)+"_NUM_REG"      );
+  	   COMPONENT_MAP(_component ,src ,"out_GPR_WRITE_0_DATA"         ,
+				     dest, "in_GPR_WRITE_WRITE_UNIT_"+toString(i)+"_DATA"         );
 	 }
 
@@ -1061,21 +1172,21 @@
 	   // Port map with "read_unit" is ok!
 
-	   dest = _name+"_register_unit";
+	   dest = _name+"_glue";
 #ifdef POSITION
 	   _component->interface_map (src ,"spr_write",
-				      dest,"spr_write_"+toString(i));
-#endif
-
-  	   PORT_MAP(_component ,src ,"out_SPR_WRITE_0_VAL"          ,
-				dest, "in_SPR_WRITE_"+toString(i)+"_VAL"          );
-  	   PORT_MAP(_component ,src , "in_SPR_WRITE_0_ACK"          ,
-				dest,"out_SPR_WRITE_"+toString(i)+"_ACK"          );
-	   if (_param->_have_port_context_id)
-  	   PORT_MAP(_component ,src ,"out_SPR_WRITE_0_OOO_ENGINE_ID",
-				dest, "in_SPR_WRITE_"+toString(i)+"_OOO_ENGINE_ID");
-  	   PORT_MAP(_component ,src ,"out_SPR_WRITE_0_NUM_REG"      ,
-				dest, "in_SPR_WRITE_"+toString(i)+"_NUM_REG"      );
-  	   PORT_MAP(_component ,src ,"out_SPR_WRITE_0_DATA"         ,
-				dest, "in_SPR_WRITE_"+toString(i)+"_DATA"         );
+				      dest,"spr_write_write_unit_"+toString(i));
+#endif
+
+  	   COMPONENT_MAP(_component ,src ,"out_SPR_WRITE_0_VAL"          ,
+			  	     dest, "in_SPR_WRITE_WRITE_UNIT_"+toString(i)+"_VAL"          );
+  	   COMPONENT_MAP(_component ,src , "in_SPR_WRITE_0_ACK"          ,
+				     dest,"out_SPR_WRITE_WRITE_UNIT_"+toString(i)+"_ACK"          );
+	   if (_param->_have_port_ooo_engine_id)
+  	   COMPONENT_MAP(_component ,src ,"out_SPR_WRITE_0_OOO_ENGINE_ID",
+				     dest, "in_SPR_WRITE_WRITE_UNIT_"+toString(i)+"_OOO_ENGINE_ID");
+  	   COMPONENT_MAP(_component ,src ,"out_SPR_WRITE_0_NUM_REG"      ,
+				     dest, "in_SPR_WRITE_WRITE_UNIT_"+toString(i)+"_NUM_REG"      );
+  	   COMPONENT_MAP(_component ,src ,"out_SPR_WRITE_0_DATA"         ,
+				     dest, "in_SPR_WRITE_WRITE_UNIT_"+toString(i)+"_DATA"         );
 	 }
 
@@ -1091,5 +1202,5 @@
      {
        src = _name+"_register_unit";
-       std::cout << "Instance : " << src << std::endl;
+       log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
        
        {
@@ -1114,19 +1225,19 @@
 #endif
        
-	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i  )+"_VAL"          ,dest,"out_GPR_READ_0_VAL"          );
-	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i  )+"_ACK"          ,dest, "in_GPR_READ_0_ACK"          );
-	 if (_param->_have_port_context_id)
-	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i  )+"_OOO_ENGINE_ID",dest,"out_GPR_READ_0_OOO_ENGINE_ID");
-	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i  )+"_NUM_REG"      ,dest,"out_GPR_READ_0_NUM_REG"      );
-	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i  )+"_DATA"         ,dest, "in_GPR_READ_0_DATA"         );
-	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i  )+"_DATA_VAL"     ,dest, "in_GPR_READ_0_DATA_VAL"     );
-
-	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i+1)+"_VAL"          ,dest,"out_GPR_READ_1_VAL"          );
-	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i+1)+"_ACK"          ,dest, "in_GPR_READ_1_ACK"          );
-	 if (_param->_have_port_context_id)
-	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i+1)+"_OOO_ENGINE_ID",dest,"out_GPR_READ_1_OOO_ENGINE_ID");
-	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i+1)+"_NUM_REG"      ,dest,"out_GPR_READ_1_NUM_REG"      );
-	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i+1)+"_DATA"         ,dest, "in_GPR_READ_1_DATA"         );
-	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i+1)+"_DATA_VAL"     ,dest, "in_GPR_READ_1_DATA_VAL"     );
+// 	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i  )+"_VAL"          ,dest,"out_GPR_READ_0_VAL"          );
+// 	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i  )+"_ACK"          ,dest, "in_GPR_READ_0_ACK"          );
+// 	 if (_param->_have_port_context_id)
+// 	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i  )+"_OOO_ENGINE_ID",dest,"out_GPR_READ_0_OOO_ENGINE_ID");
+// 	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i  )+"_NUM_REG"      ,dest,"out_GPR_READ_0_NUM_REG"      );
+// 	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i  )+"_DATA"         ,dest, "in_GPR_READ_0_DATA"         );
+// 	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i  )+"_DATA_VAL"     ,dest, "in_GPR_READ_0_DATA_VAL"     );
+
+// 	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i+1)+"_VAL"          ,dest,"out_GPR_READ_1_VAL"          );
+// 	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i+1)+"_ACK"          ,dest, "in_GPR_READ_1_ACK"          );
+// 	 if (_param->_have_port_context_id)
+// 	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i+1)+"_OOO_ENGINE_ID",dest,"out_GPR_READ_1_OOO_ENGINE_ID");
+// 	 PORT_MAP(_component ,src , "in_GPR_READ_"+toString(2*i+1)+"_NUM_REG"      ,dest,"out_GPR_READ_1_NUM_REG"      );
+// 	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i+1)+"_DATA"         ,dest, "in_GPR_READ_1_DATA"         );
+// 	 PORT_MAP(_component ,src ,"out_GPR_READ_"+toString(2*i+1)+"_DATA_VAL"     ,dest, "in_GPR_READ_1_DATA_VAL"     );
 	 }
 
@@ -1134,16 +1245,16 @@
        for (uint32_t i=0; i<_param->_nb_write_unit; i++)
 	 {
-	   dest = _name+"_write_unit_"+toString(i);
-#ifdef POSITION
-	   _component->interface_map (src ,"gpr_write_"+toString(i)
-				      dest,"gpr_write_0");
-#endif
-       
-	   PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_VAL"          ,dest,"out_GPR_WRITE_0_VAL"          );
-	   PORT_MAP(_component ,src ,"out_GPR_WRITE_"+toString(i)+"_ACK"          ,dest, "in_GPR_WRITE_0_ACK"          );
-	   if (_param->_have_port_context_id)
-	   PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_OOO_ENGINE_ID",dest,"out_GPR_WRITE_0_OOO_ENGINE_ID");
-	   PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_NUM_REG"      ,dest,"out_GPR_WRITE_0_NUM_REG"      );
-	   PORT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_DATA"         ,dest,"out_GPR_WRITE_0_DATA"         );
+	   dest = _name+"_glue";
+#ifdef POSITION
+	   _component->interface_map (src ,"gpr_write_"+toString(i),
+				      dest,"gpr_write_register_file_"+toString(i));
+#endif
+       
+	   COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_VAL"          ,dest,"out_GPR_WRITE_REGISTER_FILE_"+toString(i)+"_VAL"          );
+	   COMPONENT_MAP(_component ,src ,"out_GPR_WRITE_"+toString(i)+"_ACK"          ,dest, "in_GPR_WRITE_REGISTER_FILE_"+toString(i)+"_ACK"          );
+	   if (_param->_have_port_ooo_engine_id)
+	   COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_OOO_ENGINE_ID",dest,"out_GPR_WRITE_REGISTER_FILE_"+toString(i)+"_OOO_ENGINE_ID");
+	   COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_NUM_REG"      ,dest,"out_GPR_WRITE_REGISTER_FILE_"+toString(i)+"_NUM_REG"      );
+	   COMPONENT_MAP(_component ,src , "in_GPR_WRITE_"+toString(i)+"_DATA"         ,dest,"out_GPR_WRITE_REGISTER_FILE_"+toString(i)+"_DATA"         );
 	 }
 
@@ -1157,11 +1268,11 @@
 #endif
        
-	   PORT_MAP(_component ,src , "in_SPR_READ_"+toString(i)+"_VAL"          ,dest,"out_SPR_READ_0_VAL"          );
-	   PORT_MAP(_component ,src ,"out_SPR_READ_"+toString(i)+"_ACK"          ,dest, "in_SPR_READ_0_ACK"          );
-	   if (_param->_have_port_context_id)
-	   PORT_MAP(_component ,src , "in_SPR_READ_"+toString(i)+"_OOO_ENGINE_ID",dest,"out_SPR_READ_0_OOO_ENGINE_ID");
-	   PORT_MAP(_component ,src , "in_SPR_READ_"+toString(i)+"_NUM_REG"      ,dest,"out_SPR_READ_0_NUM_REG"      );
-	   PORT_MAP(_component ,src ,"out_SPR_READ_"+toString(i)+"_DATA"         ,dest, "in_SPR_READ_0_DATA"         );
-	   PORT_MAP(_component ,src ,"out_SPR_READ_"+toString(i)+"_DATA_VAL"     ,dest, "in_SPR_READ_0_DATA_VAL"     );
+// 	   PORT_MAP(_component ,src , "in_SPR_READ_"+toString(i)+"_VAL"          ,dest,"out_SPR_READ_0_VAL"          );
+// 	   PORT_MAP(_component ,src ,"out_SPR_READ_"+toString(i)+"_ACK"          ,dest, "in_SPR_READ_0_ACK"          );
+// 	   if (_param->_have_port_context_id)
+// 	   PORT_MAP(_component ,src , "in_SPR_READ_"+toString(i)+"_OOO_ENGINE_ID",dest,"out_SPR_READ_0_OOO_ENGINE_ID");
+// 	   PORT_MAP(_component ,src , "in_SPR_READ_"+toString(i)+"_NUM_REG"      ,dest,"out_SPR_READ_0_NUM_REG"      );
+// 	   PORT_MAP(_component ,src ,"out_SPR_READ_"+toString(i)+"_DATA"         ,dest, "in_SPR_READ_0_DATA"         );
+// 	   PORT_MAP(_component ,src ,"out_SPR_READ_"+toString(i)+"_DATA_VAL"     ,dest, "in_SPR_READ_0_DATA_VAL"     );
 	 }
 
@@ -1169,16 +1280,16 @@
        for (uint32_t i=0; i<_param->_nb_write_unit; i++)
 	 {
-	   dest = _name+"_write_unit_"+toString(i);
-#ifdef POSITION
-	   _component->interface_map (src ,"spr_write_"+toString(i)
-				      dest,"spr_write_0");
-#endif
-       
-	   PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_VAL"          ,dest,"out_SPR_WRITE_0_VAL"          );
-	   PORT_MAP(_component ,src ,"out_SPR_WRITE_"+toString(i)+"_ACK"          ,dest, "in_SPR_WRITE_0_ACK"          );
-	   if (_param->_have_port_context_id)
-	   PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_OOO_ENGINE_ID",dest,"out_SPR_WRITE_0_OOO_ENGINE_ID");
-	   PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_NUM_REG"      ,dest,"out_SPR_WRITE_0_NUM_REG"      );
-	   PORT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_DATA"         ,dest,"out_SPR_WRITE_0_DATA"         );
+	   dest = _name+"_glue";
+#ifdef POSITION
+	   _component->interface_map (src ,"spr_write_"+toString(i),
+				      dest,"spr_write_register_file_"+toString(i));
+#endif
+       
+	   COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_VAL"          ,dest,"out_SPR_WRITE_REGISTER_FILE_"+toString(i)+"_VAL"          );
+	   COMPONENT_MAP(_component ,src ,"out_SPR_WRITE_"+toString(i)+"_ACK"          ,dest, "in_SPR_WRITE_REGISTER_FILE_"+toString(i)+"_ACK"          );
+	   if (_param->_have_port_ooo_engine_id)
+	   COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_OOO_ENGINE_ID",dest,"out_SPR_WRITE_REGISTER_FILE_"+toString(i)+"_OOO_ENGINE_ID");
+	   COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_NUM_REG"      ,dest,"out_SPR_WRITE_REGISTER_FILE_"+toString(i)+"_NUM_REG"      );
+	   COMPONENT_MAP(_component ,src , "in_SPR_WRITE_"+toString(i)+"_DATA"         ,dest,"out_SPR_WRITE_REGISTER_FILE_"+toString(i)+"_DATA"         );
 	 }
     
@@ -1211,39 +1322,39 @@
 	 }
 
-       // ~~~~~[ Interface "retire_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       for (uint32_t i=0; i<_param->_nb_ooo_engine; i++)
-	 {
-	   uint32_t x=_param->_nb_inst_retire_rob [i];
+//        // ~~~~~[ Interface "retire_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//        for (uint32_t i=0; i<_param->_nb_ooo_engine; i++)
+// 	 {
+// 	   uint32_t x=_param->_nb_inst_retire_rob [i];
 	   
-	   for (uint32_t j=0; j<x; j++)
-	     {
-	       dest = _name;
-#ifdef POSITION
-	       _component->interface_map (src ,"retire_rob_"+toString(i)+"_"+toString(j),
-					  dest,"retire_rob_"+toString(i)+"_"+toString(j));
-#endif
-
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_VAL"           ,
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_VAL"           );
-	       PORT_MAP(_component ,src ,"out_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_ACK"           ,
-				    dest,"out_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_ACK"           );
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_USE"    ,
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_USE"    );
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_NUM_REG",
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_NUM_REG");
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_USE"    ,
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_USE"    );
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_NUM_REG",
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_NUM_REG");
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_USE"    ,
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_USE"    );
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_NUM_REG",
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_NUM_REG");
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_USE"    ,
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_USE"    );
-	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_NUM_REG",
-				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_NUM_REG");
-	     }
-	 }
+// 	   for (uint32_t j=0; j<x; j++)
+// 	     {
+// 	       dest = _name;
+// #ifdef POSITION
+// 	       _component->interface_map (src ,"retire_rob_"+toString(i)+"_"+toString(j),
+// 					  dest,"retire_rob_"+toString(i)+"_"+toString(j));
+// #endif
+
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_VAL"           ,
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_VAL"           );
+// 	       PORT_MAP(_component ,src ,"out_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_ACK"           ,
+// 				    dest,"out_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_ACK"           );
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_USE"    ,
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_USE"    );
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_NUM_REG",
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_OLD_NUM_REG");
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_USE"    ,
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_USE"    );
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_NUM_REG",
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RD_NEW_NUM_REG");
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_USE"    ,
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_USE"    );
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_NUM_REG",
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_OLD_NUM_REG");
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_USE"    ,
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_USE"    );
+// 	       PORT_MAP(_component ,src , "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_NUM_REG",
+// 				    dest, "in_RETIRE_ROB_"+toString(i)+"_"+toString(j)+"_RE_NEW_NUM_REG");
+// 	     }
+// 	 }
      }
 
@@ -1253,5 +1364,5 @@
      {
        src = _name+"_read_unit_to_execution_unit";
-       std::cout << "Instance : " << src << std::endl;
+       log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
        
        {
@@ -1277,47 +1388,47 @@
 #endif
 	     
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_VAL"                  ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_VAL"                  );
-	     PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_ACK"                  ,
-				  dest, "in_READ_UNIT_OUT_"+toString(j               )+"_ACK"                  );
-	     if (_param->_have_port_context_id)
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_CONTEXT_ID"           ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_CONTEXT_ID"           );
-	     if (_param->_have_port_front_end_id)
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_FRONT_END_ID"         ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_FRONT_END_ID"         );
-	     if (_param->_have_port_ooo_engine_id)
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_OOO_ENGINE_ID"        ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_OOO_ENGINE_ID"        );
-	     if (_param->_have_port_packet_id)
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_PACKET_ID"            ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_PACKET_ID"            );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_OPERATION"            ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_OPERATION"            );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_TYPE"                 ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_TYPE"                 );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_STORE_QUEUE_PTR_WRITE",
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_STORE_QUEUE_PTR_WRITE");
-	     if (_param->_have_port_load_queue_ptr)
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_LOAD_QUEUE_PTR_WRITE" ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_LOAD_QUEUE_PTR_WRITE" );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_HAS_IMMEDIAT"         ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_HAS_IMMEDIAT"         );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_IMMEDIAT"             ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_IMMEDIAT"             );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RA"              ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RA"              );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RB"              ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RB"              );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RC"              ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RC"              );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_WRITE_RD"             ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_WRITE_RD"             );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_NUM_REG_RD"           ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_NUM_REG_RD"           );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_WRITE_RE"             ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_WRITE_RE"             );
-	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_NUM_REG_RE"           ,
-				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_NUM_REG_RE"           );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_VAL"                  ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_VAL"                  );
+// 	     PORT_MAP(_component ,src ,"out_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_ACK"                  ,
+// 				  dest, "in_READ_UNIT_OUT_"+toString(j               )+"_ACK"                  );
+// 	     if (_param->_have_port_context_id)
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_CONTEXT_ID"           ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_CONTEXT_ID"           );
+// 	     if (_param->_have_port_front_end_id)
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_FRONT_END_ID"         ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_FRONT_END_ID"         );
+// 	     if (_param->_have_port_ooo_engine_id)
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_OOO_ENGINE_ID"        ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_OOO_ENGINE_ID"        );
+// 	     if (_param->_have_port_rob_ptr  )
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_PACKET_ID"            ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_PACKET_ID"            );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_OPERATION"            ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_OPERATION"            );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_TYPE"                 ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_TYPE"                 );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_STORE_QUEUE_PTR_WRITE",
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_STORE_QUEUE_PTR_WRITE");
+// 	     if (_param->_have_port_load_queue_ptr)
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_LOAD_QUEUE_PTR_WRITE" ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_LOAD_QUEUE_PTR_WRITE" );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_HAS_IMMEDIAT"         ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_HAS_IMMEDIAT"         );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_IMMEDIAT"             ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_IMMEDIAT"             );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RA"              ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RA"              );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RB"              ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RB"              );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_DATA_RC"              ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_DATA_RC"              );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_WRITE_RD"             ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_WRITE_RD"             );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_NUM_REG_RD"           ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_NUM_REG_RD"           );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_WRITE_RE"             ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_WRITE_RE"             );
+// 	     PORT_MAP(_component ,src , "in_READ_UNIT_OUT_"+toString(it_read_unit_out)+"_NUM_REG_RE"           ,
+// 				  dest,"out_READ_UNIT_OUT_"+toString(j               )+"_NUM_REG_RE"           );
 	     
 	     it_read_unit_out ++;
@@ -1338,47 +1449,47 @@
 #endif
 	       
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_VAL"                  ,
-				    dest, "in_EXECUTE_IN_VAL"                  );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_IN_"+toString(i)+"_ACK"                  ,
-				    dest,"out_EXECUTE_IN_ACK"                  );
-	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"           ,
-				    dest, "in_EXECUTE_IN_CONTEXT_ID"           );
-	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_FRONT_END_ID"         ,
-				    dest, "in_EXECUTE_IN_FRONT_END_ID"         );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID"        ,
-				    dest, "in_EXECUTE_IN_OOO_ENGINE_ID"        );
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_PACKET_ID"            ,
-				    dest, "in_EXECUTE_IN_PACKET_ID"            );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OPERATION"            ,
-				    dest, "in_EXECUTE_IN_OPERATION"            );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_TYPE"                 ,
-				    dest, "in_EXECUTE_IN_TYPE"                 );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_STORE_QUEUE_PTR_WRITE",
-				    dest, "in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE");
-	       if (_param->_have_port_load_queue_ptr)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_LOAD_QUEUE_PTR_WRITE" ,
-				    dest, "in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE" );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_HAS_IMMEDIAT"         ,
-				    dest, "in_EXECUTE_IN_HAS_IMMEDIAT"         );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_IMMEDIAT"             ,
-				    dest, "in_EXECUTE_IN_IMMEDIAT"             );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RA"              ,
-				    dest, "in_EXECUTE_IN_DATA_RA"              );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RB"              ,
-				    dest, "in_EXECUTE_IN_DATA_RB"              );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RC"              ,
-				    dest, "in_EXECUTE_IN_DATA_RC"              );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RD"             ,
-				    dest, "in_EXECUTE_IN_WRITE_RD"             );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"           ,
-				    dest, "in_EXECUTE_IN_NUM_REG_RD"           );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RE"             ,
-				    dest, "in_EXECUTE_IN_WRITE_RE"             );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"           ,
-				    dest, "in_EXECUTE_IN_NUM_REG_RE"           );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_VAL"                  ,
+// 				    dest, "in_EXECUTE_IN_VAL"                  );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_IN_"+toString(i)+"_ACK"                  ,
+// 				    dest,"out_EXECUTE_IN_ACK"                  );
+// 	       if (_param->_have_port_context_id)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"           ,
+// 				    dest, "in_EXECUTE_IN_CONTEXT_ID"           );
+// 	       if (_param->_have_port_front_end_id)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_FRONT_END_ID"         ,
+// 				    dest, "in_EXECUTE_IN_FRONT_END_ID"         );
+// 	       if (_param->_have_port_ooo_engine_id)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID"        ,
+// 				    dest, "in_EXECUTE_IN_OOO_ENGINE_ID"        );
+// 	       if (_param->_have_port_rob_ptr  )
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_PACKET_ID"            ,
+// 				    dest, "in_EXECUTE_IN_PACKET_ID"            );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OPERATION"            ,
+// 				    dest, "in_EXECUTE_IN_OPERATION"            );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_TYPE"                 ,
+// 				    dest, "in_EXECUTE_IN_TYPE"                 );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_STORE_QUEUE_PTR_WRITE",
+// 				    dest, "in_EXECUTE_IN_STORE_QUEUE_PTR_WRITE");
+// 	       if (_param->_have_port_load_queue_ptr)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_LOAD_QUEUE_PTR_WRITE" ,
+// 				    dest, "in_EXECUTE_IN_LOAD_QUEUE_PTR_WRITE" );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_HAS_IMMEDIAT"         ,
+// 				    dest, "in_EXECUTE_IN_HAS_IMMEDIAT"         );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_IMMEDIAT"             ,
+// 				    dest, "in_EXECUTE_IN_IMMEDIAT"             );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RA"              ,
+// 				    dest, "in_EXECUTE_IN_DATA_RA"              );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RB"              ,
+// 				    dest, "in_EXECUTE_IN_DATA_RB"              );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RC"              ,
+// 				    dest, "in_EXECUTE_IN_DATA_RC"              );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RD"             ,
+// 				    dest, "in_EXECUTE_IN_WRITE_RD"             );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"           ,
+// 				    dest, "in_EXECUTE_IN_NUM_REG_RD"           );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RE"             ,
+// 				    dest, "in_EXECUTE_IN_WRITE_RE"             );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"           ,
+// 				    dest, "in_EXECUTE_IN_NUM_REG_RE"           );
  	     }
 	   else
@@ -1391,47 +1502,47 @@
 #endif
 	       
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_VAL"                  ,
-				    dest, "in_MEMORY_IN_VAL"                  );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_IN_"+toString(i)+"_ACK"                  ,
-				    dest,"out_MEMORY_IN_ACK"                  );
-	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"           ,
-				    dest, "in_MEMORY_IN_CONTEXT_ID"           );
-	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_FRONT_END_ID"         ,
-				    dest, "in_MEMORY_IN_FRONT_END_ID"         );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID"        ,
-				    dest, "in_MEMORY_IN_OOO_ENGINE_ID"        );
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_PACKET_ID"            ,
-				    dest, "in_MEMORY_IN_PACKET_ID"            );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OPERATION"            ,
-				    dest, "in_MEMORY_IN_OPERATION"            );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_TYPE"                 ,
-				    dest, "in_MEMORY_IN_TYPE"                 );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_STORE_QUEUE_PTR_WRITE",
-				    dest, "in_MEMORY_IN_STORE_QUEUE_PTR_WRITE");
-	       if (_param->_have_port_load_queue_ptr)
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_LOAD_QUEUE_PTR_WRITE" ,
-				    dest, "in_MEMORY_IN_LOAD_QUEUE_PTR_WRITE" );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_HAS_IMMEDIAT"         ,
-				    dest, "in_MEMORY_IN_HAS_IMMEDIAT"         );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_IMMEDIAT"             ,
-				    dest, "in_MEMORY_IN_IMMEDIAT"             );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RA"              ,
-				    dest, "in_MEMORY_IN_DATA_RA"              );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RB"              ,
-				    dest, "in_MEMORY_IN_DATA_RB"              );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RC"              ,
-				    dest, "in_MEMORY_IN_DATA_RC"              );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RD"             ,
-				    dest, "in_MEMORY_IN_WRITE_RD"             );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"           ,
-				    dest, "in_MEMORY_IN_NUM_REG_RD"           );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RE"             ,
-				    dest, "in_MEMORY_IN_WRITE_RE"             );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"           ,
-				    dest, "in_MEMORY_IN_NUM_REG_RE"           );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_VAL"                  ,
+// 				    dest, "in_MEMORY_IN_VAL"                  );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_IN_"+toString(i)+"_ACK"                  ,
+// 				    dest,"out_MEMORY_IN_ACK"                  );
+// 	       if (_param->_have_port_context_id)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"           ,
+// 				    dest, "in_MEMORY_IN_CONTEXT_ID"           );
+// 	       if (_param->_have_port_front_end_id)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_FRONT_END_ID"         ,
+// 				    dest, "in_MEMORY_IN_FRONT_END_ID"         );
+// 	       if (_param->_have_port_ooo_engine_id)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID"        ,
+// 				    dest, "in_MEMORY_IN_OOO_ENGINE_ID"        );
+// 	       if (_param->_have_port_rob_ptr  )
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_PACKET_ID"            ,
+// 				    dest, "in_MEMORY_IN_PACKET_ID"            );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_OPERATION"            ,
+// 				    dest, "in_MEMORY_IN_OPERATION"            );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_TYPE"                 ,
+// 				    dest, "in_MEMORY_IN_TYPE"                 );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_STORE_QUEUE_PTR_WRITE",
+// 				    dest, "in_MEMORY_IN_STORE_QUEUE_PTR_WRITE");
+// 	       if (_param->_have_port_load_queue_ptr)
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_LOAD_QUEUE_PTR_WRITE" ,
+// 				    dest, "in_MEMORY_IN_LOAD_QUEUE_PTR_WRITE" );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_HAS_IMMEDIAT"         ,
+// 				    dest, "in_MEMORY_IN_HAS_IMMEDIAT"         );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_IMMEDIAT"             ,
+// 				    dest, "in_MEMORY_IN_IMMEDIAT"             );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RA"              ,
+// 				    dest, "in_MEMORY_IN_DATA_RA"              );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RB"              ,
+// 				    dest, "in_MEMORY_IN_DATA_RB"              );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_DATA_RC"              ,
+// 				    dest, "in_MEMORY_IN_DATA_RC"              );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RD"             ,
+// 				    dest, "in_MEMORY_IN_WRITE_RD"             );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"           ,
+// 				    dest, "in_MEMORY_IN_NUM_REG_RD"           );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_WRITE_RE"             ,
+// 				    dest, "in_MEMORY_IN_WRITE_RE"             );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"           ,
+// 				    dest, "in_MEMORY_IN_NUM_REG_RE"           );
  	     }
 	 }
@@ -1443,5 +1554,5 @@
      {
        src = _name+"_execution_unit_to_write_unit";
-       std::cout << "Instance : " << src << std::endl;
+       log_printf(INFO,Core,FUNCTION,_("Instance : %s"),src.c_str());
 
        {
@@ -1468,42 +1579,42 @@
 					  dest,"execute_out");
 #endif
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_VAL"          ,
-				    dest,"out_EXECUTE_OUT_VAL"          );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_ACK"          ,
-				    dest, "in_EXECUTE_OUT_ACK"          );
-	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_CONTEXT_ID"   ,
-				    dest,"out_EXECUTE_OUT_CONTEXT_ID"   );
-	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_FRONT_END_ID" ,
-				    dest,"out_EXECUTE_OUT_FRONT_END_ID" );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OOO_ENGINE_ID",
-				    dest,"out_EXECUTE_OUT_OOO_ENGINE_ID");
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_PACKET_ID"    ,
-				    dest,"out_EXECUTE_OUT_PACKET_ID"    );
-// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OPERATION"    ,
-// 				    dest,"out_EXECUTE_OUT_OPERATION"    );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_TYPE"         ,
-				    dest,"out_EXECUTE_OUT_TYPE"         );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RD"     ,
-				    dest,"out_EXECUTE_OUT_WRITE_RD"     );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RD"   ,
-				    dest,"out_EXECUTE_OUT_NUM_REG_RD"   );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RD"      ,
-				    dest,"out_EXECUTE_OUT_DATA_RD"      );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RE"     ,
-				    dest,"out_EXECUTE_OUT_WRITE_RE"     );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RE"   ,
-				    dest,"out_EXECUTE_OUT_NUM_REG_RE"   );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RE"      ,
-				    dest,"out_EXECUTE_OUT_DATA_RE"      );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_EXCEPTION"    ,
-				    dest,"out_EXECUTE_OUT_EXCEPTION"    );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NO_SEQUENCE"  ,
-				    dest,"out_EXECUTE_OUT_NO_SEQUENCE"  );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_ADDRESS"      ,
-				    dest,"out_EXECUTE_OUT_ADDRESS"      );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_VAL"          ,
+// 				    dest,"out_EXECUTE_OUT_VAL"          );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_ACK"          ,
+// 				    dest, "in_EXECUTE_OUT_ACK"          );
+// 	       if (_param->_have_port_context_id)
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_CONTEXT_ID"   ,
+// 				    dest,"out_EXECUTE_OUT_CONTEXT_ID"   );
+// 	       if (_param->_have_port_front_end_id)
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_FRONT_END_ID" ,
+// 				    dest,"out_EXECUTE_OUT_FRONT_END_ID" );
+// 	       if (_param->_have_port_ooo_engine_id)
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OOO_ENGINE_ID",
+// 				    dest,"out_EXECUTE_OUT_OOO_ENGINE_ID");
+// 	       if (_param->_have_port_rob_ptr  )
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_PACKET_ID"    ,
+// 				    dest,"out_EXECUTE_OUT_PACKET_ID"    );
+// // 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OPERATION"    ,
+// // 				    dest,"out_EXECUTE_OUT_OPERATION"    );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_TYPE"         ,
+// 				    dest,"out_EXECUTE_OUT_TYPE"         );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RD"     ,
+// 				    dest,"out_EXECUTE_OUT_WRITE_RD"     );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RD"   ,
+// 				    dest,"out_EXECUTE_OUT_NUM_REG_RD"   );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RD"      ,
+// 				    dest,"out_EXECUTE_OUT_DATA_RD"      );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RE"     ,
+// 				    dest,"out_EXECUTE_OUT_WRITE_RE"     );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RE"   ,
+// 				    dest,"out_EXECUTE_OUT_NUM_REG_RE"   );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RE"      ,
+// 				    dest,"out_EXECUTE_OUT_DATA_RE"      );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_EXCEPTION"    ,
+// 				    dest,"out_EXECUTE_OUT_EXCEPTION"    );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NO_SEQUENCE"  ,
+// 				    dest,"out_EXECUTE_OUT_NO_SEQUENCE"  );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_ADDRESS"      ,
+// 				    dest,"out_EXECUTE_OUT_ADDRESS"      );
 	     }
 	   else
@@ -1515,42 +1626,42 @@
 					  dest,"memory_out");
 #endif
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_VAL"          ,
-				    dest,"out_MEMORY_OUT_VAL"          );
-	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_ACK"          ,
-				    dest, "in_MEMORY_OUT_ACK"          );
-	       if (_param->_have_port_context_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_CONTEXT_ID"   ,
-				    dest,"out_MEMORY_OUT_CONTEXT_ID"   );
-	       if (_param->_have_port_front_end_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_FRONT_END_ID" ,
-				    dest,"out_MEMORY_OUT_FRONT_END_ID" );
-	       if (_param->_have_port_ooo_engine_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OOO_ENGINE_ID",
-				    dest,"out_MEMORY_OUT_OOO_ENGINE_ID");
-	       if (_param->_have_port_packet_id)
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_PACKET_ID"    ,
-				    dest,"out_MEMORY_OUT_PACKET_ID"    );
-// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OPERATION"    ,
-// 				    dest,"out_MEMORY_OUT_OPERATION"    );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_TYPE"         ,
-				    dest,"out_MEMORY_OUT_TYPE"         );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RD"     ,
-				    dest,"out_MEMORY_OUT_WRITE_RD"     );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RD"   ,
-				    dest,"out_MEMORY_OUT_NUM_REG_RD"   );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RD"      ,
-				    dest,"out_MEMORY_OUT_DATA_RD"      );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RE"     ,
-				    dest,"out_MEMORY_OUT_WRITE_RE"     );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RE"   ,
-				    dest,"out_MEMORY_OUT_NUM_REG_RE"   );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RE"      ,
-				    dest,"out_MEMORY_OUT_DATA_RE"      );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_EXCEPTION"    ,
-				    dest,"out_MEMORY_OUT_EXCEPTION"    );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NO_SEQUENCE"  ,
-				    dest,"out_MEMORY_OUT_NO_SEQUENCE"  );
-	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_ADDRESS"      ,
-				    dest,"out_MEMORY_OUT_ADDRESS"      );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_VAL"          ,
+// 				    dest,"out_MEMORY_OUT_VAL"          );
+// 	       PORT_MAP(_component ,src ,"out_EXECUTE_UNIT_OUT_"+toString(i)+"_ACK"          ,
+// 				    dest, "in_MEMORY_OUT_ACK"          );
+// 	       if (_param->_have_port_context_id)
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_CONTEXT_ID"   ,
+// 				    dest,"out_MEMORY_OUT_CONTEXT_ID"   );
+// 	       if (_param->_have_port_front_end_id)
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_FRONT_END_ID" ,
+// 				    dest,"out_MEMORY_OUT_FRONT_END_ID" );
+// 	       if (_param->_have_port_ooo_engine_id)
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OOO_ENGINE_ID",
+// 				    dest,"out_MEMORY_OUT_OOO_ENGINE_ID");
+// 	       if (_param->_have_port_rob_ptr  )
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_PACKET_ID"    ,
+// 				    dest,"out_MEMORY_OUT_PACKET_ID"    );
+// // 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_OPERATION"    ,
+// // 				    dest,"out_MEMORY_OUT_OPERATION"    );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_TYPE"         ,
+// 				    dest,"out_MEMORY_OUT_TYPE"         );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RD"     ,
+// 				    dest,"out_MEMORY_OUT_WRITE_RD"     );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RD"   ,
+// 				    dest,"out_MEMORY_OUT_NUM_REG_RD"   );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RD"      ,
+// 				    dest,"out_MEMORY_OUT_DATA_RD"      );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_WRITE_RE"     ,
+// 				    dest,"out_MEMORY_OUT_WRITE_RE"     );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NUM_REG_RE"   ,
+// 				    dest,"out_MEMORY_OUT_NUM_REG_RE"   );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_DATA_RE"      ,
+// 				    dest,"out_MEMORY_OUT_DATA_RE"      );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_EXCEPTION"    ,
+// 				    dest,"out_MEMORY_OUT_EXCEPTION"    );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_NO_SEQUENCE"  ,
+// 				    dest,"out_MEMORY_OUT_NO_SEQUENCE"  );
+// 	       PORT_MAP(_component ,src , "in_EXECUTE_UNIT_OUT_"+toString(i)+"_ADDRESS"      ,
+// 				    dest,"out_MEMORY_OUT_ADDRESS"      );
 	     }
 	 }
@@ -1566,60 +1677,52 @@
 #endif
 	   
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_VAL"          ,
-				dest, "in_WRITE_UNIT_IN_VAL"          );
-	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_"+toString(i)+"_ACK"          ,
-				dest,"out_WRITE_UNIT_IN_ACK"          );
-	   if (_param->_have_port_context_id)
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"   ,
-				dest, "in_WRITE_UNIT_IN_CONTEXT_ID"   );
-	   if (_param->_have_port_front_end_id)
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_FRONT_END_ID" ,
-				dest, "in_WRITE_UNIT_IN_FRONT_END_ID" );
-	   if (_param->_have_port_ooo_engine_id)
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID",
-				dest, "in_WRITE_UNIT_IN_OOO_ENGINE_ID");
-	   if (_param->_have_port_packet_id)
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_PACKET_ID"    ,
-				dest, "in_WRITE_UNIT_IN_PACKET_ID"    );
-// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_OPERATION"    ,
-// 				dest, "in_WRITE_UNIT_IN_OPERATION"    );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_TYPE"         ,
-				dest, "in_WRITE_UNIT_IN_TYPE"         );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RD"     ,
-				dest, "in_WRITE_UNIT_IN_WRITE_RD"     );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"   ,
-				dest, "in_WRITE_UNIT_IN_NUM_REG_RD"   );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RD"      ,
-				dest, "in_WRITE_UNIT_IN_DATA_RD"      );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RE"     ,
-				dest, "in_WRITE_UNIT_IN_WRITE_RE"     );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"   ,
-				dest, "in_WRITE_UNIT_IN_NUM_REG_RE"   );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RE"      ,
-				dest, "in_WRITE_UNIT_IN_DATA_RE"      );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_EXCEPTION"    ,
-				dest, "in_WRITE_UNIT_IN_EXCEPTION"    );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_NO_SEQUENCE"  ,
-				dest, "in_WRITE_UNIT_IN_NO_SEQUENCE"  );
-	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_ADDRESS"      ,
-				dest, "in_WRITE_UNIT_IN_ADDRESS"      );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_VAL"          ,
+// 				dest, "in_WRITE_UNIT_IN_VAL"          );
+// 	   PORT_MAP(_component ,src , "in_WRITE_UNIT_IN_"+toString(i)+"_ACK"          ,
+// 				dest,"out_WRITE_UNIT_IN_ACK"          );
+// 	   if (_param->_have_port_context_id)
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_CONTEXT_ID"   ,
+// 				dest, "in_WRITE_UNIT_IN_CONTEXT_ID"   );
+// 	   if (_param->_have_port_front_end_id)
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_FRONT_END_ID" ,
+// 				dest, "in_WRITE_UNIT_IN_FRONT_END_ID" );
+// 	   if (_param->_have_port_ooo_engine_id)
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_OOO_ENGINE_ID",
+// 				dest, "in_WRITE_UNIT_IN_OOO_ENGINE_ID");
+// 	   if (_param->_have_port_rob_ptr  )
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_PACKET_ID"    ,
+// 				dest, "in_WRITE_UNIT_IN_PACKET_ID"    );
+// // 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_OPERATION"    ,
+// // 				dest, "in_WRITE_UNIT_IN_OPERATION"    );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_TYPE"         ,
+// 				dest, "in_WRITE_UNIT_IN_TYPE"         );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RD"     ,
+// 				dest, "in_WRITE_UNIT_IN_WRITE_RD"     );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RD"   ,
+// 				dest, "in_WRITE_UNIT_IN_NUM_REG_RD"   );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RD"      ,
+// 				dest, "in_WRITE_UNIT_IN_DATA_RD"      );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_WRITE_RE"     ,
+// 				dest, "in_WRITE_UNIT_IN_WRITE_RE"     );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_NUM_REG_RE"   ,
+// 				dest, "in_WRITE_UNIT_IN_NUM_REG_RE"   );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_DATA_RE"      ,
+// 				dest, "in_WRITE_UNIT_IN_DATA_RE"      );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_EXCEPTION"    ,
+// 				dest, "in_WRITE_UNIT_IN_EXCEPTION"    );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_NO_SEQUENCE"  ,
+// 				dest, "in_WRITE_UNIT_IN_NO_SEQUENCE"  );
+// 	   PORT_MAP(_component ,src ,"out_WRITE_UNIT_IN_"+toString(i)+"_ADDRESS"      ,
+// 				dest, "in_WRITE_UNIT_IN_ADDRESS"      );
 	 }
      }
      
+#if DEBUG_Execute_loop == true
      _component->test_map();
-     for (uint32_t i=0; i<_param->_nb_read_unit; i++)
-       _component_read_unit [i]->_component->test_map();
-     for (uint32_t i=0; i<_param->_nb_functionnal_unit; i++)
-       _component_functionnal_unit [i]->_component->test_map();
-     for (uint32_t i=0; i<_param->_nb_load_store_unit; i++)
-       _component_load_store_unit [i]->_component->test_map();
-     for (uint32_t i=0; i<_param->_nb_write_unit; i++)
-       _component_write_unit [i]->_component->test_map();
-     _component_read_unit_to_execution_unit->_component->test_map();
-     _component_execution_unit_to_write_unit->_component->test_map();
-     _component_register_unit->_component->test_map();
-
-#ifdef POSITION
-    _component->generate_file();
+#endif
+
+#ifdef POSITION
+     if (usage_is_set(_usage,USE_POSITION))
+       _component->generate_file();
 #endif
 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_deallocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_deallocation.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_deallocation.cpp	(revision 88)
@@ -1,2 +1,3 @@
+
 /*
  * $Id$
@@ -7,5 +8,5 @@
 
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/include/Execute_loop.h"
-
+#include "Behavioural/include/Allocation.h"
 namespace morpheo                    {
 namespace behavioural {
@@ -21,105 +22,90 @@
     log_printf(FUNC,Execute_loop,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
 	delete     in_CLOCK ;
 	delete     in_NRESET;
 
-	// ~~~~~[ Interface "execute_loop_in" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	delete []  in_EXECUTE_LOOP_IN_VAL                  ;
-	delete [] out_EXECUTE_LOOP_IN_ACK                  ;
-	if (_param->_have_port_context_id)
-	delete []  in_EXECUTE_LOOP_IN_CONTEXT_ID           ;
-	if (_param->_have_port_front_end_id)
-	delete []  in_EXECUTE_LOOP_IN_FRONT_END_ID         ;
-	if (_param->_have_port_ooo_engine_id)
-	delete []  in_EXECUTE_LOOP_IN_OOO_ENGINE_ID        ;
-	if (_param->_have_port_packet_id)
-	delete []  in_EXECUTE_LOOP_IN_PACKET_ID            ;
-	delete []  in_EXECUTE_LOOP_IN_OPERATION            ;
-	delete []  in_EXECUTE_LOOP_IN_TYPE                 ;
-	delete []  in_EXECUTE_LOOP_IN_STORE_QUEUE_PTR_WRITE;
-	if (_param->_have_port_load_queue_ptr)
-	delete []  in_EXECUTE_LOOP_IN_LOAD_QUEUE_PTR_WRITE ;
-	delete []  in_EXECUTE_LOOP_IN_HAS_IMMEDIAT         ;
-	delete []  in_EXECUTE_LOOP_IN_IMMEDIAT             ;
-	delete []  in_EXECUTE_LOOP_IN_READ_RA              ;
-	delete []  in_EXECUTE_LOOP_IN_NUM_REG_RA           ;
-	delete []  in_EXECUTE_LOOP_IN_READ_RB              ;
-	delete []  in_EXECUTE_LOOP_IN_NUM_REG_RB           ;
-	delete []  in_EXECUTE_LOOP_IN_READ_RC              ;
-	delete []  in_EXECUTE_LOOP_IN_NUM_REG_RC           ;
-	delete []  in_EXECUTE_LOOP_IN_WRITE_RD             ;
-	delete []  in_EXECUTE_LOOP_IN_NUM_REG_RD           ;
-	delete []  in_EXECUTE_LOOP_IN_WRITE_RE             ;
-	delete []  in_EXECUTE_LOOP_IN_NUM_REG_RE           ;
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_VAL                  ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_IN_ACK                  ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_CONTEXT_ID           ,_param->_nb_read_unit,_param->_size_context_id);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_FRONT_END_ID         ,_param->_nb_read_unit,_param->_size_front_end_id);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_OOO_ENGINE_ID        ,_param->_nb_read_unit,_param->_size_ooo_engine_id);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_PACKET_ID            ,_param->_nb_read_unit,_param->_size_rob_ptr  );
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_OPERATION            ,_param->_nb_read_unit,_param->_size_operation);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_TYPE                 ,_param->_nb_read_unit,_param->_size_type);         
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_STORE_QUEUE_PTR_WRITE,_param->_nb_read_unit,_param->_size_store_queue_ptr);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_LOAD_QUEUE_PTR_WRITE ,_param->_nb_read_unit,_param->_size_load_queue_ptr);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_HAS_IMMEDIAT         ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_IMMEDIAT             ,_param->_nb_read_unit,_param->_size_general_data);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_READ_RA              ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_NUM_REG_RA           ,_param->_nb_read_unit,_param->_size_general_register);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_READ_RB              ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_NUM_REG_RB           ,_param->_nb_read_unit,_param->_size_general_register);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_READ_RC              ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_NUM_REG_RC           ,_param->_nb_read_unit,_param->_size_special_register);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_WRITE_RD             ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_NUM_REG_RD           ,_param->_nb_read_unit,_param->_size_general_register);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_WRITE_RE             ,_param->_nb_read_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_IN_NUM_REG_RE           ,_param->_nb_read_unit,_param->_size_special_register);
+        
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_VAL          ,_param->_nb_write_unit,1);
+        DELETE1_SIGNAL( in_EXECUTE_LOOP_OUT_ACK          ,_param->_nb_write_unit,1);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_CONTEXT_ID   ,_param->_nb_write_unit,_param->_size_context_id);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_FRONT_END_ID ,_param->_nb_write_unit,_param->_size_front_end_id);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_OOO_ENGINE_ID,_param->_nb_write_unit,_param->_size_ooo_engine_id);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_PACKET_ID    ,_param->_nb_write_unit,_param->_size_rob_ptr  );
+//      DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_OPERATION    ,_param->_nb_write_unit,_param->_size_operation);
+//      DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_TYPE         ,_param->_nb_write_unit,_param->_size_type);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_FLAGS        ,_param->_nb_write_unit,_param->_size_special_data);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_EXCEPTION    ,_param->_nb_write_unit,_param->_size_exception);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_NO_SEQUENCE  ,_param->_nb_write_unit,1);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_ADDRESS      ,_param->_nb_write_unit,_param->_size_general_data);
+        DELETE1_SIGNAL(out_EXECUTE_LOOP_OUT_DATA         ,_param->_nb_write_unit,_param->_size_general_data);
+        
+        DELETE2_SIGNAL(out_DCACHE_REQ_VAL       , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],1                                  );
+        DELETE2_SIGNAL( in_DCACHE_REQ_ACK       , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],1                                  );
+        DELETE2_SIGNAL(out_DCACHE_REQ_CONTEXT_ID, _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_max_size_dcache_context_id);
+        DELETE2_SIGNAL(out_DCACHE_REQ_PACKET_ID , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_max_size_dcache_packet_id );
+        DELETE2_SIGNAL(out_DCACHE_REQ_ADDRESS   , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_size_general_data         );
+        DELETE2_SIGNAL(out_DCACHE_REQ_TYPE      , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_size_dcache_type          );
+        DELETE2_SIGNAL(out_DCACHE_REQ_WDATA     , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_size_general_data         );
+        													                                     
+        DELETE2_SIGNAL( in_DCACHE_RSP_VAL       , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],1                                  );
+        DELETE2_SIGNAL(out_DCACHE_RSP_ACK       , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],1                                  );
+        DELETE2_SIGNAL( in_DCACHE_RSP_CONTEXT_ID, _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_max_size_dcache_context_id);
+        DELETE2_SIGNAL( in_DCACHE_RSP_PACKET_ID , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_max_size_dcache_packet_id );
+        DELETE2_SIGNAL( in_DCACHE_RSP_RDATA     , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_size_general_data         );
+        DELETE2_SIGNAL( in_DCACHE_RSP_ERROR     , _param->_nb_load_store_unit, _param->_nb_cache_port[it1],_param->_size_dcache_error         );
+        
+        DELETE2_SIGNAL( in_INSERT_ROB_VAL       ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1],1                             );
+        DELETE2_SIGNAL(out_INSERT_ROB_ACK       ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1],1                             );
+        DELETE2_SIGNAL( in_INSERT_ROB_RD_USE    ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1],1                             );
+        DELETE2_SIGNAL( in_INSERT_ROB_RD_NUM_REG,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1],_param->_size_general_register);
+        DELETE2_SIGNAL( in_INSERT_ROB_RE_USE    ,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1],1                             );
+        DELETE2_SIGNAL( in_INSERT_ROB_RE_NUM_REG,_param->_nb_ooo_engine,_param->_nb_inst_insert_rob[it1],_param->_size_special_register);
+        
+//         DELETE2_SIGNAL( in_RETIRE_ROB_VAL           ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],1                             );
+//         DELETE2_SIGNAL(out_RETIRE_ROB_ACK           ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],1                             );
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RD_OLD_USE    ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],1                             );
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RD_OLD_NUM_REG,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],_param->_size_general_register);
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RD_NEW_USE    ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],1                             );
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RD_NEW_NUM_REG,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],_param->_size_general_register);
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RE_OLD_USE    ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],1                             );
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RE_OLD_NUM_REG,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],_param->_size_special_register);
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RE_NEW_USE    ,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],1                             );
+//         DELETE2_SIGNAL( in_RETIRE_ROB_RE_NEW_NUM_REG,_param->_nb_ooo_engine,_param->_nb_inst_retire_rob[it1],_param->_size_special_register);
+      }
 
-	// ~~~~~[ Interface "execute_loop_out" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	delete [] out_EXECUTE_LOOP_OUT_VAL                 ;
-	delete []  in_EXECUTE_LOOP_OUT_ACK                 ;
-	if (_param->_have_port_context_id)
-	delete [] out_EXECUTE_LOOP_OUT_CONTEXT_ID          ;
-	if (_param->_have_port_front_end_id)
-	delete [] out_EXECUTE_LOOP_OUT_FRONT_END_ID        ;
-	if (_param->_have_port_ooo_engine_id)
-	delete [] out_EXECUTE_LOOP_OUT_OOO_ENGINE_ID       ;
-	if (_param->_have_port_packet_id)
-	delete [] out_EXECUTE_LOOP_OUT_PACKET_ID           ;
-      //delete [] out_EXECUTE_LOOP_OUT_OPERATION           ;
-      //delete [] out_EXECUTE_LOOP_OUT_TYPE                ;
-	delete [] out_EXECUTE_LOOP_OUT_FLAGS               ;
-	delete [] out_EXECUTE_LOOP_OUT_EXCEPTION           ;
-	delete [] out_EXECUTE_LOOP_OUT_NO_SEQUENCE         ;
-	delete [] out_EXECUTE_LOOP_OUT_ADDRESS             ;
-
-	// ~~~~~[ Interface "dcache_req" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	delete [] out_DCACHE_REQ_VAL                       ;
-	delete []  in_DCACHE_REQ_ACK                       ;
-	if (_param->_have_port_dcache_context_id)
-	delete [] out_DCACHE_REQ_CONTEXT_ID                ;
-	delete [] out_DCACHE_REQ_PACKET_ID                 ;
-	delete [] out_DCACHE_REQ_ADDRESS                   ;
-	delete [] out_DCACHE_REQ_TYPE                      ;
-	delete [] out_DCACHE_REQ_WDATA                     ;
-
-	// ~~~~~[ Interface "dcache_rsp" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	delete []  in_DCACHE_RSP_VAL                       ;
-	delete [] out_DCACHE_RSP_ACK                       ;
-	if (_param->_have_port_dcache_context_id)
-	delete []  in_DCACHE_RSP_CONTEXT_ID                ;
-	delete []  in_DCACHE_RSP_PACKET_ID                 ;
-	delete []  in_DCACHE_RSP_RDATA                     ;
-	delete []  in_DCACHE_RSP_ERROR                     ;
-    
-	// ~~~~~[ Interface "insert_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	delete []  in_INSERT_ROB_VAL                       ;
-	delete [] out_INSERT_ROB_ACK                       ;
-	delete []  in_INSERT_ROB_RD_USE                    ;
-	delete []  in_INSERT_ROB_RD_NUM_REG                ;
-	delete []  in_INSERT_ROB_RE_USE                    ;
-	delete []  in_INSERT_ROB_RE_NUM_REG                ;
-
-	// ~~~~~[ Interface "retire_rob" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	delete []  in_RETIRE_ROB_VAL                       ;
-	delete [] out_RETIRE_ROB_ACK                       ;
-	delete []  in_RETIRE_ROB_RD_OLD_USE                ; 
-	delete []  in_RETIRE_ROB_RD_OLD_NUM_REG            ;
-	delete []  in_RETIRE_ROB_RD_NEW_USE                ;
-	delete []  in_RETIRE_ROB_RD_NEW_NUM_REG            ;
-	delete []  in_RETIRE_ROB_RE_OLD_USE                ; 
-	delete []  in_RETIRE_ROB_RE_OLD_NUM_REG            ;
-	delete []  in_RETIRE_ROB_RE_NEW_USE                ;
-	delete []  in_RETIRE_ROB_RE_NEW_NUM_REG            ;
-      }
-    
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
     delete    _component;
+    delete    _component_glue                        ;
     delete [] _component_read_unit                   ;
     delete [] _component_functionnal_unit            ;
     delete [] _component_load_store_unit             ;
     delete [] _component_write_unit                  ;
-    delete [] _component_read_unit_to_execution_unit ;
-    delete [] _component_execution_unit_to_write_unit;
-    delete [] _component_register_unit               ;
+    delete    _component_read_unit_to_execution_unit ;
+    delete    _component_execution_unit_to_write_unit;
+    delete    _component_register_unit               ;
     
     log_printf(FUNC,Execute_loop,FUNCTION,"End");
@@ -129,5 +115,4 @@
 }; // end namespace multi_execute_loop
 }; // end namespace core
-
 }; // end namespace behavioural
 }; // end namespace morpheo              
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_end_cycle.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_end_cycle.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_end_cycle.cpp	(revision 88)
@@ -23,5 +23,6 @@
 
 #ifdef STATISTICS
-    _stat->end_cycle();
+    if (usage_is_set(_usage,USE_STATISTICS))
+      _stat->end_cycle();
 #endif    
 
@@ -29,5 +30,6 @@
     // Evaluation before read the ouput signal
 //  sc_start(0);
-    _interfaces->testbench();
+    if (usage_is_set(_usage,USE_VHDL_TESTBENCH))
+      _interfaces->testbench();
 #endif
 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_statistics_declaration.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_statistics_declaration.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_statistics_declaration.cpp	(revision 88)
@@ -37,4 +37,5 @@
      _stat->add_stat(_component_execution_unit_to_write_unit->_stat);
      _stat->add_stat(_component_register_unit               ->_stat);
+     _stat->add_stat(_component_glue                        ->_stat);
 
     log_printf(FUNC,Execute_loop,FUNCTION,"End");
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp	(revision 88)
@@ -7,4 +7,5 @@
 
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/include/Parameters.h"
+#include "Common/include/Max.h"
 
 namespace morpheo {
@@ -29,21 +30,24 @@
 			  uint32_t              size_special_data                         ,
 			  
-			  uint32_t            * size_read_queue                           ,
-			  uint32_t            * size_reservation_station                  ,
-			  uint32_t            * nb_inst_retire                            ,
+			  uint32_t            * size_read_queue                           ,//[nb_read_unit]
+			  uint32_t            * size_reservation_station                  ,//[nb_read_unit]
+			  uint32_t            * nb_inst_retire                            ,//[nb_read_unit]
+
+			  uint32_t            * nb_inst_functionnal_unit                  ,//[nb_functionnal_unit]
+			  execute_timing_t  *** timing                                    ,//[nb_functionnal_unit][nb_type][nb_operation]
+			  morpheo::behavioural::custom::custom_information_t (*get_custom_information) (void),
 			  
-			  execute_timing_t  *** timing                                    ,
-			  morpheo::behavioural::custom::custom_information_t (*get_custom_information) (uint32_t),
-			  
-			  uint32_t            * size_store_queue                          ,
-			  uint32_t            * size_load_queue                           ,
-			  uint32_t            * size_speculative_access_queue             ,
-			  uint32_t            * nb_port_check                             ,
-			  Tspeculative_load_t * speculative_load                          ,
-			  uint32_t            * nb_bypass_memory                          ,
-
-			  uint32_t            * size_write_queue                          ,
-			  uint32_t            * size_execute_queue                        ,
-			  uint32_t            * nb_bypass_write                           ,
+			  uint32_t            * size_store_queue                          ,//[nb_load_store_unit]
+			  uint32_t            * size_load_queue                           ,//[nb_load_store_unit]
+			  uint32_t            * size_speculative_access_queue             ,//[nb_load_store_unit]
+			  uint32_t            * nb_port_check                             ,//[nb_load_store_unit]
+			  Tspeculative_load_t * speculative_load                          ,//[nb_load_store_unit]
+			  uint32_t            * nb_bypass_memory                          ,//[nb_load_store_unit]
+			  uint32_t            * nb_cache_port                             ,//[nb_load_store_unit]
+			  uint32_t            * nb_inst_memory                            ,//[nb_load_store_unit]
+
+			  uint32_t            * size_write_queue                          ,//[nb_write_unit]
+			  uint32_t            * size_execute_queue                        ,//[nb_write_unit]
+			  uint32_t            * nb_bypass_write                           ,//[nb_write_unit]
 			  
 			  uint32_t              nb_gpr_bank                               ,
@@ -53,60 +57,66 @@
 			  uint32_t              nb_spr_port_read_by_bank                  ,
 			  uint32_t              nb_spr_port_write_by_bank                 ,
-			  uint32_t            * nb_general_register                       ,
-			  uint32_t            * nb_special_register                       ,
-			  uint32_t            * nb_inst_insert_rob                        ,
-			  uint32_t            * nb_inst_retire_rob                        ,
+			  uint32_t            * nb_general_register                       ,//[nb_ooo_engine]
+			  uint32_t            * nb_special_register                       ,//[nb_ooo_engine]
+			  uint32_t            * nb_inst_insert_rob                        ,//[nb_ooo_engine]
+			  uint32_t            * nb_inst_retire_rob                        ,//[nb_ooo_engine]
 			  
 			  Tpriority_t           execution_unit_to_write_unit_priority     ,
-			  bool               ** execution_unit_to_write_unit_table_routing,
-			  bool               ** execution_unit_to_write_unit_table_thread ,
-			  
-			  Tpriority_t           read_unit_to_execution_unit_priority      ,
-			  bool               ** read_unit_to_execution_unit_table_routing ,
-			  bool               ** read_unit_to_execution_unit_table_thread      
-			  )
+                          bool              *** execution_unit_to_write_unit_table_routing,//[nb_execute_unit][nb_execute_unit_port][nb_write_unit]
+                          bool               ** execution_unit_to_write_unit_table_thread ,//[nb_write_unit][nb_thread]
+
+                          Tpriority_t           read_unit_to_execution_unit_priority      ,
+                          bool              *** read_unit_to_execution_unit_table_routing ,//[nb_read_unit][nb_execute_unit][nb_execute_unit_port]
+                          bool               ** read_unit_to_execution_unit_table_thread  ,//[nb_execute_unit][nb_thread]
+                          
+                          bool                * is_load_store_unit                        ,//[nb_execute_unit]
+                          uint32_t            * translate_num_execute_unit                ,//[nb_execute_unit]
+                          
+                          bool                  is_toplevel
+                          )
   {
     log_printf(FUNC,Execute_loop,FUNCTION,"Begin");
 
-    _nb_read_unit                          = nb_read_unit                         ;
-    _nb_functionnal_unit                   = nb_functionnal_unit                  ;
-    _nb_load_store_unit                    = nb_load_store_unit                   ;
-    _nb_write_unit                         = nb_write_unit                        ;
-    
-    _nb_context                            = nb_context                           ;
-    _nb_front_end                          = nb_front_end                         ;
-    _nb_ooo_engine                         = nb_ooo_engine                        ;
-    _nb_packet                             = nb_packet                            ;
-    _size_general_data                     = size_general_data                    ;
-    _size_special_data                     = size_special_data                    ;
-    
-    _size_read_queue                       = size_read_queue                      ;
-    _size_reservation_station              = size_reservation_station             ;
-    _nb_inst_retire                        = nb_inst_retire                       ;
-    
-    _timing                                = timing                               ;
-    _get_custom_information                = get_custom_information               ;
-    
-    _size_store_queue                      = size_store_queue                     ;
-    _size_load_queue                       = size_load_queue                      ;
-    _size_speculative_access_queue         = size_speculative_access_queue        ;
-    _nb_port_check                         = nb_port_check                        ;
-    _speculative_load                      = speculative_load                     ;
-    _nb_bypass_memory                      = nb_bypass_memory                     ;
-
-    _size_write_queue                      = size_write_queue                     ;
-    _size_execute_queue                    = size_execute_queue                   ;
-    _nb_bypass_write                       = nb_bypass_write                      ;
-    
-    _nb_gpr_bank                           = nb_gpr_bank                          ;
-    _nb_gpr_port_read_by_bank              = nb_gpr_port_read_by_bank             ;
-    _nb_gpr_port_write_by_bank             = nb_gpr_port_write_by_bank            ;
-    _nb_spr_bank                           = nb_spr_bank                          ;
-    _nb_spr_port_read_by_bank              = nb_spr_port_read_by_bank             ;
-    _nb_spr_port_write_by_bank             = nb_spr_port_write_by_bank            ;
-    _nb_general_register                   = nb_general_register                  ;
-    _nb_special_register                   = nb_special_register                  ;
-    _nb_inst_insert_rob                    = nb_inst_insert_rob                   ;
-    _nb_inst_retire_rob                    = nb_inst_retire_rob                   ;
+    _nb_read_unit                               = nb_read_unit                         ;
+    _nb_functionnal_unit                        = nb_functionnal_unit                  ;
+    _nb_load_store_unit                         = nb_load_store_unit                   ;
+    _nb_write_unit                              = nb_write_unit                        ;
+                                                
+    _nb_context                                 = nb_context                           ;
+    _nb_front_end                               = nb_front_end                         ;
+    _nb_ooo_engine                              = nb_ooo_engine                        ;
+    _nb_packet                                  = nb_packet                            ;
+                                                
+    _size_read_queue                            = size_read_queue                      ;
+    _size_reservation_station                   = size_reservation_station             ;
+    _nb_inst_retire                             = nb_inst_retire                       ;
+                                                
+    _nb_inst_functionnal_unit                   = nb_inst_functionnal_unit             ;
+    _timing                                     = timing                               ;
+    _get_custom_information                     = get_custom_information               ;
+                                                
+    _size_store_queue                           = size_store_queue                     ;
+    _size_load_queue                            = size_load_queue                      ;
+    _size_speculative_access_queue              = size_speculative_access_queue        ;
+    _nb_port_check                              = nb_port_check                        ;
+    _speculative_load                           = speculative_load                     ;
+    _nb_bypass_memory                           = nb_bypass_memory                     ;
+    _nb_cache_port                              = nb_cache_port                        ;
+    _nb_inst_memory                             = nb_inst_memory                       ;
+                                                
+    _size_write_queue                           = size_write_queue                     ;
+    _size_execute_queue                         = size_execute_queue                   ;
+    _nb_bypass_write                            = nb_bypass_write                      ;
+                                                
+    _nb_gpr_bank                                = nb_gpr_bank                          ;
+    _nb_gpr_port_read_by_bank                   = nb_gpr_port_read_by_bank             ;
+    _nb_gpr_port_write_by_bank                  = nb_gpr_port_write_by_bank            ;
+    _nb_spr_bank                                = nb_spr_bank                          ;
+    _nb_spr_port_read_by_bank                   = nb_spr_port_read_by_bank             ;
+    _nb_spr_port_write_by_bank                  = nb_spr_port_write_by_bank            ;
+    _nb_general_register                        = nb_general_register                  ;
+    _nb_special_register                        = nb_special_register                  ;
+    _nb_inst_insert_rob                         = nb_inst_insert_rob                   ;
+    _nb_inst_retire_rob                         = nb_inst_retire_rob                   ;
     
     _execution_unit_to_write_unit_priority      = execution_unit_to_write_unit_priority;
@@ -114,27 +124,18 @@
     _execution_unit_to_write_unit_table_thread  = execution_unit_to_write_unit_table_thread ;
     
-    _read_unit_to_execution_unit_priority       = read_unit_to_execution_unit_priority ;
+    _read_unit_to_execution_unit_priority       = read_unit_to_execution_unit_priority      ;
     _read_unit_to_execution_unit_table_routing  = read_unit_to_execution_unit_table_routing ;
     _read_unit_to_execution_unit_table_thread   = read_unit_to_execution_unit_table_thread  ;
 
-    _nb_execute_unit                       = _nb_functionnal_unit + _nb_load_store_unit;
-
-    _size_context_id         = log2(nb_context            );
-    _size_front_end_id       = log2(nb_front_end          );
-    _size_ooo_engine_id      = log2(nb_ooo_engine         );
-    _size_packet_id          = log2(nb_packet             );
-
-    _have_port_context_id    = _size_context_id    >= 1;
-    _have_port_front_end_id  = _size_front_end_id  >= 1;
-    _have_port_ooo_engine_id = _size_ooo_engine_id >= 1;
-    _have_port_packet_id     = _size_packet_id     >= 1;
-
-    _is_load_store_unit         = new bool [_nb_execute_unit];
-    _translate_num_execute_unit = new uint32_t [_nb_execute_unit];
-
+    _is_load_store_unit                         = is_load_store_unit        ;
+    _translate_num_execute_unit                 = translate_num_execute_unit;
+
+    _nb_execute_unit                            = _nb_functionnal_unit + _nb_load_store_unit;
+
+    _nb_execute_unit_port                       = new uint32_t [_nb_execute_unit];
+    
     _read_unit_to_execution_unit_table_execute_type = new bool * [_nb_execute_unit];
     for (uint32_t i=0; i<_nb_execute_unit; i++)
       {
-	_is_load_store_unit [i] = false;
 	_read_unit_to_execution_unit_table_execute_type [i] = new bool [_nb_type];
 	for (uint32_t j=0; j<_nb_type; j++)
@@ -144,19 +145,30 @@
     // Fill execute_type
     for (uint32_t i=0; i<_nb_execute_unit; i++)
-      for (uint32_t j=0; j<_nb_type; j++)
-	for (uint32_t k=0; k<_nb_operation; k++)
-	  // Test if operation is implemnted
-	  if (timing[i][j][k]._latence > 0)
-	    {
-	      _read_unit_to_execution_unit_table_execute_type [i][j] = true;
-	      _is_load_store_unit [i] = (j == TYPE_MEMORY);
-	      break;
-	    }
+      // is load store 
+      if (is_load_store_unit [i])
+        _read_unit_to_execution_unit_table_execute_type [i][TYPE_MEMORY] = true;
+      else
+        for (uint32_t j=0; j<_nb_type; j++)
+          if (is_type_valid (j))
+            for (uint32_t k=0; k<_nb_operation; k++)
+              {
+                uint32_t x = translate_num_execute_unit [i];
+                if (timing[x][j][k]._latence > 0)
+                  {
+                    log_printf(TRACE,Execute_loop,FUNCTION,"Execute unit '%d' (functional unit '%d') can execute type '%s'.",i,x,toString_type(j).c_str());
+                    _read_unit_to_execution_unit_table_execute_type [i][j] = true;
+                    break; // find an operation
+                  }
+              }
 
     for (uint32_t i=0; i<_nb_execute_unit; i++)
-      if (_is_load_store_unit [i])
-	log_printf(TRACE,Execute_loop,FUNCTION,"Execute unit '%d' is a Load Store  unit",i);
-      else
-	log_printf(TRACE,Execute_loop,FUNCTION,"Execute unit '%d' is a Functionnal unit",i);
+      {
+        uint32_t x = translate_num_execute_unit [i];
+        
+        if (_is_load_store_unit [i])
+          _nb_execute_unit_port [i] = _nb_inst_memory [x];
+        else
+          _nb_execute_unit_port [i] = _nb_inst_functionnal_unit [x];
+      }
 
     _nb_gpr_read  = 2*_nb_read_unit;
@@ -165,24 +177,9 @@
     _nb_spr_write = 1*_nb_write_unit;
 
-    _max_nb_general_register = 0;
-    _max_nb_special_register = 0;
-    for (uint32_t i=0; i<nb_ooo_engine; i++)
-      {
-	if (_nb_general_register[i] > _max_nb_general_register) _max_nb_general_register = _nb_general_register[i];
-	if (_nb_special_register[i] > _max_nb_special_register) _max_nb_special_register = _nb_special_register[i];
-      }
-
-    _max_size_store_queue    = 0;
-    _max_size_load_queue     = 0;
-    for (uint32_t i=0; i<nb_load_store_unit; i++)
-      {
-	if (_size_store_queue[i] > _max_size_store_queue) _max_size_store_queue = _size_store_queue[i];
-	if (_size_load_queue [i] > _max_size_load_queue ) _max_size_load_queue  = _size_load_queue [i];
-      }
-
-    _have_port_load_queue_ptr= _max_size_load_queue >= 2;
-
-    _size_general_register = log2(_max_nb_general_register);
-    _size_special_register = log2(_max_nb_special_register);
+    _max_nb_general_register = max<uint32_t>(nb_general_register,nb_ooo_engine);
+    _max_nb_special_register = max<uint32_t>(nb_special_register,nb_ooo_engine);
+
+    _max_size_store_queue    = max<uint32_t>(size_store_queue,nb_load_store_unit);
+    _max_size_load_queue     = max<uint32_t>(size_load_queue ,nb_load_store_unit);
 
     uint32_t _nb_thread = get_nb_thread(_nb_context,
@@ -190,4 +187,6 @@
 					_nb_ooo_engine);
 
+    uint32_t _max_nb_inst_memory = max<uint32_t>(_nb_inst_memory,_nb_load_store_unit);
+
     _set_read_unit_source_register_write = new std::set<uint32_t> [_nb_read_unit];
     _set_read_unit_source_bypass_write   = new std::set<uint32_t> [_nb_read_unit];
@@ -198,7 +197,7 @@
     _read_unit_nb_bypass_memory           = new uint32_t [_nb_read_unit];
 
-    _link_read_unit_with_load_store_unit  = new bool * [nb_read_unit];
-    _link_read_unit_with_write_unit       = new bool * [nb_read_unit];
-    _link_read_unit_with_thread           = new bool * [nb_read_unit];
+    _link_read_unit_with_load_store_unit  = new bool ** [nb_read_unit];
+    _link_read_unit_with_write_unit       = new bool *  [nb_read_unit];
+    _link_read_unit_with_thread           = new bool *  [nb_read_unit];
 
     for (uint32_t i=0; i<_nb_read_unit; i++)
@@ -208,10 +207,15 @@
 	_read_unit_nb_bypass_memory  [i] = 0;
 
-	_link_read_unit_with_load_store_unit [i] = new bool [_nb_execute_unit];
-	_link_read_unit_with_write_unit      [i] = new bool [_nb_write_unit];
-	_link_read_unit_with_thread          [i] = new bool [_nb_thread];
+	_link_read_unit_with_load_store_unit [i] = new bool * [_nb_execute_unit];
+	_link_read_unit_with_write_unit      [i] = new bool   [_nb_write_unit];
+	_link_read_unit_with_thread          [i] = new bool   [_nb_thread];
 
 	for (uint32_t j=0; j<_nb_execute_unit; j++)
-	  _link_read_unit_with_load_store_unit [i][j] = false;
+	  {
+	    _link_read_unit_with_load_store_unit [i][j] = new bool [_max_nb_inst_memory];
+
+	    for (uint32_t k=0; k<_max_nb_inst_memory; k++)
+	      _link_read_unit_with_load_store_unit [i][j][k] = false;
+	  }
 	for (uint32_t j=0; j<_nb_write_unit; j++)
 	  _link_read_unit_with_write_unit [i][j] = false;
@@ -220,35 +224,36 @@
 	
 	// fill link array
-	for (uint32_t j=0; j<_nb_execute_unit; j++)
-	  {
-	    // Test if this read unit can send operation at this execute_unit
-	    if (_read_unit_to_execution_unit_table_routing [i][j])
-	      {
-		if (_is_load_store_unit [j])
-		  {
-		    _link_read_unit_with_load_store_unit [i][j] = true;
-		  }
-		
-		for (uint32_t k=0; k<_nb_thread; k++)
-		  {
-		    if (_read_unit_to_execution_unit_table_thread [j][k])
-		      {
-			_link_read_unit_with_thread [i][k] = true;
-		      }
-		  }
-		// Scearch associed write_unit
-		for (uint32_t k=0; k<_nb_write_unit; k++)
-		  {
-		    // Test if this execute_unit can send operation at this write_unit
-		    // Test if have not a previous link ! (a same read_unit can send operation à two execute_unit and each execute_unit send at the same write_unit)
-		    if (_execution_unit_to_write_unit_table_routing [j][k] and 
-			not _link_read_unit_with_write_unit [i][k])
-		      // if yes : this write_unit can have operation sended by this read_unit
-		      {
-			_link_read_unit_with_write_unit [i][k] = true;
-		      }
-		  }
-	      }
-	  }
+	for (uint32_t x=0; x<_nb_execute_unit; x++)
+	  for (uint32_t y=0; y<_nb_execute_unit_port[x]; y++)
+	    {
+	      // Test if this read unit can send operation at this execute_unit
+	      if (_read_unit_to_execution_unit_table_routing [i][x][y])
+		{
+		  if (_is_load_store_unit [x])
+		    {
+		      _link_read_unit_with_load_store_unit [i][x][y] = true;
+		    }
+		  
+		  for (uint32_t k=0; k<_nb_thread; k++)
+		    {
+		      if (_read_unit_to_execution_unit_table_thread [x][k])
+			{
+			  _link_read_unit_with_thread [i][k] = true;
+			}
+		    }
+		  // Scearch associed write_unit
+		  for (uint32_t k=0; k<_nb_write_unit; k++)
+		    {
+		      // Test if this execute_unit can send operation at this write_unit
+		      // Test if have not a previous link ! (a same read_unit can send operation à two execute_unit and each execute_unit send at the same write_unit)
+		      if (_execution_unit_to_write_unit_table_routing [x][y][k] and 
+			  not _link_read_unit_with_write_unit [i][k])
+			// if yes : this write_unit can have operation sended by this read_unit
+			{
+			  _link_read_unit_with_write_unit [i][k] = true;
+			}
+		    }
+		}
+	    }
       }
 
@@ -258,52 +263,53 @@
 
     
-    std::cout << "_link_......." << std::endl;
-    std::cout << "_link_read_unit_with_load_store_unit" << std::endl;
+//     std::cout << "_link_......." << std::endl;
+//     std::cout << "_link_read_unit_with_load_store_unit" << std::endl;
+//     for (uint32_t i=0; i<_nb_read_unit; i++)
+//       {
+// 	std::cout << "\t" << std::endl;
+// 	for (uint32_t j=0; j<_nb_execute_unit; j++)
+// 	  for (uint32_t k=0; k<_nb_execute_unit_port[j]; k++)
+// 	    std::cout << _link_read_unit_with_load_store_unit [i][j][k] << " ";
+// 	std::cout << std::endl;
+//       }
+//     std::cout << "_link_read_unit_with_write_unit" << std::endl;
+//     for (uint32_t i=0; i<_nb_read_unit; i++)
+//       {
+// 	std::cout << "\t" << std::endl;
+// 	for (uint32_t j=0; j<_nb_write_unit; j++)
+// 	  std::cout << _link_read_unit_with_write_unit [i][j] << " ";
+// 	std::cout << std::endl;
+//       }
+//     std::cout << "_link_read_unit_with_thread" << std::endl;
+//     for (uint32_t i=0; i<_nb_read_unit; i++)
+//       {
+// 	std::cout << "\t" << std::endl;
+// 	for (uint32_t j=0; j<_nb_thread; j++)
+// 	  std::cout << _link_read_unit_with_thread [i][j] << " ";
+// 	std::cout << std::endl;
+//       }
+
+//     std::cout << "_set_......." << std::endl;
+
     for (uint32_t i=0; i<_nb_read_unit; i++)
       {
-	std::cout << "\t" << std::endl;
-	for (uint32_t j=0; j<_nb_execute_unit; j++)
-	  std::cout << _link_read_unit_with_load_store_unit [i][j] << " ";
-	std::cout << std::endl;
-      }
-    std::cout << "_link_read_unit_with_write_unit" << std::endl;
-    for (uint32_t i=0; i<_nb_read_unit; i++)
-      {
-	std::cout << "\t" << std::endl;
-	for (uint32_t j=0; j<_nb_write_unit; j++)
-	  std::cout << _link_read_unit_with_write_unit [i][j] << " ";
-	std::cout << std::endl;
-      }
-    std::cout << "_link_read_unit_with_thread" << std::endl;
-    for (uint32_t i=0; i<_nb_read_unit; i++)
-      {
-	std::cout << "\t" << std::endl;
-	for (uint32_t j=0; j<_nb_thread; j++)
-	  std::cout << _link_read_unit_with_thread [i][j] << " ";
-	std::cout << std::endl;
-      }
-
-    std::cout << "_set_......." << std::endl;
-
-    for (uint32_t i=0; i<_nb_read_unit; i++)
-      {
-	std::cout << " * Read_unit[" << i << "]" << std::endl;
+// 	std::cout << " * Read_unit[" << i << "]" << std::endl;
 	for (uint32_t j=0; j<_nb_write_unit; j++)
 	  {
-	    std::cout << "   * Write_unit[" << j << "]" << std::endl;
+// 	    std::cout << "   * Write_unit[" << j << "]" << std::endl;
 	    // Test the thread executed on this write_unit
 	    for (uint32_t k=0; k<_nb_thread; k++)
 	      {
-		std::cout << "     * Thread[" << k << "]" << std::endl;
+// 		std::cout << "     * Thread[" << k << "]" << std::endl;
 		if ( (_execution_unit_to_write_unit_table_thread [j][k]) and
 		     (_link_read_unit_with_thread [i][k]))
 		  {
-		    std::cout << "       * Find !!!!" << std::endl;
-		    std::cout << "         * Read_unit "+toString(i)+" must take the gpr_write with write_unit "+toString(j)+"." << std::endl;
+// 		    std::cout << "       * Find !!!!" << std::endl;
+// 		    std::cout << "         * Read_unit "+toString(i)+" must take the gpr_write with write_unit "+toString(j)+"." << std::endl;
 		    _set_read_unit_source_register_write[i].insert(j);
 		    _read_unit_nb_register_write        [i] ++;
 
-		    std::cout << "       * bypass_write : " << _nb_bypass_write [j] << std::endl;
-		    std::cout << "         * Read_unit "+toString(i)+" must take the bypass_write with write_unit "+toString(j)+"." << std::endl;		    
+// 		    std::cout << "       * bypass_write : " << _nb_bypass_write [j] << std::endl;
+// 		    std::cout << "         * Read_unit "+toString(i)+" must take the bypass_write with write_unit "+toString(j)+"." << std::endl;		    
 		    _set_read_unit_source_bypass_write  [i].insert(j);
 		    _read_unit_nb_bypass_write          [i] += _nb_bypass_write [j];
@@ -316,23 +322,26 @@
     for (uint32_t i=0; i<_nb_read_unit; i++)
       {
-	std::cout << " * Read_unit[" << i << "]" << std::endl;
+// 	std::cout << " * Read_unit[" << i << "]" << std::endl;
 	for (uint32_t j=0; j<_nb_execute_unit; j++)
 	  {
-	    std::cout << "   * Execute_unit[" << j << "]" << std::endl;
+            uint32_t x = translate_num_execute_unit [j];
+
+// 	    std::cout << "   * Execute_unit[" << j << "]" << std::endl;
 	    // Test the thread executed on this execute_unit
 	    for (uint32_t k=0; k<_nb_thread; k++)	
 	      {
-		std::cout << "     * Thread[" << k << "]" << std::endl;
+// 		std::cout << "     * Thread[" << k << "]" << std::endl;
 		if ((_read_unit_to_execution_unit_table_thread [j][k]) and
 		    (_link_read_unit_with_thread [i][k]) and
 		    (_is_load_store_unit [j]))
 		  {
-		    std::cout << "       * Find !!!!" << std::endl;
-		    std::cout << "       * Bypass_memory !!!!" << std::endl;
-		    std::cout << "         * Read_unit "+toString(i)+" must take the bypass_memory with load_store_unit "+toString(j)+"." << std::endl;		    
+// 		    std::cout << "       * Find !!!!" << std::endl;
+// 		    std::cout << "       * Bypass_memory !!!!" << std::endl;
+// 		    std::cout << "         * Read_unit "+toString(i)+" must take the bypass_memory with load_store_unit "+toString(j)+"." << std::endl;		    
 		    
 		    _set_read_unit_source_bypass_memory [i].insert(j);
-		    _read_unit_nb_bypass_memory         [i] += _nb_bypass_memory [j];
-		    break;
+		    _read_unit_nb_bypass_memory         [i] += _nb_bypass_memory [x];
+                    
+		    break; // loop on thread
 		  }
 	      }
@@ -340,5 +349,22 @@
       }
 
+    uint32_t size_ooo_engine_id      = log2(nb_ooo_engine        );
+    uint32_t size_general_register   = log2(_max_nb_general_register);
+    uint32_t size_special_register   = log2(_max_nb_special_register);
+    
     test();
+
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : glue");
+
+    _param_glue = new morpheo::behavioural::core::multi_execute_loop::execute_loop::execute_loop_glue::Parameters
+	(_nb_gpr_write              ,
+	 _nb_spr_write              ,
+	  size_ooo_engine_id        ,
+	  size_general_register     ,
+	  size_special_register     ,
+	  size_general_data         ,
+	  size_special_data         );
+
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : read_unit");
 
     _param_read_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::Parameters * [_nb_read_unit];
@@ -351,6 +377,6 @@
 	 _nb_ooo_engine                    ,
 	 _nb_packet                        ,
-	 _size_general_data                ,
-	 _size_special_data                ,
+	  size_general_data                ,
+	  size_special_data                ,
 	 _max_nb_general_register          ,
 	 _max_nb_special_register          ,
@@ -363,15 +389,13 @@
 	 _read_unit_nb_bypass_memory    [i]);
     
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : execute_unit");
+
     _param_functionnal_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::functionnal_unit::Parameters * [_nb_functionnal_unit];
     _param_load_store_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::Parameters * [_nb_load_store_unit];
 
-    uint32_t x=0;
-    uint32_t y=0;
-
     for (uint32_t i=0; i<_nb_execute_unit; i++)
-      if (_is_load_store_unit [i] == false)
-	{
-	  _translate_num_execute_unit [i] = x;
-
+      {
+        uint32_t x = _translate_num_execute_unit [i];
+        if (_is_load_store_unit [i] == false)
 	  _param_functionnal_unit [x] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::functionnal_unit::Parameters
 	    (_nb_context                 ,
@@ -379,40 +403,34 @@
 	     _nb_ooo_engine              ,
 	     _nb_packet                  ,
-	     _size_general_data          ,
+	      size_general_data          ,
 	     _max_nb_general_register    ,
-	     _size_special_data          ,
+	      size_special_data          ,
 	     _max_nb_special_register    ,
 	     _max_size_store_queue       ,
 	     _max_size_load_queue        ,
-	     _timing                  [i],
+	     _timing                  [x],
 	     _get_custom_information     );
-
-	  x++;
-	}
-      else
-	{
-	  _translate_num_execute_unit [i] = y;
-
-	  _param_load_store_unit [y] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::Parameters
-	    (_size_store_queue              [y],
-	     _size_load_queue               [y],
-	     _size_speculative_access_queue [y],
-	     _nb_port_check                 [y],
-	     _speculative_load              [y],
-	     _nb_bypass_memory              [y],
+        else
+	  _param_load_store_unit [x] = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_execute_unit::execute_unit::load_store_unit::Parameters
+	    (_size_store_queue              [x],
+	     _size_load_queue               [x],
+	     _size_speculative_access_queue [x],
+	     _nb_port_check                 [x],
+	     _speculative_load              [x],
+	     _nb_bypass_memory              [x],
+	     _nb_cache_port                 [x],
+	     _nb_inst_memory                [x],
 	     _nb_context                       ,
 	     _nb_front_end                     ,
 	     _nb_ooo_engine                    ,
 	     _nb_packet                        ,
-	     _size_general_data                ,
-	     _size_special_data                ,
+	      size_general_data                ,
+	      size_special_data                ,
 	     _max_nb_special_register          ,
 	     _max_nb_general_register          );
-
-	  y ++;
-	}
-
-    for (uint32_t i=0; i<_nb_load_store_unit; i++)
-
+      }
+
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : write_unit");
+    
     _param_write_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_write_unit::write_unit::Parameters * [_nb_write_unit];
     for (uint32_t i=0; i<_nb_write_unit; i++)
@@ -424,20 +442,24 @@
 	 _nb_ooo_engine              ,
 	 _nb_packet                  ,
-	 _size_general_data          ,
+	  size_general_data          ,
 	 _max_nb_general_register    ,
-	 _size_special_data          ,
+	  size_special_data          ,
 	 _max_nb_special_register    ,
 	 _nb_bypass_write         [i]);
 
 
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : read_unit_to_execution_unit");
+
     _param_read_unit_to_execution_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::network::read_unit_to_execution_unit::Parameters
       (_nb_read_unit                                  ,
+       _nb_inst_retire                                ,
        _nb_execute_unit                               ,
+       _nb_execute_unit_port                          ,
        _nb_context                                    ,
        _nb_front_end                                  ,
        _nb_ooo_engine                                 ,
        _nb_packet                                     ,
-       _size_general_data                             ,
-       _size_special_data                             ,
+        size_general_data                             ,
+        size_special_data                             ,
        _max_nb_general_register                       ,
        _max_nb_special_register                       ,
@@ -449,6 +471,9 @@
        _read_unit_to_execution_unit_table_thread      );
     
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : execution_unit_to_write_unit");
+
     _param_execution_unit_to_write_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::network::execution_unit_to_write_unit::Parameters
       (_nb_execute_unit                           ,
+       _nb_execute_unit_port                      ,
        _nb_write_unit                             ,
        _nb_context                                ,
@@ -456,6 +481,6 @@
        _nb_ooo_engine                             ,
        _nb_packet                                 ,
-       _size_general_data                         ,
-       _size_special_data                         ,
+        size_general_data                         ,
+        size_special_data                         ,
        _max_nb_general_register                   ,
        _max_nb_special_register                   ,
@@ -464,8 +489,10 @@
        _execution_unit_to_write_unit_table_thread );
       
+    log_printf(TRACE,Execute_loop,FUNCTION,"Parameters : register_unit");
+
     _param_register_unit = new morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::Parameters
 	(_nb_ooo_engine             ,
-	 _size_general_data         ,
-	 _size_special_data         ,
+	  size_general_data         ,
+	  size_special_data         ,
 	 _nb_gpr_read               ,
 	 _nb_gpr_write              ,
@@ -483,5 +510,4 @@
 	 _nb_inst_retire_rob        );
 
-    
     _max_size_dcache_context_id = 0;
     _max_size_dcache_packet_id  = 0;
@@ -494,4 +520,28 @@
 
     _have_port_dcache_context_id = (_max_size_dcache_context_id>1);
+
+
+    if (is_toplevel)
+      {
+        _size_context_id         = log2(nb_context);
+        _size_front_end_id       = log2(nb_front_end);
+        _size_ooo_engine_id      = size_ooo_engine_id;
+        _size_rob_ptr            = log2(nb_packet);
+        _size_general_data       = size_general_data;
+        _size_special_data       = size_special_data;
+        _size_general_register   = size_general_register;
+        _size_special_register   = size_special_register;
+
+        _size_store_queue_ptr    = log2(_max_size_store_queue);
+        _size_load_queue_ptr     = log2(_max_size_load_queue );
+        
+        _have_port_context_id    = _size_context_id     > 0;
+        _have_port_front_end_id  = _size_front_end_id   > 0;
+        _have_port_ooo_engine_id = _size_ooo_engine_id  > 0;
+        _have_port_rob_ptr       = _size_rob_ptr        > 0;
+        _have_port_load_queue_ptr= _size_load_queue_ptr > 0;
+
+        copy();
+      }
 
     log_printf(FUNC,Execute_loop,FUNCTION,"End");
@@ -511,11 +561,26 @@
 #undef  FUNCTION
 #define FUNCTION "Execute_loop::~Parameters"
-  Parameters::~Parameters () 
+  Parameters::~Parameters (void) 
   {
     log_printf(FUNC,Execute_loop,FUNCTION,"Begin");
 
+    delete    _param_glue;
+    for (uint32_t i=0; i<_nb_read_unit; i++)
+      delete _param_read_unit [i];
     delete [] _param_read_unit;
+
+    for (uint32_t i=0; i<_nb_execute_unit; i++)
+      {
+        uint32_t x = _translate_num_execute_unit [i];
+
+        if (_is_load_store_unit [i] == false)
+          delete _param_functionnal_unit [x];
+        else
+          delete _param_load_store_unit [x];
+      }
     delete [] _param_functionnal_unit;
     delete [] _param_load_store_unit;
+    for (uint32_t i=0; i<_nb_write_unit; i++)
+      delete _param_write_unit [i];
     delete [] _param_write_unit;
     delete    _param_read_unit_to_execution_unit;
@@ -535,4 +600,33 @@
     delete [] _is_load_store_unit;
     delete [] _translate_num_execute_unit;
+    delete [] _nb_execute_unit_port;
+    log_printf(FUNC,Execute_loop,FUNCTION,"End");
+  };
+
+
+#undef  FUNCTION
+#define FUNCTION "Execute_loop::copy"
+  void Parameters::copy (void) 
+  {
+    log_printf(FUNC,Execute_loop,FUNCTION,"Begin");
+
+    COPY(_param_glue);
+    for (uint32_t i=0; i<_nb_read_unit; i++)
+      COPY(_param_read_unit [i]);
+
+    for (uint32_t i=0; i<_nb_execute_unit; i++)
+      {
+        uint32_t x = _translate_num_execute_unit [i];
+
+        if (_is_load_store_unit [i] == false)
+          COPY(_param_functionnal_unit [x]);
+        else
+          COPY(_param_load_store_unit [x]);
+      }
+    for (uint32_t i=0; i<_nb_write_unit; i++)
+      COPY(_param_write_unit [i]);
+    COPY(_param_read_unit_to_execution_unit);
+    COPY(_param_execution_unit_to_write_unit);
+    COPY(_param_register_unit);
 
     log_printf(FUNC,Execute_loop,FUNCTION,"End");
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters_msg_error.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters_msg_error.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters_msg_error.cpp	(revision 88)
@@ -25,4 +25,8 @@
     Parameters_test test ("Execute_loop");
 
+    for (uint32_t i=0; i<_nb_functionnal_unit; i++)
+      if (_nb_inst_functionnal_unit [i] != 1)
+	test.error(toString(_("Functionnal_unit [%d] must treat once instruction.\n"),i));
+
     log_printf(FUNC,Execute_loop,FUNCTION,"End");
 
Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters_print.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters_print.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters_print.cpp	(revision 88)
@@ -68,4 +68,6 @@
 	xml. singleton_begin("speculative_load             "); xml.attribut("value",toString(_speculative_load             [i])); xml.singleton_end();
 	xml. singleton_begin("nb_bypass_memory             "); xml.attribut("value",toString(_nb_bypass_memory             [i])); xml.singleton_end();
+	xml. singleton_begin("nb_cache_port                "); xml.attribut("value",toString(_nb_cache_port                [i])); xml.singleton_end();
+	xml. singleton_begin("nb_inst_memory               "); xml.attribut("value",toString(_nb_inst_memory               [i])); xml.singleton_end();
 	xml.balise_close();
       }
@@ -109,4 +111,5 @@
     str += _param_execution_unit_to_write_unit->print(depth+1);
     str += _param_register_unit->print(depth+1);
+    str += _param_glue->print(depth+1);
 
     xml.comment("\n"+str);
