Changeset 29

Timestamp:

May 23, 2007, 6:17:08 PM (17 years ago)

Author:

rosiere

Message:

Changement de classes de gestions des Interfaces.

-> simplification pour les déclarations de ports, application pour le composant Select_Priority_Fixed.
-> !!! essayer de supprimer la redondance dans les fichierx xxx_vhdl_testbench_transition.cpp

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural

Files:

• Generic/Select/Select_Priority_Fixed/SelfTest/configuration.cfg (modified) (1 diff)
• Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h (modified) (3 diffs)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed.cpp (modified) (4 diffs)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_allocation.cpp (modified) (4 diffs)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_deallocation.cpp (modified) (1 diff)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl.cpp (modified) (2 diffs)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_body.cpp (modified) (1 diff)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_declaration.cpp (modified) (1 diff)
• Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_port.cpp (modified) (2 diffs)
• Makefile.flags (modified) (1 diff)
• include/Interface.h (added)
• include/Interfaces.h (added)
• include/Localisation.h (added)
• include/Signal.h (added)
• include/Vhdl.h (modified) (1 diff)
• include/XML.h (modified) (1 diff)
• src/Interface.cpp (added)
• src/Interface_get_comment.cpp (added)
• src/Interface_get_signal.cpp (added)
• src/Interface_print.cpp (added)
• src/Interface_set_comment.cpp (added)
• src/Interface_set_port.cpp (added)
• src/Interface_set_signal.cpp (added)
• src/Interface_toXML.cpp (added)
• src/Interfaces.cpp (added)
• src/Interfaces_get_interface.cpp (added)
• src/Interfaces_print.cpp (added)
• src/Interfaces_set_interface.cpp (added)
• src/Interfaces_set_port.cpp (added)
• src/Interfaces_toXML.cpp (added)
• src/Signal.cpp (added)
• src/Signal_print.cpp (added)
• src/Signal_toXML.cpp (added)
• src/XML_insert_XML.cpp (added)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/configuration.cfg

@@ -1 +1 @@
 Select_Priority_Fixed
-2       16      *2      # nb_entity
-0       1       +1      # encoding_one_hot
+16      16      *2      # nb_entity
+0       0       +1      # encoding_one_hot
 1       1       +1      # encoding_compact

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"
+#include "Behavioural/include/Interfaces.h"
+
 #ifdef STATISTICS
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
@@ -59 +61 @@
   private   : Vhdl_Testbench                 * _vhdl_testbench;
 #endif
+
+  private   : Interfaces                     * interfaces;
 
 #ifdef SYSTEMC
@@ -113 +117 @@
 #if VHDL                                       
   public  : void     vhdl                      (void);
-  private : void     vhdl_port                 (Vhdl & vhdl);
-  private : void     vhdl_declaration          (Vhdl & vhdl);
-  private : void     vhdl_body                 (Vhdl & vhdl);
+  private : void     vhdl_port                 (Vhdl * & vhdl);
+  private : void     vhdl_declaration          (Vhdl * & vhdl);
+  private : void     vhdl_body                 (Vhdl * & vhdl);
 #endif                                         
                                                

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

@@ -32 +32 @@
     log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","Begin");
 
+#ifdef SYSTEMC
+    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation");
+
+    allocation ();
+#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");
@@ -48 +60 @@
     //  -> clock's signals
     _vhdl_testbench = new Vhdl_Testbench (_name);
-//     _vhdl_testbench->set_clock    ("in_CLOCK",false);
 #endif
 
@@ -58 +69 @@
 #endif
 
-#ifdef VHDL_TESTBENCH
-    _vhdl_testbench->set_clock    ("in_CLOCK",true);
-#endif
-
 #ifdef SYSTEMC
-    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation");
-
-    allocation ();
-
 #if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - transition");
@@ -98 +101 @@
     
 #endif    
-
 #endif
     log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","End");

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

