Changeset 100 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_allocation.cpp

Timestamp:

Jan 8, 2009, 2:06:27 PM (15 years ago)

Author:

rosiere

Message:

1) Bug fix (Operation, Instruction)
2) Modif Return Address Stack
3) Add Soft Test
4) Add Soc Test

Location:

trunk

Files:

• . (modified) (1 prop)
• IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_allocation.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_allocation.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Queue/include/Queue.h"
+#include "Behavioural/include/Allocation.h"
 
 namespace morpheo                    {
@@ -38 +39 @@
                                                          ,IN
                                                          ,SOUTH,
-                                                         "Generalist interface"
+                                                         _("Generalist interface")
 #endif
                                                          );
@@ -48 +49 @@
     // ~~~~~[ Interface "insert" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     {
-      Interface_fifo * interface = _interfaces->set_interface("insert"
-#ifdef POSITION
-                                                         ,IN
-                                                         ,WEST
-                                                         ,"Insertion of data"
-#endif
-                                                         );
+      ALLOC0_INTERFACE("insert", IN, WEST, _("Interface of data write."));
       
-       in_INSERT_VAL  = interface->set_signal_valack_in (VAL);
-      out_INSERT_ACK  = interface->set_signal_valack_out(ACK);
-       in_INSERT_DATA = interface->set_signal_in  <Tdata_t> ("data", _param->_size_data);
+      ALLOC0_VALACK_IN ( in_INSERT_VAL  ,VAL);
+      ALLOC0_VALACK_OUT(out_INSERT_ACK  ,ACK);
+      ALLOC0_SIGNAL_IN ( in_INSERT_DATA ,"data",Tdata_t,_param->_size_data);
     }
+
     // ~~~~~[ Interface "retire" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     {
-      Interface_fifo * interface = _interfaces->set_interface("retire"
-#ifdef POSITION
-                                                              ,IN
-                                                              ,EAST
-                                                              ,"Retire of data"
-#endif
-                                                              );
+      ALLOC0_INTERFACE("retire", OUT, EAST, _("Interface of data read."));
       
-      out_RETIRE_VAL  = interface->set_signal_valack_out(VAL);
-       in_RETIRE_ACK  = interface->set_signal_valack_in (ACK);
-      out_RETIRE_DATA = interface->set_signal_out <Tdata_t> ("data", _param->_size_data);
+      ALLOC0_VALACK_OUT(out_RETIRE_VAL  ,VAL);
+      ALLOC0_VALACK_IN ( in_RETIRE_ACK  ,ACK);
+      ALLOC0_SIGNAL_OUT(out_RETIRE_DATA ,"data",Tdata_t,_param->_size_data);
+    }
+
+    // ~~~~~[ Interface "slot" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    {
+      ALLOC1_INTERFACE("slot", OUT, EAST, _("Internal slot."),_param->_nb_port_slot);
+      
+      ALLOC1_VALACK_OUT(out_SLOT_VAL  ,VAL);
+      ALLOC1_SIGNAL_OUT(out_SLOT_DATA ,"data",Tdata_t,_param->_size_data);
     }