Changeset 190 for trunk

Timestamp:

Feb 8, 2012, 9:33:35 PM (13 years ago)

Author:

zzhang

Message:

fix some bugs in vdspin platform

Location:

trunk

Files:

• modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h (modified) (1 diff)
• modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp (modified) (3 diffs)
• platforms/caba-vdspin-vci_synthetic_initiator/Makefile (modified) (1 diff)
• platforms/caba-vdspin-vci_synthetic_initiator/top.cpp (modified) (2 diffs)

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

@@ -76 +76 @@
         BC_RSP_WAIT_RSP
       };
-
-
-      
 
     protected:

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

@@ -277 +277 @@
               int id = -1;
               for(size_t i = 1; i < m_tab_size; i++){   // ID 0 reserved for broadcast transactions
-                if(r_pending_fsm[i].read() == false)
+                if( r_pending_fsm[i].read() == false )
                 {
                   id = (int)i;
@@ -318 +318 @@
           fifo_get = true;
           r_cmd_fsm = VCI_IDLE;
-        }
+          break;
+        }
       case VCI_BC_SEND:
         {
@@ -342 +343 @@
       if(p_vci.rtrdid.read() == 0)      // not a broadcast
       {
-        assert( ( r_pending_fsm[0].read() == true ) && 
+        assert( ( r_pending_fsm[0].read() == true ) && 
                 "illegal broadcast response received");
         r_bc_nrsp = r_bc_nrsp.read() - 1 ;

trunk/platforms/caba-vdspin-vci_synthetic_initiator/Makefile

@@ -1 +1 @@
 ARCH=mips32el
 SIMULATION_ARGS=100000
-SOCLIB_CC_ADD_ARGS=-t systemcass -I.
-#SOCLIB_CC_ADD_ARGS=-I.
+#SOCLIB_CC_ADD_ARGS=-t systemcass -I.
+SOCLIB_CC_ADD_ARGS=-I.
 SOCLIB?=$(shell soclib-cc --getpath)
 export SOCLIB

trunk/platforms/caba-vdspin-vci_synthetic_initiator/top.cpp

@@ -53 +53 @@
 #define LOAD            450
 
+#define STAGE           0
 
 int _main(int argc, char *argv[])
@@ -174 +175 @@
                         str0 << "Initiator_c0_" << i << "_" << j ;
                         str1 << "Initiator_c1_" << i << "_" << j ;
-                        new(&initiator_c0[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator<vci_param> (str0.str().c_str() , maptab0, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, 0, 100, X_MAX, Y_MAX);  
-                        new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator<vci_param> (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, rho_b, 100, X_MAX, Y_MAX, rho_a, 0, X_MAX, 0, Y_MAX); 
+                        new(&initiator_c0[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator<vci_param> (str0.str().c_str() , maptab0, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, 0, 100, X_MAX, Y_MAX); 
+#if STAGE==1
+                        if( (i + 1 == X_MAX) && (j + 1 == Y_MAX ) )
+#endif
+                            new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator<vci_param> (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, rho_a, 100, X_MAX, Y_MAX, rho_b, 0, X_MAX, 0, Y_MAX); 
+
+#if STAGE==1
+                        else
+                            new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator<vci_param> (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, rho_a, 100, X_MAX, Y_MAX, 0, 0, X_MAX, 0, Y_MAX); 
+#endif
                 }