Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/SelfTest/src/top_test.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/SelfTest/src/test.cpp	(revision 88)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/SelfTest/src/top_test.cpp	(revision 113)
@@ -7,107 +7,55 @@
  */
 
-#include "Behavioural/@DIRECTORY/SelfTest/include/test.h"
+#include "Behavioural/@DIRECTORY/SelfTest/include/top.h"
 #include "Behavioural/include/Allocation.h"
 
-void test (string name,
-	   morpheo::behavioural::@NAMESPACE_USE::Parameters * _param)
+void top::test (void)
 {
-  msg(_("<%s> : Simulation SystemC.\n"),name.c_str());
-
-  if (setlocale (LC_ALL, "") == NULL)
-    msg(_("setlocale ko.\n"));
-
-#ifdef STATISTICS
-  morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX);
-#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          );
-
-  @COMPONENT * _@COMPONENT = new @COMPONENT 
-    (name.c_str(),
-#ifdef STATISTICS
-     _parameters_statistics,
-#endif
-     _param,
-     _usage);
-  
 #ifdef SYSTEMC
   if (usage_is_set(_usage,USE_SYSTEMC))
     {
-  /*********************************************************************
-   * Déclarations des signaux
-   *********************************************************************/
-  string rename;
-
-  sc_clock              *  in_CLOCK  = new sc_clock ("clock", 1.0, 0.5);	 
-  sc_signal<Tcontrol_t> *  in_NRESET = new sc_signal<Tcontrol_t> ("NRESET");
-  
-  /********************************************************
-   * Instanciation
-   ********************************************************/
-  
-  msg(_("<%s> : Instanciation of _@COMPONENT.\n"),name.c_str());
-
-  (*(_@COMPONENT->in_CLOCK))        (*(in_CLOCK));
-  (*(_@COMPONENT->in_NRESET))       (*(in_NRESET));
-
-
-  msg(_("<%s> : Start Simulation ............\n"),name.c_str());
-    
-  Time * _time = new Time();
-
-  /********************************************************
-   * Simulation - Begin
-   ********************************************************/
-
-  // Initialisation
-
-  const uint32_t seed = 0;
-//const uint32_t seed = static_cast<uint32_t>(time(NULL));
-
-  srand(seed);
-
-  SC_START(0);
-  LABEL("Initialisation");
-
-  LABEL("Reset");
-  in_NRESET->write(0);
-  SC_START(5);
-  in_NRESET->write(1);  
-
-  LABEL("Loop of Test");
-
-  for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
-    {
-      LABEL("Iteration %d",iteration);
-
-      SC_START(1);
-    }
-
-  /********************************************************
-   * Simulation - End
-   ********************************************************/
-
-  TEST_OK ("End of Simulation");
-  delete _time;
-
-  msg(_("<%s> : ............ Stop Simulation\n"),name.c_str());
-
-  delete in_CLOCK;
-  delete in_NRESET;
+      msgInformation(_("<%s> : Start Simulation ............\n"),name.c_str());
+      
+      Time * _time = new Time();
+      
+      /********************************************************
+       * Simulation - Begin
+       ********************************************************/
+      
+      // Initialisation
+      
+      const uint32_t seed = 0;
+    //const uint32_t seed = static_cast<uint32_t>(time(NULL));
+      
+      srand(seed);
+      
+      SC_CYCLE(0);
+      LABEL("Initialisation");
+      
+      LABEL("Reset");
+      in_NRESET->write(0);
+      SC_CYCLE(5);
+      in_NRESET->write(1);  
+      
+      LABEL("Loop of Test");
+      
+      for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
+        {
+          LABEL("Iteration %d",iteration);
+          
+          SC_CYCLE(1);
+        }
+      
+      /********************************************************
+       * Simulation - End
+       ********************************************************/
+      
+      TEST_OK ("");
+      
+      sc_stop();
+      delete _time;
+      
+      msgInformation(_("<%s> : ............ Stop Simulation\n"),name.c_str());
     }
 #endif
-
-  delete _@COMPONENT;
-#ifdef STATISTICS
-  delete _parameters_statistics;
-#endif
 }
