Changeset 40 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Timestamp:

Jun 5, 2007, 11:06:46 PM (17 years ago)

Author:

rosiere

Message:

Interface et Signal, c'est deux classes enregistres la valeurs des signaux à chaque cycle ... étape préparatoire avan le changement de la classe Vhdl_Testbench

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed

Files:

• SelfTest/src/test.cpp (modified) (2 diffs)
• include/Select_Priority_Fixed.h (modified) (1 diff)
• src/Parameters_msg_error.cpp (modified) (2 diffs)
• src/Select_Priority_Fixed.cpp (modified) (3 diffs)
• src/Select_Priority_Fixed_allocation.cpp (modified) (1 diff)
• src/Select_Priority_Fixed_deallocation.cpp (modified) (1 diff)
• src/Select_Priority_Fixed_genMealy_entity.cpp (modified) (2 diffs)
• src/Select_Priority_Fixed_vhdl.cpp (modified) (1 diff)
• src/Select_Priority_Fixed_vhdl_port.cpp (modified) (1 diff)
• src/Select_Priority_Fixed_vhdl_testbench_transition.cpp (modified) (1 diff)

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

@@ -19 +19 @@
   Select_Priority_Fixed * _Select_Priority_Fixed = new Select_Priority_Fixed (name.c_str(),
 #ifdef STATISTICS
-                                             morpheo::behavioural::Parameters_Statistics(5,50),
+                                                                              morpheo::behavioural::Parameters_Statistics(5,50),
 #endif
-                                             _param);
+                                                                              _param);
   
 #ifdef SYSTEMC
@@ -137 +137 @@
   cout << "<" << name << "> ............ Stop Simulation" << endl;
 
-  delete CLOCK;
-  delete NRESET;
-
-  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;
+  delete    CLOCK;
+  delete    NRESET;
+  delete [] VAL       ;
+  delete [] ACK       ;
+  delete    ENTITY    ;
+  delete    ENTITY_ACK;
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h

@@ -19 +19 @@
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h"
+#ifdef STATISTICS
+#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
+#endif
 #ifdef POSITION
 #include "Behavioural/include/Position.h"
 #else
 #include "Behavioural/include/Interfaces.h"
-#endif
-
-#ifdef STATISTICS
-#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
 #endif
 #ifdef VHDL

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

@@ -31 +31 @@
       }
 
+    log_printf(FUNC,Select_Priority_Fixed,"msg_error","End");
+
     return msg;
-
-    log_printf(FUNC,Select_Priority_Fixed,"msg_error","End");
   };
 
@@ -39 +39 @@
 }; // end namespace select
 }; // end namespace generic
-
 }; // end namespace behavioural
 }; // end namespace morpheo              

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

@@ -38 +38 @@
 #endif
 
-#ifdef POSITION
-    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Position");
-    
-    
-#endif
-
 #ifdef STATISTICS
     log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation of statistics");
@@ -56 +50 @@
     log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Creation of a testbench");
 
-    // Creation of a testbench
-    //  -> port
-    //  -> clock's signals
     _vhdl_testbench = new Vhdl_Testbench (_name);
 #endif
@@ -137 +128 @@
 }; // end namespace select
 }; // end namespace generic
-
 }; // end namespace behavioural
 }; // end namespace morpheo              

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

@@ -35 +35 @@
     // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Interface * interface_ = _interfaces->set_interface(""  ,
-                                                        IN  ,
-                                                        WEST,
-                                                        "...");
+    Interface_fifo * interface_ = _interfaces->set_interface("", IN  ,WEST, "Generalist interface");
 
      in_CLOCK        = interface_->set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_NO);

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

@@ -20 +20 @@
     log_printf(FUNC,Select_Priority_Fixed,"deallocation","Begin");
 
-    delete in_CLOCK;
-    delete in_NRESET;
+    delete     in_CLOCK;
+    delete     in_NRESET;
 
-    for (uint32_t i=0; i<_param._nb_entity; i++)
-      {
-        delete  in_VAL [i];
-        if (_param._encoding_one_hot)
-        delete out_ACK [i];
-      }
+    delete []  in_VAL;
+    if (_param._encoding_one_hot)
+    delete [] out_ACK;
 
-    delete  in_VAL;
-    if (_param._encoding_one_hot)
-    delete out_ACK;
     if (_param._encoding_compact)
       {
-    delete out_ENTITY;
-    delete out_ENTITY_ACK;
+    delete    out_ENTITY;
+    delete    out_ENTITY_ACK;
       }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+
+    cout << *_interfaces << endl;
 
 #ifdef POSITION

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

@@ -1 +1 @@
 #ifdef SYSTEMC
-#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
 /*
  * $Id$
@@ -64 +63 @@
 }; // end namespace morpheo              
 #endif
-#endif

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

@@ -30 +30 @@
 
     vhdl->generate_file();
+
+    delete vhdl;
+
     log_printf(FUNC,Select_Priority_Fixed,"vhdl","End");
-
   };
 

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

@@ -19 +19 @@
     log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","Begin");
 
-#ifdef VHDL
     _interfaces->set_port(vhdl);
-#endif
+
 #ifdef VHDL_TESTBENCH
     _interfaces->set_port(_vhdl_testbench);                     

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

@@ -23 +23 @@
     sc_start(0);
 
-    // In order with file Select_Priority_Fixed_vhdl_testbench_port.cpp
-    // Warning : if a output depend of a subcomponent, take directly the port of subcomponent
-    // (because we have no control on the ordonnancer's policy)
-
     _interfaces->testbench(_vhdl_testbench);