@@ -15 +15 @@
 namespace select_priority_fixed {
 
-
   void Select_Priority_Fixed::allocation (void)
   {
@@ -22 +21 @@
     log_printf(FUNC,Select_Priority_Fixed,"allocation","Begin");
 
-     in_CLOCK        = new SC_CLOCK           ("in_CLOCK ");
-     in_NRESET       = new SC_IN (Tcontrol_t) ("in_NRESET");
+    interfaces = new Interfaces;
+
+    // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    Interface interface_ ("", IN, WEST);
+    
+    in_CLOCK        = interface_.set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_NO);
+    in_NRESET       = interface_.set_signal_in  <Tcontrol_t> ("nreset",1);
 
      in_VAL          = new SC_IN (Tcontrol_t)           * [_param._nb_entity];
@@ -31 +35 @@
     for (uint32_t i=0; i<_param._nb_entity; i++)
       {
-        rename = " in_VAL_"+toString(i);
-         in_VAL [i]      = new SC_IN (Tcontrol_t) (rename.c_str());
-
+         in_VAL [i]    = interface_.set_signal_in  <Tcontrol_t> ("val_"+toString(i),1);
         if (_param._encoding_one_hot)
-          {
-        rename = "out_ACK_"+toString(i);
-        out_ACK [i]      = new SC_OUT(Tcontrol_t) (rename.c_str());
-          }
+        out_ACK [i]    = interface_.set_signal_out <Tcontrol_t> ("ack_"+toString(i),1);
       }
 
     if (_param._encoding_compact)
       {
-        out_ENTITY_ACK   = new SC_OUT(Tcontrol_t)           ("out_entity_ack");
-        out_ENTITY       = new SC_OUT(Tentity_t)            ("out_entity");
+        out_ENTITY     = interface_.set_signal_out <Tentity_t > ("entity"    , _param._size_entity);
+        out_ENTITY_ACK = interface_.set_signal_out <Tcontrol_t> ("entity_ack", 1);
       }
+
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
@@ -54 +54 @@
 }; // 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_deallocation.cpp

@@ -40 +40 @@
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
+    delete interfaces;
+
     log_printf(FUNC,Select_Priority_Fixed,"deallocation","End");
   };

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

