Changeset 15 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/src

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/Generic/Select/Select_Priority_Fixed/SelfTest/src

Files:

• main.cpp (modified) (2 diffs)
• test.cpp (modified) (6 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/src/main.cpp

@@ -6 +6 @@
  */
 
-#include "Behavioural/Generic/Select/Priority_Fixed/SelfTest/include/test.h"
+#include "Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/include/test.h"
 
 #define NB_PARAMS 3
@@ -42 +42 @@
   try 
     {
-      morpheo::behavioural::generic::select::priority_fixed::Parameters param (nb_entity       ,
+      morpheo::behavioural::generic::select::select_priority_fixed::Parameters param (nb_entity       ,
                                                                                encoding_one_hot,
                                                                                encoding_compact);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/src/test.cpp

@@ -9 +9 @@
 #define NB_ITERATION 512
 
-#include "Behavioural/Generic/Select/Priority_Fixed/SelfTest/include/test.h"
+#include "Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/include/test.h"
 #include "Include/Test.h"
 
 void test (string name,
-           morpheo::behavioural::generic::select::priority_fixed::Parameters _param)
+           morpheo::behavioural::generic::select::select_priority_fixed::Parameters _param)
 {
   cout << "<" << name << "> : Simulation SystemC" << endl;
 
-  Priority_Fixed * _Priority_Fixed = new Priority_Fixed (name.c_str(),
+  Select_Priority_Fixed * _Select_Priority_Fixed = new Select_Priority_Fixed (name.c_str(),
 #ifdef STATISTICS
                                              morpheo::behavioural::Parameters_Statistics(5,50),
@@ -28 +28 @@
    *********************************************************************/
   sc_clock                         * CLOCK ;
+  sc_signal<Tcontrol_t>            * NRESET;
   sc_signal<Tcontrol_t>           ** VAL   ;
   sc_signal<Tcontrol_t>           ** ACK   ;
@@ -36 +37 @@
 
   CLOCK        = new sc_clock ("clock", 1.0, 0.5);
+  NRESET       = new sc_signal<Tcontrol_t> ("NRESET");
   VAL          = new sc_signal<Tcontrol_t> * [_param._nb_entity];
   ACK          = new sc_signal<Tcontrol_t> * [_param._nb_entity];
@@ -54 +56 @@
    ********************************************************/
   
-  cout << "<" << name << "> Instanciation of _Priority_Fixed" << endl;
+  cout << "<" << name << "> Instanciation of _Select_Priority_Fixed" << endl;
   
-  (*(_Priority_Fixed->in_CLOCK))        (*(CLOCK));
+  (*(_Select_Priority_Fixed->in_CLOCK ))       (*(CLOCK ));
+  (*(_Select_Priority_Fixed->in_NRESET))       (*(NRESET));
+
     for (uint32_t i=0; i<_param._nb_entity; i++)
       {
-        (*(_Priority_Fixed-> in_VAL [i]))        (*(VAL [i]));
+        (*(_Select_Priority_Fixed-> in_VAL [i]))        (*(VAL [i]));
         if (_param._encoding_one_hot)
-        (*(_Priority_Fixed->out_ACK [i]))        (*(ACK [i]));
+        (*(_Select_Priority_Fixed->out_ACK [i]))        (*(ACK [i]));
       }
     if (_param._encoding_compact)
       {
-    (*(_Priority_Fixed->out_ENTITY    ))        (*(ENTITY    ));
-    (*(_Priority_Fixed->out_ENTITY_ACK))        (*(ENTITY_ACK));
+    (*(_Select_Priority_Fixed->out_ENTITY    ))        (*(ENTITY    ));
+    (*(_Select_Priority_Fixed->out_ENTITY_ACK))        (*(ENTITY_ACK));
       }
   /********************************************************
@@ -86 +90 @@
  
   sc_start(0);
-//_Priority_Fixed->vhdl_testbench_label("Initialisation");
+//_Select_Priority_Fixed->vhdl_testbench_label("Initialisation");
 //cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Initialisation" << endl;
 
-  _Priority_Fixed->vhdl_testbench_label("Loop of Test");
+  _Select_Priority_Fixed->vhdl_testbench_label("Loop of Test");
   cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} Loop of Test" << endl;
 
   for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
     {
-      _Priority_Fixed->vhdl_testbench_label("Iteration "+toString(iteration));
+      _Select_Priority_Fixed->vhdl_testbench_label("Iteration "+toString(iteration));
 
       entity    = 0;
@@ -133 +137 @@
   cout << "<" << name << "> ............ Stop Simulation" << endl;
 
+  delete CLOCK;
+  delete NRESET;
 
-
-  delete CLOCK;
-
+  for (uint32_t i=0; i<_param._nb_entity; i++)
+    {
+      delete VAL [i];
+      delete ACK [i];
+    }
+  
+  delete VAL       ;
+  delete ACK       ;
+  delete ENTITY    ;
+  delete ENTITY_ACK;
 #endif
 
-  delete _Priority_Fixed;
+  delete _Select_Priority_Fixed;
 }