Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/src/Direction_Glue_deallocation.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/src/Direction_Glue_deallocation.cpp	(revision 88)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/src/Direction_Glue_deallocation.cpp	(revision 112)
@@ -7,4 +7,5 @@
 
 #include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/include/Direction_Glue.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {
@@ -29,39 +30,38 @@
 	delete    in_NRESET;
 
-	delete []  in_PREDICT_VAL                  ;
-	delete [] out_PREDICT_ACK                  ;
-	delete []  in_PREDICT_ADDRESS_SRC          ;
-	delete []  in_PREDICT_STATIC               ;
-	delete []  in_PREDICT_LAST_TAKE            ;
-	if (_param->_have_port_history)
-	delete [] out_PREDICT_HISTORY              ;
-	delete [] out_PREDICT_DIRECTION            ;
-	if (_param->_have_component_meta_predictor)
-	  {
-	delete [] out_PREDICT_PREDICTOR_VAL        ;
-	delete []  in_PREDICT_PREDICTOR_ACK        ;
-	delete [] out_PREDICT_PREDICTOR_ADDRESS_SRC;
-	if (_param->_have_port_history)
-	delete []  in_PREDICT_PREDICTOR_HISTORY    ;
-	delete []  in_PREDICT_PREDICTOR_DIRECTION  ;
-	  }
-	delete []  in_UPDATE_VAL                ;
-	delete [] out_UPDATE_ACK                ;
-	delete []  in_UPDATE_ADDRESS            ;
-	if (_param->_have_port_history)
-	delete []  in_UPDATE_HISTORY            ;
-	delete []  in_UPDATE_DIRECTION          ;
-	if (_param->_have_component_meta_predictor)
-	  {
-	delete [] out_UPDATE_PREDICTOR_VAL      ;
-	delete []  in_UPDATE_PREDICTOR_ACK      ;
-	delete [] out_UPDATE_PREDICTOR_ADDRESS  ;
-	if (_param->_have_port_history)
-	delete [] out_UPDATE_PREDICTOR_HISTORY  ;
-	delete [] out_UPDATE_PREDICTOR_DIRECTION;
-	  }
+        DELETE1_SIGNAL( in_PREDICT_VAL                  , _param->_nb_inst_predict,1);
+        DELETE1_SIGNAL(out_PREDICT_ACK                  , _param->_nb_inst_predict,1);
+        DELETE1_SIGNAL( in_PREDICT_ADDRESS_SRC          , _param->_nb_inst_predict,_param->_size_instruction_address);
+        DELETE1_SIGNAL( in_PREDICT_STATIC               , _param->_nb_inst_predict,1);
+        DELETE1_SIGNAL( in_PREDICT_LAST_TAKE            , _param->_nb_inst_predict,1);
+        DELETE1_SIGNAL(out_PREDICT_HISTORY              , _param->_nb_inst_predict,_param->_size_history);
+        DELETE1_SIGNAL(out_PREDICT_DIRECTION            , _param->_nb_inst_predict,1);
+        if (_param->_have_component_meta_predictor)                                
+          {                                                                        
+        DELETE1_SIGNAL(out_PREDICT_PREDICTOR_VAL        , _param->_nb_inst_predict,1);
+        DELETE1_SIGNAL( in_PREDICT_PREDICTOR_ACK        , _param->_nb_inst_predict,1);
+        DELETE1_SIGNAL(out_PREDICT_PREDICTOR_ADDRESS_SRC, _param->_nb_inst_predict,_param->_size_instruction_address);
+        DELETE1_SIGNAL( in_PREDICT_PREDICTOR_HISTORY    , _param->_nb_inst_predict,_param->_size_history);
+        DELETE1_SIGNAL( in_PREDICT_PREDICTOR_DIRECTION  , _param->_nb_inst_predict,1);
+          }
+
+        DELETE1_SIGNAL( in_UPDATE_VAL                        ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL(out_UPDATE_ACK                        ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL( in_UPDATE_ADDRESS                    ,_param->_nb_inst_update,_param->_size_instruction_address);
+        DELETE1_SIGNAL( in_UPDATE_HISTORY                    ,_param->_nb_inst_update,_param->_size_history);
+        DELETE1_SIGNAL( in_UPDATE_DIRECTION                  ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL( in_UPDATE_PREDICTION_IFETCH          ,_param->_nb_inst_update,1);
+        if (_param->_have_component_meta_predictor)
+          {
+        DELETE1_SIGNAL(out_UPDATE_PREDICTOR_VAL              ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL( in_UPDATE_PREDICTOR_ACK              ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL(out_UPDATE_PREDICTOR_ADDRESS          ,_param->_nb_inst_update,_param->_size_instruction_address);
+        DELETE1_SIGNAL(out_UPDATE_PREDICTOR_HISTORY          ,_param->_nb_inst_update,_param->_size_history);
+        DELETE1_SIGNAL(out_UPDATE_PREDICTOR_DIRECTION        ,_param->_nb_inst_update,1);
+        DELETE1_SIGNAL(out_UPDATE_PREDICTOR_PREDICTION_IFETCH,_param->_nb_inst_update,1);
+          }
       }
+
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-
     delete _component;
 
