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

Timestamp:

Sep 28, 2007, 2:58:08 PM (17 years ago)

Author:

rosiere

Message:

• VHDL - RegisterFile_Multi_Banked (only partial_crossbar)
• SystemC - modif Component, interface and co -> ajout du type Tusage_T pour instancier un coposant mais ne demander que le VHDL ou le systemC.
• Séminaire interne

Location:

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

Files:

• Select_Priority_Fixed.cpp (modified) (3 diffs)
• Select_Priority_Fixed_allocation.cpp (modified) (2 diffs)
• Select_Priority_Fixed_deallocation.cpp (modified) (1 diff)
• Select_Priority_Fixed_genMealy_entity.cpp (modified) (2 diffs)
• Select_Priority_Fixed_vhdl_body.cpp (modified) (1 diff)
• Select_Priority_Fixed_vhdl_declaration.cpp (modified) (1 diff)
• Statistics.cpp (modified) (1 diff)

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

@@ -15 +15 @@
 
 
+  Select_Priority_Fixed::Select_Priority_Fixed 
+  (
 #ifdef SYSTEMC
-  Select_Priority_Fixed::Select_Priority_Fixed (sc_module_name name,
+   sc_module_name name,
 #else
-  Select_Priority_Fixed::Select_Priority_Fixed (string name,
+   string name,
 #endif
 #ifdef STATISTICS
-                              morpheo::behavioural::Parameters_Statistics             param_statistics,
+   morpheo::behavioural::Parameters_Statistics           *  param_statistics,
 #endif
-                              morpheo::behavioural::generic::select::select_priority_fixed::Parameters param ):
-                              _name              (name)
-                              ,_param            (param)
+   morpheo::behavioural::generic::select::select_priority_fixed::Parameters * param,
+   morpheo::behavioural::Tusage_t usage ):
+    _name              (name),
+    _param            (param),
+    _usage            (usage)
 // #ifdef STATISTICS
 //                            ,_param_statistics (param_statistics)
@@ -32 +36 @@
     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 STATISTICS
@@ -55 +56 @@
 
 #ifdef SYSTEMC
-#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
-    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - transition");
-
-    SC_METHOD (transition);
-    dont_initialize ();
-    sensitive_pos << *(in_CLOCK);
-#endif
-
-    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - genMealy_entity");
-
-    SC_METHOD (genMealy_entity);
-    dont_initialize ();
-    //sensitive_pos << *(in_CLOCK);
-    for (uint32_t i=0; i<_param._nb_entity; i++)
-      sensitive << *(in_VAL [i]);
-
+    if (_usage & USE_SYSTEMC)
+      {
+#  if defined(STATISTICS) or defined(VHDL_TESTBENCH)
+        log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - transition");
+        
+        SC_METHOD (transition);
+        dont_initialize ();
+        sensitive_pos << *(in_CLOCK);
+#  endif
+        
+        log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - genMealy_entity");
+        
+        SC_METHOD (genMealy_entity);
+        dont_initialize ();
+        //sensitive_pos << *(in_CLOCK);
+        for (uint32_t i=0; i<_param->_nb_entity; i++)
+          sensitive << *(in_VAL [i]);
+        
 #  ifdef SYSTEMCASS_SPECIFIC
-    // List dependency information
-
-    for (uint32_t i=0; i<_param._nb_entity; i++)
-      {
-        if (_param._encoding_one_hot)
-          (*(out_ACK    [i])) (*(in_VAL [i]));
-        if (_param._encoding_compact)
+        // List dependency information
+        
+        for (uint32_t i=0; i<_param->_nb_entity; i++)
           {
-          (*(out_ENTITY    )) (*(in_VAL [i]));
-          (*(out_ENTITY_ACK)) (*(in_VAL [i]));
+            if (_param->_encoding_one_hot)
+              (*(out_ACK    [i])) (*(in_VAL [i]));
+            if (_param->_encoding_compact)
+              {
+                (*(out_ENTITY    )) (*(in_VAL [i]));
+                (*(out_ENTITY_ACK)) (*(in_VAL [i]));
+              }
           }
+        
+#  endif
       }
-    
-#  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

@@ -19 +19 @@
     log_printf(FUNC,Select_Priority_Fixed,"allocation","Begin");
 
-    _component   = new Component ();
+    _component   = new Component (_usage);
 
     Entity * entity = _component->set_entity (_name                 
+                                             ,"Select_Priority_Fixed"
 #ifdef POSITION
-                                             ,"Select_Priority_Fixed"
                                              ,COMBINATORY            
 #endif
@@ -41 +41 @@
 
      in_CLOCK        = interface->set_signal_clk              ("clock" ,1, CLOCK_VHDL_NO);
-     in_NRESET       = interface->set_signal_in  <Tcontrol_t> ("nreset",1);
-     in_VAL          = new SC_IN (Tcontrol_t)           * [_param._nb_entity];
-    if (_param._encoding_one_hot)
-    out_ACK          = new SC_OUT(Tcontrol_t)           * [_param._nb_entity];
+     in_NRESET       = interface->set_signal_in  <Tcontrol_t> ("nreset",1, RESET_VHDL_NO);
 
-    for (uint32_t i=0; i<_param._nb_entity; i++)
+     in_VAL          = new SC_IN (Tcontrol_t)           * [_param->_nb_entity];
+    if (_param->_encoding_one_hot)
+    out_ACK          = new SC_OUT(Tcontrol_t)           * [_param->_nb_entity];
+
+    for (uint32_t i=0; i<_param->_nb_entity; i++)
       {
          in_VAL [i]    = interface->set_signal_in  <Tcontrol_t> ("val_"+toString(i),1);
-        if (_param._encoding_one_hot)
+        if (_param->_encoding_one_hot)
         out_ACK [i]    = interface->set_signal_out <Tcontrol_t> ("ack_"+toString(i),1);
       }
 
-    if (_param._encoding_compact)
+    if (_param->_encoding_compact)
       {
-        out_ENTITY     = interface->set_signal_out <Tentity_t > ("entity"    , _param._size_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);
       }

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_VAL;
-    if (_param._encoding_one_hot)
-    delete [] out_ACK;
-
-    if (_param._encoding_compact)
+    if (_usage & USE_SYSTEMC)
       {
-    delete    out_ENTITY;
-    delete    out_ENTITY_ACK;
+        delete     in_CLOCK;
+        delete     in_NRESET;
+        
+        delete []  in_VAL;
+        if (_param->_encoding_one_hot)
+          delete [] out_ACK;
+        
+        if (_param->_encoding_compact)
+          {
+            delete    out_ENTITY;
+            delete    out_ENTITY_ACK;
+          }
       }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-
+    
     delete _component;
 

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

@@ -22 +22 @@
     // init 
       
-    Tcontrol_t ack [_param._nb_entity];
+    Tcontrol_t ack [_param->_nb_entity];
     bool       find  = false;
     Tentity_t  entity;
 
-    if (_param._encoding_one_hot)
-    for (uint32_t i=0; i<_param._nb_entity; i++)
+    if (_param->_encoding_one_hot)
+    for (uint32_t i=0; i<_param->_nb_entity; i++)
       ack [i] = 0;
 
     log_printf(TRACE,Select_Priority_Fixed,"genMealy_entity","Scearch...");
-    for (entity=0; entity<_param._nb_entity; entity++)
+    for (entity=0; entity<_param->_nb_entity; entity++)
       {
         if (PORT_READ(in_VAL [entity]) == 1)
           {
             log_printf(TRACE,Select_Priority_Fixed,"genMealy_entity","Find! entity %d",entity);
-            if (_param._encoding_one_hot)
+            if (_param->_encoding_one_hot)
               ack [entity] = 1;
             find = true;
@@ -44 +44 @@
       
     // Write port
-    if (_param._encoding_one_hot)
-      for (uint32_t i=0; i<_param._nb_entity; i++)
+    if (_param->_encoding_one_hot)
+      for (uint32_t i=0; i<_param->_nb_entity; i++)
         PORT_WRITE(out_ACK [i], ack [i]);
 
-    if (_param._encoding_compact)
+    if (_param->_encoding_compact)
       {
         PORT_WRITE(out_ENTITY    , (find==true)?entity:0);  

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

@@ -22 +22 @@
 
     vhdl->set_body("internal_entity <=");
-    for (uint32_t i=0; i<_param._nb_entity; i++)
+    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("\t"+std_logic_conv(_param->_size_entity+1,1<<_param->_size_entity)+";");
     vhdl->set_body ("");
 
-    if (_param._encoding_one_hot)
+    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';");
+        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 ("");
       }
 
-    if (_param._encoding_compact)
+    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

@@ -20 +20 @@
     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/Statistics.cpp

@@ -17 +17 @@
 
   Statistics::Statistics (string                                      name                       ,
-                          morpheo::behavioural::Parameters_Statistics parameters_statistics      ,
-                          Parameters                                  parameters
+                          morpheo::behavioural::Parameters_Statistics * parameters_statistics      ,
+                          Parameters                                  * parameters
                           ) :
     morpheo::behavioural::Statistics(name                  ,