Changeset 351 for branches/v5/modules

Timestamp:

Apr 4, 2013, 2:36:54 PM (12 years ago)

Author:

joannou

Message:

Got rid of intermediate v5 version. _dspin_coherence versions changed to main version for v5. Changed components names and platforms to fit the new names

Location:

branches/v5/modules

Files:

• vci_cc_vcache_wrapper (moved) (moved from branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence)
• vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd (copied) (copied from branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/metadata/vci_cc_vcache_wrapper_dspin_coherence.sd) (2 diffs)
• vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper_dspin_coherence.sd (deleted)
• vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (copied) (copied from branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/include/vci_cc_vcache_wrapper_dspin_coherence.h)
• vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper_dspin_coherence.h (deleted)
• vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (copied) (copied from branches/v5/modules/vci_cc_vcache_wrapper_dspin_coherence/caba/source/src/vci_cc_vcache_wrapper_dspin_coherence.cpp) (1 diff)
• vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper_dspin_coherence.cpp (deleted)
• vci_mem_cache (moved) (moved from branches/v5/modules/vci_mem_cache_dspin_coherence)
• vci_mem_cache/caba/metadata/vci_mem_cache.sd (copied) (copied from branches/v5/modules/vci_mem_cache_dspin_coherence/caba/metadata/vci_mem_cache_dspin_coherence.sd) (3 diffs)
• vci_mem_cache/caba/metadata/vci_mem_cache_dspin_coherence.sd (deleted)
• vci_mem_cache/caba/source/include/vci_mem_cache.h (copied) (copied from branches/v5/modules/vci_mem_cache_dspin_coherence/caba/source/include/vci_mem_cache_dspin_coherence.h)
• vci_mem_cache/caba/source/include/vci_mem_cache_dspin_coherence.h (deleted)
• vci_mem_cache/caba/source/src/vci_mem_cache.cpp (copied) (copied from branches/v5/modules/vci_mem_cache_dspin_coherence/caba/source/src/vci_mem_cache_dspin_coherence.cpp) (2 diffs)
• vci_mem_cache/caba/source/src/vci_mem_cache_dspin_coherence.cpp (deleted)

branches/v5/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd

@@ -2 +2 @@
 # -*- python -*-
 
-Module('caba:vci_cc_vcache_wrapper_dspin_coherence',
+Module('caba:vci_cc_vcache_wrapper',
             classname = 'soclib::caba::VciCcVCacheWrapper',
 
@@ -10 +10 @@
         ],
 
-            header_files = [ '../source/include/vci_cc_vcache_wrapper_dspin_coherence.h' ],
+            header_files = [ '../source/include/vci_cc_vcache_wrapper.h' ],
 
-            implementation_files = [ '../source/src/vci_cc_vcache_wrapper_dspin_coherence.cpp' ],
+            implementation_files = [ '../source/src/vci_cc_vcache_wrapper.cpp' ],
 
             uses = [

branches/v5/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp

@@ -30 +30 @@
 #include <cassert>
 #include "arithmetics.h"
-#include "../include/vci_cc_vcache_wrapper_dspin_coherence.h"
+#include "../include/vci_cc_vcache_wrapper.h"
 
 #define DEBUG_DCACHE            1

branches/v5/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd

@@ -5 +5 @@
 __version__ = "$Revision: 295 $"
 
-Module('caba:vci_mem_cache_dspin_coherence',
+Module('caba:vci_mem_cache',
         classname = 'soclib::caba::VciMemCache',
 
@@ -13 +13 @@
 
         header_files = [
-            '../source/include/vci_mem_cache_dspin_coherence.h',
+            '../source/include/vci_mem_cache.h',
             '../source/include/xram_transaction.h',
             '../source/include/mem_cache_directory.h',
@@ -19 +19 @@
         ],
 
-        implementation_files = [ '../source/src/vci_mem_cache_dspin_coherence.cpp' ],
+        implementation_files = [ '../source/src/vci_mem_cache.cpp' ],
 
         uses = [

branches/v5/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -31 +31 @@
 */
 
-#include "../include/vci_mem_cache_dspin_coherence.h"
+#include "../include/vci_mem_cache.h"
 
 //////   debug services   ///////////////////////////////////////////////////////
@@ -1208 +1208 @@
           std::cout
             << "VCI_MEM_CACHE ERROR " << name()
-            << " MULTI_ACK_UPT_LOCK state"
+            << " MULTI_ACK_UPT_CLEAR state"
             << " bad UPT allocation"
             << std::endl;