Changeset 124 for trunk

Timestamp:

Jan 10, 2011, 3:50:25 PM (14 years ago)

Author:

choichil

Message:

Synthetic Initiator...

Location:

trunk/modules/vci_synthetic_initator/caba/sources

Files:

• include/vci_synthetic_initiator.h (modified) (1 diff)
• src/vci_synthetic_initiator.cpp (modified) (7 diffs)

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

@@ -41 +41 @@
 #include "mapping_table.h"
 #include "arithmetics.h"
-//#include <cmath>
 
 namespace soclib {  namespace caba {

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

@@ -107 +107 @@
     /////////////////////////////////
   {
+        for(int i = 0; i < tab_size ; i++){
+          delete r_req_id[i];
+        }
+        delete r_req_id;
   }
 
@@ -142 +146 @@
                   << " Adresse to send : " << std::hex << m_address_to_send 
                   << " Number of broadcast to receive : " << std::dec << r_bc_nrsp.read() 
-                  << " Number of packets sent : " << std::dec << m_npackets << m_id_to_send << std::endl;
+                  << " Number of packets sent : " << std::dec << m_npackets << " " << m_id_to_send << std::endl;
         for(int i = 0; i < (1<<vci_param::T) ; i++){
-          std::cout << "ID : " << i << " " << r_req_id[i][0].read() << " " << r_req_id[i][0].read() << std::endl;
+          std::cout << "ID : " << i << " " << (r_req_id[i][0].read()) << " " << (r_req_id[i][0].read()) << std::endl;
         }
   }
@@ -198 +202 @@
         r_req_id[i][0] = 0;
         r_req_id[i][1] = 0;
-        //std::cout << name() << " bla bla " << i << std::endl;
+      //  std::cout << "bla bla" << std::endl;
       }
 
@@ -219 +223 @@
               r_cmd_fsm = VCI_BC_SEND ;
             } else {
+              m_id_to_send = -1;
               for(int i = 0; i < tab_size; i++){
-                if(r_req_id[i][0] == 0){
+                if(r_req_id[i][0].read() == 0){
                   m_id_to_send = i;
+                  r_req_id[i][0] = m_date_fifo.read();
+                  r_req_id[i][1] = m_cpt_cycles;
                   break;
-                }else{
-                  m_id_to_send = -1;
                 }
               }
@@ -248 +253 @@
           if (p_vci.cmdack.read()){
             if (m_count == m_length-1) {
-              r_req_id[(int)m_id_to_send][0] = m_date_fifo.read();
-              r_req_id[m_id_to_send][1] = m_cpt_cycles;
+              //r_req_id[m_id_to_send][0] = (uint64_t)(m_date_fifo.read());
+              //r_req_id[m_id_to_send][0] = m_date_fifo.read();
+              //r_req_id[m_id_to_send][1] = m_cpt_cycles;
+              //std::cout << name () << " FIFO " << m_date_fifo.read() << std::endl;
               date_fifo_get = true;
               r_cmd_fsm = VCI_IDLE ;
@@ -265 +272 @@
             r_bc_nrsp = (m_xmax - m_xmin) * (m_ymax - m_ymin) ;
             m_start_latency_bc = m_cpt_cycles;
+            r_broadcast_rsp = true;
             date_fifo_get = true;
-            r_broadcast_rsp = true;
             r_bc_rsp_fsm = VCI_IDLE;
             break;
           }
         }
-
     } // end switch vci_fsm
 
@@ -305 +311 @@
     if(p_vci.rspval.read()){
       if((int)(p_vci.pktid.read()) == 0){
-        m_latency1 = m_latency1 + (m_cpt_cycles - r_req_id[(int)(p_vci.trdid.read())][0]);
-        m_latency2 = m_latency2 + (m_cpt_cycles - r_req_id[(int)(p_vci.trdid.read())][1]);
+        m_latency1 = m_latency1 + (m_cpt_cycles - r_req_id[(int)(p_vci.rtrdid.read())][0].read());
+        m_latency2 = m_latency2 + (m_cpt_cycles - r_req_id[(int)(p_vci.rtrdid.read())][1].read());
         m_npackets++;
-        r_req_id[(int)(p_vci.trdid.read())][0] = 0;
-        r_req_id[(int)(p_vci.trdid.read())][1] = 0;
+        r_req_id[(int)(p_vci.rtrdid.read())][0] = 0;
+        r_req_id[(int)(p_vci.rtrdid.read())][1] = 0;
+        //std::cout << name() << " bla bla " << p_vci.rtrdid.read() << std::endl;
       }
     }