Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/src/Branch_Target_Buffer_Glue_deallocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/src/Branch_Target_Buffer_Glue_deallocation.cpp	(revision 88)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/src/Branch_Target_Buffer_Glue_deallocation.cpp	(revision 112)
@@ -7,4 +7,5 @@
 
 #include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/Branch_Target_Buffer_Glue/include/Branch_Target_Buffer_Glue.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {
@@ -29,58 +30,61 @@
 	delete     in_NRESET;
 
-	delete []  in_PREDICT_VAL                    ;
-	delete [] out_PREDICT_ACK                    ;
-	delete [] out_PREDICT_HIT                    ;
-	delete [] out_PREDICT_ADDRESS_SRC            ;
-	delete [] out_PREDICT_ADDRESS_DEST           ;
-	delete [] out_PREDICT_CONDITION              ;
-	delete [] out_PREDICT_LAST_TAKE              ;
-	delete [] out_PREDICT_IS_ACCURATE            ;
-	delete [] out_PREDICT_REGISTER_VAL           ;
-	delete []  in_PREDICT_REGISTER_ACK           ;
-	delete []  in_PREDICT_REGISTER_HIT           ;
-	delete []  in_PREDICT_REGISTER_ADDRESS_SRC   ;
-	delete []  in_PREDICT_REGISTER_ADDRESS_DEST  ;
-	delete []  in_PREDICT_REGISTER_CONDITION     ;
-	delete []  in_PREDICT_REGISTER_LAST_TAKE     ;
-	delete []  in_PREDICT_REGISTER_IS_ACCURATE   ;
+	DELETE1_SIGNAL( in_PREDICT_VAL           ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_ACK           ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_HIT           ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_ADDRESS_SRC   ,_param->_nb_inst_predict, _param->_size_instruction_address);
+	DELETE1_SIGNAL(out_PREDICT_ADDRESS_DEST  ,_param->_nb_inst_predict, _param->_size_instruction_address);
+	DELETE1_SIGNAL(out_PREDICT_CONDITION     ,_param->_nb_inst_predict, _param->_size_branch_condition);
+	DELETE1_SIGNAL(out_PREDICT_LAST_TAKE     ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_IS_ACCURATE   ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_REGISTER_VAL  ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL( in_PREDICT_REGISTER_ACK  ,_param->_nb_inst_predict, 1);
 	if (_param->_have_port_victim)
 	  {
-	delete []  in_PREDICT_SORT_VAL               ;
-	delete []  in_PREDICT_SORT_INDEX             ;
-	delete [] out_PREDICT_VICTIM_VAL             ;
-	delete []  in_PREDICT_VICTIM_ACK             ;
-	delete [] out_PREDICT_VICTIM_HIT             ;
-	if (not _param->_is_full_associative)
-	delete [] out_PREDICT_VICTIM_ADDRESS         ;
-	delete [] out_PREDICT_VICTIM_INDEX           ;
-	delete []  in_PREDICT_VICTIM_VICTIM          ;
+	DELETE1_SIGNAL( in_PREDICT_SORT_VAL      ,_param->_nb_inst_predict,1);
+	DELETE1_SIGNAL( in_PREDICT_SORT_INDEX    ,_param->_nb_inst_predict,_param->_size_victim);
+
+	DELETE1_SIGNAL(out_PREDICT_VICTIM_VAL    ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL( in_PREDICT_VICTIM_ACK    ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_VICTIM_HIT    ,_param->_nb_inst_predict, 1);
+	DELETE1_SIGNAL(out_PREDICT_VICTIM_ADDRESS,_param->_nb_inst_predict, _param->_size_victim_address);
+	DELETE1_SIGNAL(out_PREDICT_VICTIM_INDEX  ,_param->_nb_inst_predict, _param->_size_victim);
+	DELETE1_SIGNAL( in_PREDICT_VICTIM_VICTIM ,_param->_nb_inst_predict, _param->_size_victim);
 	  }
-	delete []  in_DECOD_VAL                      ;
-	delete [] out_DECOD_ACK                      ;
-	if (not _param->_is_full_associative)
-	delete []  in_DECOD_ADDRESS_SRC              ;
-	delete [] out_DECOD_REGISTER_VAL             ;
-	delete []  in_DECOD_REGISTER_ACK             ;
-	if (_param->_have_port_victim)
-	  {
-	delete [] out_DECOD_VICTIM_VAL               ;
-	delete []  in_DECOD_VICTIM_ACK               ;
-	if (not _param->_is_full_associative)
-	delete [] out_DECOD_VICTIM_ADDRESS           ;
-	  }
-	delete []  in_UPDATE_VAL                     ;
-	delete [] out_UPDATE_ACK                     ;
-	if (not _param->_is_full_associative)
-	delete []  in_UPDATE_ADDRESS_SRC             ;
-	delete [] out_UPDATE_REGISTER_VAL            ;
-	delete []  in_UPDATE_REGISTER_ACK            ;
-	if (_param->_have_port_victim)
-	  {
-	delete [] out_UPDATE_VICTIM_VAL              ;
-	delete []  in_UPDATE_VICTIM_ACK              ;
-	if (not _param->_is_full_associative)
-	delete [] out_UPDATE_VICTIM_ADDRESS          ;
-	  }
+
+	DELETE2_SIGNAL( in_PREDICT_REGISTER_HIT         ,_param->_nb_inst_predict, _param->_associativity,1);
+	DELETE2_SIGNAL( in_PREDICT_REGISTER_ADDRESS_SRC ,_param->_nb_inst_predict, _param->_associativity,_param->_size_instruction_address);
+	DELETE2_SIGNAL( in_PREDICT_REGISTER_ADDRESS_DEST,_param->_nb_inst_predict, _param->_associativity,_param->_size_instruction_address);
+	DELETE2_SIGNAL( in_PREDICT_REGISTER_CONDITION   ,_param->_nb_inst_predict, _param->_associativity,_param->_size_branch_condition);
+	DELETE2_SIGNAL( in_PREDICT_REGISTER_LAST_TAKE   ,_param->_nb_inst_predict, _param->_associativity,1);
+	DELETE2_SIGNAL( in_PREDICT_REGISTER_IS_ACCURATE ,_param->_nb_inst_predict, _param->_associativity,1);
+
+        DELETE1_SIGNAL( in_DECOD_VAL           ,_param->_nb_inst_decod,1);
+        DELETE1_SIGNAL(out_DECOD_ACK           ,_param->_nb_inst_decod,1);
+        if (not _param->_is_full_associative)
+        DELETE1_SIGNAL( in_DECOD_ADDRESS_SRC   ,_param->_nb_inst_decod,_param->_size_instruction_address);
+      
+        DELETE1_SIGNAL(out_DECOD_REGISTER_VAL  ,_param->_nb_inst_decod,1);
+        DELETE1_SIGNAL( in_DECOD_REGISTER_ACK  ,_param->_nb_inst_decod,1);
+        if (_param->_have_port_victim)
+          {
+        DELETE1_SIGNAL(out_DECOD_VICTIM_VAL    ,_param->_nb_inst_decod,1);
+        DELETE1_SIGNAL( in_DECOD_VICTIM_ACK    ,_param->_nb_inst_decod,1);
+        DELETE1_SIGNAL(out_DECOD_VICTIM_ADDRESS,_param->_nb_inst_decod,_param->_size_victim_address);
+          }
+
+        DELETE1_SIGNAL( in_UPDATE_VAL           ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL(out_UPDATE_ACK           ,_param->_nb_inst_update,1);
+        if (not _param->_is_full_associative)
+        DELETE1_SIGNAL( in_UPDATE_ADDRESS_SRC   ,_param->_nb_inst_update,_param->_size_instruction_address);
+        DELETE1_SIGNAL(out_UPDATE_REGISTER_VAL  ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL( in_UPDATE_REGISTER_ACK  ,_param->_nb_inst_update,1);
+        if (_param->_have_port_victim)
+          {
+        DELETE1_SIGNAL(out_UPDATE_VICTIM_VAL    ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL( in_UPDATE_VICTIM_ACK    ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL(out_UPDATE_VICTIM_ADDRESS,_param->_nb_inst_update,_param->_size_victim_address);
+          }
+
       }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
