Changeset 284 for trunk/modules/vci_block_device_tsar_v4/caba/source

Timestamp:

Dec 11, 2012, 6:19:35 PM (12 years ago)

Author:

joannou

Message:

Updated of the vci trdid/rtrdid and pktid/rpktid fields for the direct network.
The pktid values are commented in the components'headers that use them.

• In the vci_vdspin_*_wrapper components
  • added the transmission of the pktid/rpktid field
• In the vci_cc_vcache_wrapper_v4
  • updated gen_moore() to transmit a valid pktid
  • updated transition(), RSP_FSM now checks the rpktid
• In the vci_mem_cache_v4
  • transition(), tests originally performed on trdid now use pktid
  • gen_moore() transmit rpktid
  • !!! THE L1_MULTI_CACHE MECHANISM IS NO LONGER COMPATIBLE !!!
• In vci_block_device_tsar_v4
  • updated gen_moore function to transmit a valid pktid

Also renamed the "SC" states in "CAS" states in the concerned FSMs on the vci_cc_vcache_wrapper_v4 and the vci_mem_cache_v4

Location:

trunk/modules/vci_block_device_tsar_v4/caba/source

Files:

• include/vci_block_device_tsar_v4.h (modified) (1 diff)
• src/vci_block_device_tsar_v4.cpp (modified) (3 diffs)

trunk/modules/vci_block_device_tsar_v4/caba/source/include/vci_block_device_tsar_v4.h

@@ -176 +176 @@
     };
 
+    /* transaction type, pktid field */
+    enum transaction_type_e
+    {
+      // b3 unused
+      // b2 READ / NOT READ
+      // Si READ
+      //  b1 DATA / INS
+      //  b0 UNC / MISS
+      // Si NOT READ
+      //  b1 accÚs table llsc type SW / other
+      //  b2 WRITE/CAS/LL/SC
+      TYPE_READ_DATA_UNC          = 0x0,
+      TYPE_READ_DATA_MISS         = 0x1,
+      TYPE_READ_INS_UNC           = 0x2,
+      TYPE_READ_INS_MISS          = 0x3,
+      TYPE_WRITE                  = 0x4,
+      TYPE_CAS                    = 0x5,
+      TYPE_LL                     = 0x6,
+      TYPE_SC                     = 0x7
+    };
+
 protected:
 

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

@@ -486 +486 @@
     p_vci_initiator.srcid  = (sc_dt::sc_uint<vci_param::S>)m_srcid;
     p_vci_initiator.trdid  = 0;
-    p_vci_initiator.pktid  = 0;
     p_vci_initiator.contig = true;
     p_vci_initiator.cons   = false;
@@ -499 +498 @@
         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.wdata   = 0;
         p_vci_initiator.be      = (uint32_t)0xF;
@@ -509 +509 @@
         p_vci_initiator.address = (sc_dt::sc_uint<vci_param::N>)r_buf_address.read(); 
         p_vci_initiator.cmd     = vci_param::CMD_WRITE;
+        p_vci_initiator.pktid   = TYPE_WRITE;
         p_vci_initiator.wdata   = (uint32_t)r_local_buffer[r_index.read()];
         p_vci_initiator.be      = 0xF;