Changeset 496 for trunk

Timestamp:

Aug 26, 2013, 4:58:22 PM (11 years ago)

Author:

cfuguet

Message:

Modification in vci_mem_cache:

• Adding cast to addr_t (physical address type) in the XRAM_RSP_TRT_COPY state to the victim TAG value. Some gcc versions can trunc the value after the shift operation performed in this assignment.

• The MULTI_ACK FSM does not request the LOCK over the UPT in the MULTI_ACK_UPT_CLEAR state. This is not necessary because it has requested the LOCK in the previous state.

• Erasing useless mask in the CLACK DSPIN flit creation. This mask operation is performed by the DHCCP_DSPIN_PARAM class

File:

• trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (3 diffs)

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

@@ -3918 +3918 @@
         r_xram_rsp_victim_way       = way;
         r_xram_rsp_victim_set       = set;
-        r_xram_rsp_victim_nline     = victim.tag*m_sets + set;
+        r_xram_rsp_victim_nline     = (addr_t)victim.tag*m_sets + set;
         r_xram_rsp_victim_is_cnt    = victim.is_cnt;
         r_xram_rsp_victim_inval     = inval ;
@@ -6740 +6740 @@
       /////////////////////////
       case ALLOC_UPT_MULTI_ACK:     // allocated to MULTI_ACK FSM
-          if ((r_multi_ack_fsm.read() != MULTI_ACK_UPT_LOCK ) and
-              (r_multi_ack_fsm.read() != MULTI_ACK_UPT_CLEAR))
+          if (r_multi_ack_fsm.read() != MULTI_ACK_UPT_LOCK)
           {
               if (r_write_fsm.read() == WRITE_UPT_LOCK)
@@ -8257 +8256 @@
       DspinDhccpParam::dspin_set(
             flit,
-            r_cleanup_nline.read() & 0xFFFF,
+            r_cleanup_nline.read(),
             DspinDhccpParam::CLACK_SET);