Changeset 272 for trunk

Timestamp:

Nov 25, 2012, 1:20:00 AM (12 years ago)

Author:

bouyer

Message:

Fix writes:

• properly compute r_buf_address, + has highter priority than <<
• compute r_block_count after writing the block to file, not before. Also, don't forget to reset r_index.

File:

• trunk/modules/vci_block_device_tsar_v4/caba/source/src/vci_block_device_tsar_v4.cpp (modified) (4 diffs)

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

@@ -338 +338 @@
             if ( p_vci_initiator.reop.read() )  // last flit of the burst
             {
-                    r_flit_count  = 0;
-                r_buf_address = r_buf_address.read() + r_burst_nflits.read()<<2; 
-
-                        if( (p_vci_initiator.rerror.read()&0x1) != 0 ) 
+                r_flit_count  = 0;
+                r_buf_address = r_buf_address.read() + (r_burst_nflits.read()<<2); 
+
+                if( (p_vci_initiator.rerror.read()&0x1) != 0 ) 
                 {
                     r_initiator_fsm = M_WRITE_ERROR;
@@ -348 +348 @@
                           (aligned and (r_burst_count.read() == (m_bursts_per_block-1))) ) // last burst
                 {
-                    r_burst_count    = 0;
-                    r_block_count    = r_block_count.read() + 1;
                     r_initiator_fsm  = M_WRITE_BLOCK;
                 }
@@ -376 +374 @@
                 r_initiator_fsm = M_WRITE_ERROR; 
             }
-            else if ( r_block_count.read() == r_nblocks.read() ) 
+            else if ( r_block_count.read() == r_nblocks.read() - 1 ) 
             {
                 r_initiator_fsm = M_WRITE_SUCCESS; 
@@ -382 +380 @@
             else
             {
+                r_burst_count    = 0;
+                r_index          = 0;
+                r_block_count    = r_block_count.read() + 1;
                 r_initiator_fsm = M_WRITE_BURST;
             }