Changeset 53 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp

Timestamp:

Sep 6, 2007, 6:30:49 PM (17 years ago)

Author:

rosiere

Message:

• Banc de registre multi banc
• Banc de registre générique.

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp

@@ -33 +33 @@
   cout << "<" << name << "> : Simulation SystemC" << endl;
 
+#ifdef STATISTICS
+  morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,50);
+#endif
+
   @COMPONENT * _@COMPONENT = new @COMPONENT (name.c_str(),
 #ifdef STATISTICS
-                                             morpheo::behavioural::Parameters_Statistics(5,50),
+                                             _parameters_statistics,
 #endif
-                                             *_param);
+                                             _param);
   
 #ifdef SYSTEMC
@@ -43 +47 @@
    * Déclarations des signaux
    *********************************************************************/
-  sc_clock                               * CLOCK;
-  sc_signal<Tcontrol_t>                  * NRESET;
+  sc_clock                               * in_CLOCK;
+  sc_signal<Tcontrol_t>                  * in_NRESET;
 
   string rename;
 
-  CLOCK                                  = new sc_clock ("clock", 1.0, 0.5);
-  NRESET                                 = new sc_signal<Tcontrol_t> ("NRESET");
+  in_CLOCK                                = new sc_clock ("clock", 1.0, 0.5);
+  in_NRESET                               = new sc_signal<Tcontrol_t> ("NRESET");
   
   /********************************************************
@@ -57 +61 @@
   cout << "<" << name << "> Instanciation of _@COMPONENT" << endl;
   
-  (*(_@COMPONENT->in_CLOCK))        (*(CLOCK));
-  (*(_@COMPONENT->in_NRESET))       (*(NRESET));
+  (*(_@COMPONENT->in_CLOCK))        (*(in_CLOCK));
+  (*(_@COMPONENT->in_NRESET))       (*(in_NRESET));
 
 
@@ -100 +104 @@
 
   delete _@COMPONENT;
+#ifdef SYSTEMC
+  delete _parameters_statistics;
+#endif
 }