Index: /branches/reconfiguration/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp
===================================================================
--- /branches/reconfiguration/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 902)
+++ /branches/reconfiguration/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 903)
@@ -5435,5 +5435,12 @@
             {
                 // debug: verify that the available response concerns the current transaction.
-                assert(r_dcache_wdt_timeout.read() == p_vci.rtrdid.read());
+                if (r_dcache_wdt_timeout.read() != p_vci.rtrdid.read())
+                {
+                    std::cout << name() << ": Late response received after TIMEOUT "
+                              << std::dec << "(cycle " << m_cpt_total_cycles << ")"
+                              << std::endl;
+
+                    exit(1);
+                }
 
                 r_vci_rsp_fsm = RSP_DATA_UNC;
@@ -5442,5 +5449,12 @@
             {
                 // debug: verify that the available response concerns the current transaction.
-                assert(r_dcache_wdt_timeout.read() == p_vci.rtrdid.read());
+                if (r_dcache_wdt_timeout.read() != p_vci.rtrdid.read())
+                {
+                    std::cout << name() << ": Late response received after TIMEOUT "
+                              << std::dec << "(cycle " << m_cpt_total_cycles << ")"
+                              << std::endl;
+
+                    exit(1);
+                }
 
                 r_vci_rsp_fsm = RSP_DATA_MISS;
@@ -6151,7 +6165,7 @@
         p_vci.cmdval  = true;
         p_vci.address = r_dcache_vci_paddr.read() & ~0x3;
-        p_vci.wdata   = r_dcache_vci_wdt_trdid.read();
+        p_vci.wdata   = 0;
         p_vci.be      = r_dcache_vci_unc_be.read();
-        p_vci.trdid   = 0;
+        p_vci.trdid   = r_dcache_vci_wdt_trdid.read();
         p_vci.pktid   = TYPE_DATA_UNC;
         p_vci.plen    = 4;