Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp	(revision 81)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp	(revision 88)
@@ -26,4 +26,6 @@
 			  Tspeculative_load_t speculative_load       ,
 			  uint32_t            nb_bypass_memory       ,
+			  uint32_t            nb_cache_port          ,
+			  uint32_t            nb_inst_memory         ,
 			  uint32_t            nb_context             ,
 			  uint32_t            nb_front_end           ,
@@ -33,97 +35,120 @@
 			  uint32_t            size_special_data      ,
 			  uint32_t            nb_general_register    ,
-			  uint32_t            nb_special_register    ):
-    _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_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      ),
-    _nb_general_register     (nb_general_register    ),
-    _nb_special_register     (nb_special_register    ),
-    
-    _size_address_store_queue              (log2(size_store_queue             )),
-    _size_address_load_queue               (log2(size_load_queue              )),
-    _size_address_speculative_access_queue (log2(size_speculative_access_queue)),
-
-    _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          )),
-    _size_general_register   (log2(nb_general_register)),
-    _size_special_register   (log2(nb_special_register)),
-    _size_dcache_context_id  (_size_context_id + _size_front_end_id + _size_ooo_engine_id),
-    _size_dcache_packet_id   ((log2((size_store_queue>size_load_queue)?size_store_queue:size_load_queue))+1),
-
-    _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_packet_id         (_size_packet_id    >0),
-    _have_port_dcache_context_id (_size_dcache_context_id>0),
-    _have_port_load_queue_ptr    (_size_load_queue>1),
-
-    _mask_address_lsb            (gen_mask<Tdcache_address_t>(log2(size_general_data/8))),
-    _mask_address_msb            (gen_mask<Tdcache_address_t>(size_general_data) << log2(size_general_data/8))
+			  uint32_t            nb_special_register    ,
+                          bool                is_toplevel)
   {
     log_printf(FUNC,Load_store_unit,FUNCTION,"Begin");
+
+    _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         ;
+    _nb_context                            = nb_context             ;
+    _nb_front_end                          = nb_front_end           ;
+    _nb_ooo_engine                         = nb_ooo_engine          ;
+    _nb_packet                             = nb_packet              ;
+    _nb_general_register                   = nb_general_register    ;
+    _nb_special_register                   = nb_special_register    ;
+    
+    _size_speculative_access_queue_ptr     = log2(size_speculative_access_queue);
+
+    _size_dcache_context_id                = log2(nb_context) + log2(nb_front_end) + log2(nb_ooo_engine);
+    _size_dcache_packet_id                 = (log2((size_store_queue>size_load_queue)?size_store_queue:size_load_queue))+1;
+
+    _have_port_dcache_context_id           = _size_dcache_context_id>0;
+
+    _mask_address_lsb                      = gen_mask<Tdcache_address_t>(log2(size_general_data/8));
+    _mask_address_msb                      = gen_mask<Tdcache_address_t>(size_general_data) << log2(size_general_data/8);
+
     test();
+
+    if (is_toplevel)
+      {
+        _size_context_id                       = log2(nb_context         );
+        _size_front_end_id                     = log2(nb_front_end       );
+        _size_ooo_engine_id                    = log2(nb_ooo_engine      );
+        _size_rob_ptr                          = log2(nb_packet          );
+        _size_general_register                 = log2(nb_general_register);
+        _size_special_register                 = log2(nb_special_register);
+        _size_store_queue_ptr                  = log2(size_store_queue   );
+        _size_load_queue_ptr                   = log2(size_load_queue    );
+        _size_general_data                     = size_general_data      ;
+        _size_special_data                     = size_special_data      ;
+
+        _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,Load_store_unit,FUNCTION,"End");
   };
   
+// #undef  FUNCTION
+// #define FUNCTION "Load_store_unit::Parameters (copy)"
+//   Parameters::Parameters (Parameters & param):
+//     _size_store_queue        (param._size_store_queue       ),
+//     _size_load_queue         (param._size_load_queue        ),
+//     _size_speculative_access_queue (param._size_speculative_access_queue),
+//     _nb_port_check           (param._nb_port_check          ),
+//     _speculative_load        (param._speculative_load       ),
+//     _nb_bypass_memory        (param._nb_bypass_memory       ),
+//     _nb_cache_port           (param._nb_cache_port          ),
+//     _nb_inst_memory          (param._nb_inst_memory         ),
+//     _nb_context              (param._nb_context             ),
+//     _nb_front_end            (param._nb_front_end           ),
+//     _nb_ooo_engine           (param._nb_ooo_engine          ),
+//     _nb_packet               (param._nb_packet              ),
+//     _size_general_data       (param._size_general_data      ),
+//     _size_special_data       (param._size_special_data      ),
+//     _nb_general_register     (param._nb_general_register    ),
+//     _nb_special_register     (param._nb_special_register    ),
+
+//     _size_address_store_queue              (param._size_address_store_queue             ),
+//     _size_address_load_queue               (param._size_address_load_queue              ),
+//     _size_address_speculative_access_queue (param._size_address_speculative_access_queue),
+
+//     _size_context_id         (param._size_context_id        ),
+//     _size_front_end_id       (param._size_front_end_id      ),
+//     _size_ooo_engine_id      (param._size_ooo_engine_id     ),
+//     _size_packet_id          (param._size_packet_id         ),
+//     _size_general_register   (param._size_general_register  ),
+//     _size_special_register   (param._size_special_register  ),
+//     _size_dcache_context_id  (param._size_dcache_context_id ),
+//     _size_dcache_packet_id   (param._size_dcache_packet_id  ),
+
+//     _have_port_context_id    (param._have_port_context_id   ),
+//     _have_port_front_end_id  (param._have_port_front_end_id ),
+//     _have_port_ooo_engine_id (param._have_port_ooo_engine_id),
+//     _have_port_packet_id     (param._have_port_packet_id    ),
+//     _have_port_dcache_context_id(param._have_port_dcache_context_id),
+//     _have_port_load_queue_ptr(param._have_port_load_queue_ptr),
+
+//     _mask_address_lsb        (param._mask_address_lsb),
+//     _mask_address_msb        (param._mask_address_msb)
+//   {
+//     log_printf(FUNC,Load_store_unit,FUNCTION,"Begin");
+//     test();
+//     log_printf(FUNC,Load_store_unit,FUNCTION,"End");
+//   };
+
 #undef  FUNCTION
-#define FUNCTION "Load_store_unit::Parameters (copy)"
-  Parameters::Parameters (Parameters & param):
-    _size_store_queue        (param._size_store_queue       ),
-    _size_load_queue         (param._size_load_queue        ),
-    _size_speculative_access_queue (param._size_speculative_access_queue),
-    _nb_port_check           (param._nb_port_check          ),
-    _speculative_load        (param._speculative_load       ),
-    _nb_bypass_memory        (param._nb_bypass_memory       ),
-    _nb_context              (param._nb_context             ),
-    _nb_front_end            (param._nb_front_end           ),
-    _nb_ooo_engine           (param._nb_ooo_engine          ),
-    _nb_packet               (param._nb_packet              ),
-    _size_general_data       (param._size_general_data      ),
-    _size_special_data       (param._size_special_data      ),
-    _nb_general_register     (param._nb_general_register    ),
-    _nb_special_register     (param._nb_special_register    ),
-
-    _size_address_store_queue              (param._size_address_store_queue             ),
-    _size_address_load_queue               (param._size_address_load_queue              ),
-    _size_address_speculative_access_queue (param._size_address_speculative_access_queue),
-
-    _size_context_id         (param._size_context_id        ),
-    _size_front_end_id       (param._size_front_end_id      ),
-    _size_ooo_engine_id      (param._size_ooo_engine_id     ),
-    _size_packet_id          (param._size_packet_id         ),
-    _size_general_register   (param._size_general_register  ),
-    _size_special_register   (param._size_special_register  ),
-    _size_dcache_context_id  (param._size_dcache_context_id ),
-    _size_dcache_packet_id   (param._size_dcache_packet_id  ),
-
-    _have_port_context_id    (param._have_port_context_id   ),
-    _have_port_front_end_id  (param._have_port_front_end_id ),
-    _have_port_ooo_engine_id (param._have_port_ooo_engine_id),
-    _have_port_packet_id     (param._have_port_packet_id    ),
-    _have_port_dcache_context_id(param._have_port_dcache_context_id),
-    _have_port_load_queue_ptr(param._have_port_load_queue_ptr),
-
-    _mask_address_lsb        (param._mask_address_lsb),
-    _mask_address_msb        (param._mask_address_msb)
+#define FUNCTION "Load_store_unit::~Parameters"
+  Parameters::~Parameters (void) 
   {
     log_printf(FUNC,Load_store_unit,FUNCTION,"Begin");
-    test();
     log_printf(FUNC,Load_store_unit,FUNCTION,"End");
   };
 
 #undef  FUNCTION
-#define FUNCTION "Load_store_unit::~Parameters"
-  Parameters::~Parameters () 
+#define FUNCTION "Load_store_unit::copy"
+  void Parameters::copy (void) 
   {
     log_printf(FUNC,Load_store_unit,FUNCTION,"Begin");
