Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/SelfTest/src/test.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/SelfTest/src/test.cpp	(revision 82)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack/SelfTest/src/test.cpp	(revision 88)
@@ -23,4 +23,14 @@
 #endif
 
+  Tusage_t _usage = USE_ALL;
+
+//   _usage = usage_unset(_usage,USE_SYSTEMC              );
+//   _usage = usage_unset(_usage,USE_VHDL                 );
+//   _usage = usage_unset(_usage,USE_VHDL_TESTBENCH       );
+//   _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT);
+//   _usage = usage_unset(_usage,USE_POSITION             );
+//   _usage = usage_unset(_usage,USE_STATISTICS           );
+//   _usage = usage_unset(_usage,USE_INFORMATION          );
+
   Return_Address_Stack * _Return_Address_Stack = new Return_Address_Stack 
     (name.c_str(),
@@ -29,5 +39,5 @@
 #endif
      _param,
-     USE_ALL);
+     _usage);
   
 #ifdef SYSTEMC
@@ -403,6 +413,5 @@
 
 	in_DECOD_VAL [port1]->write(0);
-
-      }
+        }
     }
 
@@ -419,29 +428,31 @@
   delete in_NRESET;
 
-  delete []  in_PREDICT_VAL          ;
-  delete [] out_PREDICT_ACK          ;
-  delete []  in_PREDICT_CONTEXT_ID   ; 
-  delete [] out_PREDICT_HIT          ; 
-  delete []  in_PREDICT_PUSH         ;
-  delete []  in_PREDICT_ADDRESS_PUSH ;
-  delete [] out_PREDICT_ADDRESS_POP  ;
-  delete [] out_PREDICT_INDEX        ;
-  delete []  in_DECOD_VAL            ;
-  delete [] out_DECOD_ACK            ;
-  delete []  in_DECOD_PUSH           ;
-  delete []  in_DECOD_CONTEXT_ID     ;
-  delete [] out_DECOD_HIT            ;
-  delete []  in_DECOD_ADDRESS_PUSH   ;
-  delete [] out_DECOD_ADDRESS_POP    ;
-  delete [] out_DECOD_INDEX          ;
-  delete []  in_DECOD_MISS_PREDICTION;
-  delete []  in_UPDATE_VAL           ;
-  delete [] out_UPDATE_ACK           ;
-  delete []  in_UPDATE_CONTEXT_ID    ;
-  delete []  in_UPDATE_PUSH          ;
-  delete []  in_UPDATE_INDEX         ;
-  delete []  in_UPDATE_ADDRESS       ;
-  delete []  in_UPDATE_MISS_PREDICTION;
-  delete []  in_UPDATE_PREDICTION_IFETCH;
+  DELETE1_SC_SIGNAL( in_PREDICT_VAL             ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL(out_PREDICT_ACK             ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL( in_PREDICT_CONTEXT_ID      ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL(out_PREDICT_HIT             ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL( in_PREDICT_PUSH            ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL( in_PREDICT_ADDRESS_PUSH    ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL(out_PREDICT_ADDRESS_POP     ,_param->_nb_inst_predict);
+  DELETE1_SC_SIGNAL(out_PREDICT_INDEX           ,_param->_nb_inst_predict);
+
+  DELETE1_SC_SIGNAL( in_DECOD_VAL               ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL(out_DECOD_ACK               ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL( in_DECOD_CONTEXT_ID        ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL(out_DECOD_HIT               ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL( in_DECOD_PUSH              ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL( in_DECOD_ADDRESS_PUSH      ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL(out_DECOD_ADDRESS_POP       ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL(out_DECOD_INDEX             ,_param->_nb_inst_decod);
+  DELETE1_SC_SIGNAL( in_DECOD_MISS_PREDICTION   ,_param->_nb_inst_decod);
+
+  DELETE1_SC_SIGNAL( in_UPDATE_VAL              ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL(out_UPDATE_ACK              ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL( in_UPDATE_CONTEXT_ID       ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL( in_UPDATE_PUSH             ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL( in_UPDATE_ADDRESS          ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL( in_UPDATE_INDEX            ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL( in_UPDATE_MISS_PREDICTION  ,_param->_nb_inst_update);
+  DELETE1_SC_SIGNAL( in_UPDATE_PREDICTION_IFETCH,_param->_nb_inst_update);
 
 #endif
