Changeset 77 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/src/test.cpp

Timestamp:

Feb 5, 2008, 5:21:20 PM (16 years ago)

Author:

rosiere

Message:

• Add two component :
  • network between read unit and execute unit
  • network between execute unit and write unit
• remove parameters "nb_operation" and "nb_type"
• in write_queue add the special case : load_speculative

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/src/test.cpp (modified) (8 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/src/test.cpp

@@ -50 +50 @@
   public  : Tpacket_t          _packet_id    ;
 //public  : Toperation_t       _operation    ;
-//public  : Ttype_t            _type         ;
+  public  : Ttype_t            _type         ;
   public  : Tcontrol_t         _write_rd     ;
   public  : Tgeneral_address_t _num_reg_rd   ;
@@ -66 +66 @@
                      Tpacket_t          packet_id    ,
                      //Toperation_t       operation    ,
-                     //Ttype_t            type         ,
+                     Ttype_t            type         ,
                      Tcontrol_t         write_rd     ,
                      Tgeneral_address_t num_reg_rd   ,
@@ -82 +82 @@
       _packet_id     = packet_id    ;
     //_operation     = operation    ;
-    //_type          = type         ;
+      _type          = type         ;
       _write_rd      = write_rd     ;
       _num_reg_rd    = num_reg_rd   ;
@@ -102 +102 @@
                     << " * _packet_id     : " << toString(x._packet_id    ) << std::endl
                   //<< " * _operation     : " << toString(x._operation    ) << std::endl
-                  //<< " * _type          : " << toString(x._type         ) << std::endl
+                    << " * _type          : " << toString(x._type         ) << std::endl
                     << " * _write_rd      : " << toString(x._write_rd     ) << std::endl
                     << " * _num_reg_rd    : " << toString(x._num_reg_rd   ) << std::endl
@@ -149 +149 @@
   ALLOC_SC_SIGNAL ( in_WRITE_QUEUE_IN_PACKET_ID     ," in_WRITE_QUEUE_IN_PACKET_ID"     , Tpacket_t         );
 //ALLOC_SC_SIGNAL ( in_WRITE_QUEUE_IN_OPERATION     ," in_WRITE_QUEUE_IN_OPERATION"     , Toperation_t      );
-//ALLOC_SC_SIGNAL ( in_WRITE_QUEUE_IN_TYPE          ," in_WRITE_QUEUE_IN_TYPE"          , Ttype_t           );
+  ALLOC_SC_SIGNAL ( in_WRITE_QUEUE_IN_TYPE          ," in_WRITE_QUEUE_IN_TYPE"          , Ttype_t           );
   ALLOC_SC_SIGNAL ( in_WRITE_QUEUE_IN_WRITE_RD      ," in_WRITE_QUEUE_IN_WRITE_RD"      , Tcontrol_t        );
   ALLOC_SC_SIGNAL ( in_WRITE_QUEUE_IN_NUM_REG_RD    ," in_WRITE_QUEUE_IN_NUM_REG_RD"    , Tgeneral_address_t);
@@ -209 +209 @@
   INSTANCE_SC_SIGNAL (_Write_queue,  in_WRITE_QUEUE_IN_PACKET_ID     );
 //INSTANCE_SC_SIGNAL (_Write_queue,  in_WRITE_QUEUE_IN_OPERATION     );
-//INSTANCE_SC_SIGNAL (_Write_queue,  in_WRITE_QUEUE_IN_TYPE          );
+  INSTANCE_SC_SIGNAL (_Write_queue,  in_WRITE_QUEUE_IN_TYPE          );
   INSTANCE_SC_SIGNAL (_Write_queue,  in_WRITE_QUEUE_IN_WRITE_RD      );
   INSTANCE_SC_SIGNAL (_Write_queue,  in_WRITE_QUEUE_IN_NUM_REG_RD    );
@@ -322 +322 @@
                                      i,
                                    //range<Toperation_t      >(rand(),_param->_size_operation       ),
-                                   //range<Ttype_t           >(rand(),_param->_size_type            ),
+                                     range<Ttype_t           >(rand(),_param->_size_type            ),
                                      range<Tcontrol_t        >(rand(),1                             ),
                                      range<Tgeneral_address_t>(rand(),_param->_size_general_register),
@@ -354 +354 @@
             in_WRITE_QUEUE_IN_PACKET_ID    ->write(request [nb_request_in]->_packet_id    );
           //in_WRITE_QUEUE_IN_OPERATION    ->write(request [nb_request_in]->_operation    );
-          //in_WRITE_QUEUE_IN_TYPE         ->write(request [nb_request_in]->_type         );
+            in_WRITE_QUEUE_IN_TYPE         ->write(request [nb_request_in]->_type         );
             in_WRITE_QUEUE_IN_WRITE_RD     ->write(request [nb_request_in]->_write_rd     );
             in_WRITE_QUEUE_IN_NUM_REG_RD   ->write(request [nb_request_in]->_num_reg_rd   );