Index: trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/platform_desc
===================================================================
--- trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/platform_desc	(revision 144)
+++ trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/platform_desc	(revision 152)
@@ -5,5 +5,5 @@
 todo = Platform('caba', 'top.cpp',
 	uses = [
-	Uses('caba:vci_cc_xcache_wrapper_v4', iss_t = 'common:gdb_iss', gdb_iss_t = 'common:mips32el'),
+	Uses('caba:vci_cc_xcache_wrapper_v4_cmp', iss_t = 'common:gdb_iss', gdb_iss_t = 'common:mips32el'),
 	Uses('caba:vci_simple_ram'),
         Uses('caba:vci_simhelper'),
Index: trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp
===================================================================
--- trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp	(revision 144)
+++ trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp	(revision 152)
@@ -16,5 +16,5 @@
 #include "vci_simple_ring_fast.h"
 #include "vci_mem_cache_v4.h"
-#include "vci_cc_xcache_wrapper_v4.h"
+#include "vci_cc_xcache_wrapper_v4_cmp.h"
 #include "alloc_elems.h"
 
@@ -279,5 +279,5 @@
         soclib::common::GdbServer<soclib::common::Mips32ElIss>::set_loader(loader);
 
-	soclib::caba::VciCcXCacheWrapperV4<vci_param, proc_iss > * proc [nb_proc];
+	soclib::caba::VciCcXCacheWrapperV4_CMP<vci_param, proc_iss > * proc [nb_proc];
         for (uint32_t i=0; i<nb_proc; ++i)
           {
@@ -287,5 +287,5 @@
             str << "proc_" << num_cpu;
 
-            proc[i] = new soclib::caba::VciCcXCacheWrapperV4<vci_param, proc_iss > (str.str().c_str(), num_cpu, maptabp, maptabc, IntTab(i),IntTab(i),IntTab(i)
+            proc[i] = new soclib::caba::VciCcXCacheWrapperV4_CMP<vci_param, proc_iss > (str.str().c_str(), num_cpu, maptabp, maptabc, IntTab(i),IntTab(i),IntTab(i)
 #if USE_OLD_XCACHE
                                                                                     ,iways, isets, iwords