Changeset 102 for trunk/modules/vci_synthetic_initator/caba/sources/src

Timestamp:

Oct 4, 2010, 5:22:53 PM (14 years ago)

Author:

choichil

Message:

Synthetic initiator that compiles

File:

• trunk/modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp (modified) (8 diffs)

trunk/modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp

@@ -45 +45 @@
   tmpl(/**/)::VciSyntheticInitiator( 
       sc_module_name name,
-      const  soclib::common::MappingTable &mt,
-      const  soclib::common::IntTab       &vci_index,
-      size_t length,    // Packet length (flit numbers)
-      float  rho,       // Packets ratio on the network
-      size_t depth,     // Fifo depth
-      size_t xmesh,     
-      size_t ymesh,
-      size_t bc_period = 0, // Broadcast period, if no broadcast => 0
-      size_t xmin = 0, 
-      size_t xmax = 0,
-      size_t ymin = 0,
-      size_t ymax = 0
+      const soclib::common::MappingTable &mt,
+      const soclib::common::IntTab       &vci_index,
+      const uint32_t length,    // Packet length (flit numbers)
+      const float  rho,       // Packets ratio on the network
+      const uint32_t depth,     // Fifo depth
+      const uint32_t xmesh,     
+      const uint32_t ymesh,
+      const uint32_t bc_period, // Broadcast period, if no broadcast => 0
+      const uint32_t xmin, 
+      const uint32_t xmax,
+      const uint32_t ymin,
+      const uint32_t ymax
       )
 
@@ -71 +71 @@
     m_rho(rho),
     m_depth(depth),
-    m_x(x),
-    m_y(y),
     m_xmesh(xmesh),
     m_ymesh(ymesh),
@@ -81 +79 @@
     m_ymax(ymax),
     m_date_fifo("m_date_fifo", depth),
-    r_vci_fsm("r_vci_fsm"),
+    r_vci_fsm("r_vci_fsm")
     {
 
@@ -160 +158 @@
             } else {
               r_vci_fsm = VCI_SINGLE_SEND ;
-              destAdress();
+              r_address_to_send = destAdress();
               m_count = 0;
             }
@@ -196 +194 @@
       case VCI_BC_SEND:
         {
-          m_address_to_send.broadcast_address.xmin = m_xmin;
-          m_address_to_send.broadcast_address.xmax = m_xmax;
-          m_address_to_send.broadcast_address.ymin = m_ymin;
-          m_address_to_send.broadcast_address.ymax = m_ymax;
-          m_address_to_send.broadcast_address.bc   = 0x3;
+          r_address_to_send = (((((((((m_xmin << 5) & m_xmax ) << 5 ) & m_ymin ) << 5 ) & m_ymax ) << 5 ) << 17 ) & 0x3) | 0 ;
+          //m_address_to_send.broadcast_address.xmin = m_xmin;
+          //m_address_to_send.broadcast_address.xmax = m_xmax;
+          //m_address_to_send.broadcast_address.ymin = m_ymin;
+          //m_address_to_send.broadcast_address.ymax = m_ymax;
+          //m_address_to_send.broadcast_address.bc   = 0x3;
           m_bc_nrsp = (m_xmax - m_xmin) * (m_ymax - m_ymin);
           r_vci_fsm = VCI_BC_SEND;
@@ -223 +222 @@
 
 /////////////////// Filling fifo
-    if( (rhos < m_rho) && (rand()/RAND_MAX) ){
+    if( (m_rhos < m_rho) && (rand()/RAND_MAX) ){
       if (m_date_fifo.wok()){
         date_fifo_put = true ;
       } 
-      if (!r_broadcast_req.read() && (m_cpt_cycles % bc_period)){
+      if (!r_broadcast_req.read() && (m_cpt_cycles % m_bc_period)){
         r_broadcast_req = true;
       }
@@ -288 +287 @@
         {
           p_vci.cmdval  = true;                 
-          p_vci.address = (typename vci_param::addr_t)(m_address_to_send+(m_count*4)); 
+          p_vci.address = (vci_addr_t)(r_address_to_send.read() + (m_count*4)); 
           p_vci.plen    = m_length*4;                                         
           p_vci.wdata   = 0;                                       
@@ -316 +315 @@
         {
           p_vci.cmdval  = true;                 
-          p_vci.address = (typename vci_param::addr_t) m_address_to_send; 
+          p_vci.address = (vci_addr_t) r_address_to_send.read(); 
           p_vci.plen    = 4;                                         
           p_vci.wdata   = 0;