Index: trunk/modules/vci_mem_cache_v4/caba/source/include/mem_cache_directory_v4.h
===================================================================
--- trunk/modules/vci_mem_cache_v4/caba/source/include/mem_cache_directory_v4.h	(revision 142)
+++ trunk/modules/vci_mem_cache_v4/caba/source/include/mem_cache_directory_v4.h	(revision 143)
@@ -7,5 +7,5 @@
 #include "arithmetics.h"
 
-#define L1_MULTI_CACHE      1
+#define L1_MULTI_CACHE 1
 //#define RANDOM_EVICTION
 
Index: trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp
===================================================================
--- trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp	(revision 142)
+++ trunk/modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp	(revision 143)
@@ -29,15 +29,18 @@
 #include "../include/vci_mem_cache_v4.h"
 
-// #define TDEBUG // Transaction tab debug
-// #define IDEBUG // Update tab debug
-// #define DDEBUG // Directory debug
-// #define LOCK_DEBUG // Lock debug
-
 #define DEBUG_VCI_MEM_CACHE 0
-#define DEBUG_START_CYCLE   949900
+#define DEBUG_START_CYCLE   1500
 #define RANDOMIZE_SC
 
 #define ASSERT_VERBOSE
 #define ASSERT_NCYCLES m_cpt_cycles
+
+#if DEBUG_VCI_MEM_CACHE
+#define TDEBUG // Transaction tab debug
+#define IDEBUG // Update tab debug
+#define DDEBUG // Directory debug
+#define LOCK_DEBUG // Lock debug
+#endif
+
 
 #include "debug.h"
@@ -2660,4 +2663,6 @@
             bool match_heap         = match_heap_srcid and match_heap_cache_id and match_heap_inst;
 
+            PRINTF("  * <MEM_CACHE.CLEANUP> %s - srcid %d\n",name().c_str(),r_cleanup_srcid.read());
+            
 #if L1_MULTI_CACHE
             PRINTF("  * <MEM_CACHE.CLEANUP> match_dir  %d (match_dir_srcid  %d, match_dir_cache_id  %d, match_dir_inst  %d)\n",
@@ -2683,9 +2688,9 @@
             if(match_dir){
               DirectoryEntry dir_entry;
-              dir_entry.valid	       = true;
+              dir_entry.valid	         = true;
               dir_entry.is_cnt         = r_cleanup_is_cnt.read();
-              dir_entry.dirty	       = r_cleanup_dirty.read();
+              dir_entry.dirty	         = r_cleanup_dirty.read();
               dir_entry.tag	           = r_cleanup_tag.read();
-              dir_entry.lock	       = r_cleanup_lock.read();
+              dir_entry.lock	         = r_cleanup_lock.read();
               dir_entry.ptr            = heap_entry.next;
               dir_entry.count          = r_cleanup_count.read()-1;