@@ -20 +20 @@
   {
     log_printf(FUNC,Select_Priority_Fixed,"vhdl","Begin");
-    Vhdl vhdl (_name);
 
-    vhdl.set_library_work (_name + "_Pack");
+    Vhdl * vhdl = new Vhdl (_name);
+
+    vhdl->set_library_work (_name + "_Pack");
 
     vhdl_port        (vhdl);
@@ -28 +29 @@
     vhdl_body        (vhdl);
 
-    vhdl.generate_file();
+    vhdl->generate_file();
     log_printf(FUNC,Select_Priority_Fixed,"vhdl","End");
 

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

@@ -16 +16 @@
 
 
-  void Select_Priority_Fixed::vhdl_body (Vhdl & vhdl)
+  void Select_Priority_Fixed::vhdl_body (Vhdl * & vhdl)
   {
     log_printf(FUNC,Select_Priority_Fixed,"vhdl_body","Begin");
-    vhdl.set_body ("");
+    vhdl->set_body ("");
 
-    vhdl.set_body("internal_entity <=");
+    vhdl->set_body("internal_entity <=");
     for (uint32_t i=0; i<_param._nb_entity; i++)
       {
-        vhdl.set_body("\t"+std_logic_conv(_param._size_entity+1,i)+" when in_VAL_"+toString(i)+"='1' else");
+        vhdl->set_body("\t"+std_logic_conv(_param._size_entity+1,i)+" when in_VAL_"+toString(i)+"='1' else");
       }
-    vhdl.set_body("\t"+std_logic_conv(_param._size_entity+1,1<<_param._size_entity)+";");
-    vhdl.set_body ("");
+    vhdl->set_body("\t"+std_logic_conv(_param._size_entity+1,1<<_param._size_entity)+";");
+    vhdl->set_body ("");
 
     if (_param._encoding_one_hot)
       {
         for (uint32_t i=0; i<_param._nb_entity; i++)
-          vhdl.set_body("out_ACK_"+toString(i)+" <= '1' when internal_entity"+std_logic_range(_param._size_entity+1)+" = "+std_logic_conv(_param._size_entity+1,i)+" else '0';");
-        vhdl.set_body ("");
+          vhdl->set_body("out_ACK_"+toString(i)+" <= '1' when internal_entity"+std_logic_range(_param._size_entity+1)+" = "+std_logic_conv(_param._size_entity+1,i)+" else '0';");
+        vhdl->set_body ("");
       }
 
     if (_param._encoding_compact)
       {
-        vhdl.set_body ("out_ENTITY     <=     internal_entity"+std_logic_range(_param._size_entity-1,                  0)+";");
-        vhdl.set_body ("out_ENTITY_ACK <= not internal_entity"+std_logic_range(_param._size_entity  ,_param._size_entity)+";");
+        vhdl->set_body ("out_ENTITY     <=     internal_entity"+std_logic_range(_param._size_entity-1,                  0)+";");
+        vhdl->set_body ("out_ENTITY_ACK <= not internal_entity"+std_logic_range(_param._size_entity  ,_param._size_entity)+";");
       }    
     

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

@@ -16 +16 @@
 
 
-  void Select_Priority_Fixed::vhdl_declaration (Vhdl & vhdl)
+  void Select_Priority_Fixed::vhdl_declaration (Vhdl * & vhdl)
   {
     log_printf(FUNC,Select_Priority_Fixed,"vhdl_declaration","Begin");
 
-    vhdl.set_signal("internal_entity",_param._size_entity+1);
+    vhdl->set_signal("internal_entity",_param._size_entity+1);
 
     log_printf(FUNC,Select_Priority_Fixed,"vhdl_declaration","End");

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

@@ -9 +9 @@
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
 
-#ifdef VHDL_TESTBENCH
-# define VHDL_SET_PORT(name,direction,size) do {vhdl.set_port (name,direction,size); _vhdl_testbench->set_port (name,direction,size);} while (0)
-#else
-# define VHDL_SET_PORT(name,direction,size)     vhdl.set_port (name,direction,size)
-#endif
-
-namespace morpheo                    {
+namespace morpheo {
 namespace behavioural {
 namespace generic {
@@ -21 +15 @@
 namespace select_priority_fixed {
 
-
-  void Select_Priority_Fixed::vhdl_port (Vhdl & vhdl)
+  void Select_Priority_Fixed::vhdl_port (Vhdl * & vhdl)
   {
     log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","Begin");
 
-    vhdl.set_port (" in_CLOCK ", IN, 1);
-    VHDL_SET_PORT (" in_NRESET", IN, 1);
-        
-    for (uint32_t i=0; i<_param._nb_entity; i++)
-      {
-        VHDL_SET_PORT (" in_VAL_"+toString(i) , IN, 1);
-        if (_param._encoding_one_hot)
-        VHDL_SET_PORT ("out_ACK_"+toString(i) ,OUT, 1);
-      }
-    if (_param._encoding_compact)
-      {
-    VHDL_SET_PORT ("out_ENTITY    ",OUT,_param._size_entity);
-    VHDL_SET_PORT ("out_ENTITY_ACK",OUT,1);
-      }
-    log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","End");
+#ifdef VHDL
+    interfaces->set_port(vhdl);
+#endif
+#ifdef VHDL_TESTBENCH
+    interfaces->set_port(_vhdl_testbench);                      
+   _vhdl_testbench->set_clock    ("in_CLOCK",true);
+#endif    
+
+   log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","End");
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.flags

@@ -14 +14 @@
 
 #-----[ Flags ]--------------------------------------------
-FLAGS                           =       -DVHDL                  \
+FLAGS                           =       -DSYSTEMC               \
+                                        -DVHDL                  \
                                         -DVHDL_TESTBENCH        \
-                                        -DSYSTEMC               \
                                         -DSTATISTICS            \
-                                        -DCONFIGURATION         \
+                                        -DPOSITION              \
+                                        -DCONFIGURATION         \
                                         -DDEBUG=DEBUG_ALL    
                                         
 # Flags :
 # DEBUG={level}                 - Print Debug Message
-# VHDL                          - To generate a vhdl's    model
 # SYSTEMC                       - To generate a systemc's model
-# CONFIGURATION                 - To generate a configuration file (it's input of viewer)
+# VHDL                          - To generate a vhdl's    models
+# VHDL_TESTBENCH (need SYSTEMC) - In the simulation, generate two testbench's file (input and ouput) to validate the vhdl's model
 # STATISTICS     (need SYSTEMC) - In the simulation, generate a statistics's file
-# VHDL_TESTBENCH (need SYSTEMC) - In the simulation, generate two testbench's file (input and ouput) to validate the vhdl's model
+# POSITION                      - To generate a position's files     (it's input of viewer)
+# CONFIGURATION                 - To generate a configuration's file (it's input of viewer and generator)

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Vhdl.h

@@ -44 +44 @@
     // -----[ methods ]---------------------------------------------------
   public    :                  Vhdl                        (string name);
-  public    : virtual          ~Vhdl                       ();
+  public    :                  ~Vhdl                       ();
                                                            
   public    : void             generate_file               (void);

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/XML.h

@@ -40 +40 @@
   public   : bool             singleton_end       (void);
   public   : bool             attribut            (string name, string value);
+  public   : bool             insert_XML          (XML    xml );
 
   public   : void             generate_file       (void);