Changeset 401 for trunk

Timestamp:

Jun 3, 2013, 2:56:03 PM (11 years ago)

Author:

alain

Message:

Bug fix : VCI BE when DATA = 64 bits

File:

• trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (modified) (2 diffs)

trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp

@@ -577 +577 @@
 
     switch (r_initiator_fsm) {
-    case M_WRITE_CMD:           // It is actually a single word VCI read command
+    case M_WRITE_CMD:           // It is actually a single flit VCI read command
         p_vci_initiator.rspack  = false;
         p_vci_initiator.cmdval  = true;
         p_vci_initiator.address = (sc_dt::sc_uint<vci_param::N>)r_buf_address.read();
         p_vci_initiator.cmd     = vci_param::CMD_READ;
-        p_vci_initiator.pktid   = TYPE_READ_DATA_UNC; // or _MISS ?
+        p_vci_initiator.pktid   = TYPE_READ_DATA_UNC; 
         p_vci_initiator.wdata   = 0;
-        p_vci_initiator.be      = (uint32_t)0xF;
+        p_vci_initiator.be      = 0;
         p_vci_initiator.plen    = (sc_dt::sc_uint<vci_param::K>)(r_burst_nwords.read()<<2);
         p_vci_initiator.eop     = true;
@@ -594 +594 @@
         p_vci_initiator.cmd     = vci_param::CMD_WRITE;
         p_vci_initiator.pktid   = TYPE_WRITE;
-        p_vci_initiator.be      = 0xF;
         p_vci_initiator.plen    = (sc_dt::sc_uint<vci_param::K>)(r_burst_nwords.read()<<2);
         p_vci_initiator.eop     = ( r_words_count.read() == (r_burst_nwords.read() - 1) );
-        if (vci_param::B == 4)  p_vci_initiator.wdata = r_local_buffer[r_index.read()];
-        else                    p_vci_initiator.wdata = (uint64_t)r_local_buffer[r_index.read()] +
-                                   ((uint64_t)r_local_buffer[r_index.read()+1])<<32; 
+        if ( (vci_param::B == 8) and ((r_burst_nwords.read() - r_words_count.read()) > 1) )  
+        {
+            p_vci_initiator.wdata = (uint64_t)r_local_buffer[r_index.read()] +
+                                    ((uint64_t)r_local_buffer[r_index.read()+1])<<32; 
+            p_vci_initiator.be    = 0xFF;
+        }
+        else
+        {
+            p_vci_initiator.wdata = r_local_buffer[r_index.read()];
+            p_vci_initiator.be    = 0xF;
+        }
         break;
     case M_READ_RSP: