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

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/include/vci_synthetic_initiator.h (modified) (7 diffs)

trunk/modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h

@@ -47 +47 @@
       : public soclib::caba::BaseModule
     {
-      //typedef sc_dt::sc_uint<40> addr_t;
+      typedef sc_dt::sc_uint<40> addr_t;
       typedef typename vci_param::fast_addr_t vci_addr_t;
       typedef uint32_t data_t;
@@ -56 +56 @@
 
       // Type of the addr_t and access of the fields
-      typedef union{
-        PACKED_BITFIELD(
-          vci_addr_t srcid:vci_param::S,
-          vci_addr_t null:(8*sizeof(vci_addr_t)-(2*vci_param::S)),
-        ) normal_address;
-        PACKED_BITFIELD(
-          vci_addr_t xmin:vci_param::S,
-          vci_addr_t xmax:vci_param::S,
-          vci_addr_t ymin:vci_param::S,
-          vci_addr_t ymax:vci_param::S,
-          vci_addr_t null_:(8*sizeof(vci_addr_t)-(4*vci_param::S)),
-          vci_addr_t bc:2,
-        ) broadcast_address;
-      } addr_t;
+      //typedef union{
+      //  PACKED_BITFIELD(
+      //    vci_addr_t srcid:vci_param::S,
+      //    vci_addr_t null:(8*sizeof(vci_addr_t)-(2*vci_param::S)),
+      //  ) normal_address;
+      //  PACKED_BITFIELD(
+      //    vci_addr_t xmin:vci_param::S,
+      //    vci_addr_t xmax:vci_param::S,
+      //    vci_addr_t ymin:vci_param::S,
+      //    vci_addr_t ymax:vci_param::S,
+      //    vci_addr_t null_:(8*sizeof(vci_addr_t)-(4*vci_param::S)),
+      //    vci_addr_t bc:2,
+      //  ) broadcast_address;
+      //} addr_t;
 
 
@@ -99 +99 @@
       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 = 0, // Broadcast period, if no broadcast => 0
+                const uint32_t xmin = 0, 
+                const uint32_t xmax = 0,
+                const uint32_t ymin = 0,
+                const uint32_t ymax = 0
                 );                                 
 
@@ -119 +119 @@
       void genMoore();
 
-      void destAdress(size_t X_local, size_t Y_local, size_t &X_dest, size_t &Y_dest);
+      size_t destAdress();
 
     private:
@@ -125 +125 @@
       // Component attributes
       const size_t                        m_length;             // Number of words to write
-      const size_t                        m_rho;                // Rate of packets in the network wanted
+      const float                         m_rho;                // Rate of packets in the network wanted
       const size_t                        m_depth;              // Fifo depth
       const size_t                        m_xmesh;      
@@ -141 +141 @@
       uint64_t                            m_start_latency1;         // Start time of sending packet wanted
       uint64_t                            m_start_latency2;         // Start time of sending packet
-      addr_t                              m_address_to_send;        // Address to send the write command
       float                               m_rhos;                   // Effective Rho during the simulation
       size_t                              m_bc_nrsp;                // Expected number of responses for a broadcast command
@@ -154 +153 @@
       sc_signal<bool>          r_broadcast_req;
 
+      sc_signal<addr_t>        r_address_to_send;        // Address to send the write command
+
     }; // end class VciSyntheticInitiator