Changeset 15 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest

Timestamp:

Apr 5, 2007, 4:17:30 PM (17 years ago)

Author:

rosiere

Message:

Interface normalisé
Début du banc de registres multi niveaux

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src

Files:

• main.cpp (modified) (3 diffs)
• test.cpp (modified) (7 diffs)

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

@@ -10 +10 @@
 #define NB_PARAMS 0
 
-void usage (string exec)
+void usage (int argc, char * argv[])
 {
-  cerr << "<Usage> " << exec << " name_instance list_params" << endl
-       << "list_params is :" << endl;
+  cerr << "<Usage> " << argv[0] << " name_instance list_params" << endl
+       << "list_params is :" << endl
 //     << " - size_data     (unsigned int)" << endl
 //     << " - nb_port       (unsigned int)" << endl;
+       << "" << endl;
+
+  for (int i=0; i<argc; i++)
+    cerr << argv[i] << " ";
+  cerr << endl;
 
   exit (1);
@@ -26 +31 @@
 #endif
 {
-  if (argc != 2+NB_PARAMS)
-    usage (argv[0]);
+  if (argc < 2+NB_PARAMS)
+    usage (argc, argv);
 
   const string   name      = argv[1];
@@ -46 +51 @@
     {
       cout << "<" << name << "> : " <<  error.what ();
-      return;
+      exit (EXIT_FAILURE);
     }
   catch (...)

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

@@ -9 +9 @@
 #define NB_ITERATION 1
 
+#define LABEL(str) do {cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << str << endl; _@COMPONENT->vhdl_testbench_label(str);} while (0)
+
 #include "Behavioural/@DIRECTORY/SelfTest/include/test.h"
 #include "Include/Test.h"
 
 void test (string name,
-           morpheo::behavioural::@NAMESPACE_USE::Parameters param)
+           morpheo::behavioural::@NAMESPACE_USE::Parameters _param)
 {
   cout << "<" << name << "> : Simulation SystemC" << endl;
@@ -21 +23 @@
                                              morpheo::behavioural::Parameters_Statistics(5,50),
 #endif
-                                             param);
+                                             _param);
   
 #ifdef SYSTEMC
@@ -28 +30 @@
    *********************************************************************/
   sc_clock                               * CLOCK;
-
+  sc_signal<Tcontrol_t>                  * NRESET;
 
   string rename;
 
   CLOCK                                  = new sc_clock ("clock", 1.0, 0.5);
+  NRESET                                 = new sc_signal<Tcontrol_t> ("NRESET");
   
   /********************************************************
@@ -41 +44 @@
   
   (*(_@COMPONENT->in_CLOCK))        (*(CLOCK));
+  (*(_@COMPONENT->in_NRESET))       (*(NRESET));
+
+
+  cout << "<" << name << "> Start Simulation ............" << endl;
 
   /********************************************************
@@ -46 +53 @@
    ********************************************************/
 
-  cout << "<" << name << "> Start Simulation ............" << endl;
   // Initialisation
 
@@ -55 +61 @@
 
   sc_start(0);
-  _@COMPONENT->vhdl_testbench_label("Initialisation");
-  cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Initialisation" << endl;
+  LABEL("Initialisation");
 
-
-  _@COMPONENT->vhdl_testbench_label("Loop of Test");
-  cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Loop of Test" << endl;
+  LABEL("Loop of Test");
 
   for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
     {
-      _@COMPONENT->vhdl_testbench_label("Iteration "+toString(iteration));
+      LABEL("Iteration "+toString(iteration));
 
       sc_start(1);
@@ -75 +78 @@
   cout << "<" << name << "> ............ Stop Simulation" << endl;
 
+  delete CLOCK;
+  delete NRESET;
 #endif