Changeset 112 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select

Timestamp:

Mar 18, 2009, 11:36:26 PM (15 years ago)

Author:

rosiere

Message:

1) Stat_list : fix retire old and new register bug
2) Stat_list : remove read_counter and valid flag, because validation of destination is in retire step (not in commit step)
3) Model : add class Model (cf Morpheo.sim)
4) Allocation : alloc_interface_begin and alloc_interface_end to delete temporary array.
5) Script : add distexe.sh
6) Add Comparator, Multiplier, Divider. But this component are not implemented
7) Software : add Dhrystone

Location:

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

Files:

• Select_Priority_Fixed_allocation.cpp (modified) (3 diffs)
• Select_Priority_Fixed_deallocation.cpp (modified) (2 diffs)

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

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo{
@@ -35 +36 @@
                                                             ,IN  
                                                             ,WEST
-                                                            ,"Generalist interface"
+                                                            ,_("Generalist interface")
 #endif
                                                             );
@@ -41 +42 @@
      in_CLOCK        = interface->set_signal_clk              ("clock" ,1, CLOCK_VHDL_NO);
      in_NRESET       = interface->set_signal_in  <Tcontrol_t> ("nreset",1, RESET_VHDL_NO);
+     
+     {
+       ALLOC1_INTERFACE_BEGIN("",IN,SOUTH,_("select interface"),_param->_nb_entity);
 
-     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];
+       ALLOC1_SIGNAL_IN ( in_VAL       ,"val"       ,Tcontrol_t,1);
+       if (_param->_encoding_one_hot)
+       ALLOC1_SIGNAL_OUT(out_ACK       ,"ack"       ,Tcontrol_t,1);
 
-    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)
-        out_ACK [i]    = interface->set_signal_out <Tcontrol_t> ("ack_"+toString(i),1);
-      }
+       ALLOC1_INTERFACE_END(_param->_nb_entity);
+     }
 
-    if (_param->_encoding_compact)
-      {
-        out_ENTITY     = interface->set_signal_out <Tentity_t > ("entity"    , _param->_size_entity);
-        out_ENTITY_ACK = interface->set_signal_out <Tcontrol_t> ("entity_ack", 1);
-      }
+     if (_param->_encoding_compact)
+     {
+       ALLOC0_INTERFACE_BEGIN("",OUT,SOUTH,_("select interface"));
 
-    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+       ALLOC0_SIGNAL_OUT(out_ENTITY    ,"entity"    ,Tentity_t ,_param->_size_entity);
+       ALLOC0_SIGNAL_OUT(out_ENTITY_ACK,"entity_ack",Tcontrol_t,1);
+
+       ALLOC0_INTERFACE_END();
+     }
+
+    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
 #ifdef POSITION

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

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {
@@ -24 +25 @@
         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;
-          }
+        DELETE1_SIGNAL( in_VAL       ,_param->_nb_entity,1);
+        if (_param->_encoding_one_hot)
+        DELETE1_SIGNAL(out_ACK       ,_param->_nb_entity,1);
+        if (_param->_encoding_compact)
+          {
+        DELETE0_SIGNAL(out_ENTITY    ,_param->_size_entity);
+        DELETE0_SIGNAL(out_ENTITY_ACK,1);
+          }
       }
+
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~