Changeset 838 for branches/MESI

Timestamp:

Oct 15, 2014, 11:47:09 AM (10 years ago)

Author:

meunier

Message:

HMESI branch:

• Renamed parameters dspin_in_width and dspin_out_width in mem_cache

Location:

branches/MESI/modules/vci_mem_cache/caba

Files:

• metadata/vci_mem_cache.sd (modified) (2 diffs)
• source/include/vci_mem_cache.h (modified) (2 diffs)
• source/src/vci_mem_cache.cpp (modified) (1 diff)

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

@@ -15 +15 @@
                 cell_size = parameter.Reference('memc_cell_size_ext')
             ),
-            parameter.Int('dspin_in_width'),
-            parameter.Int('dspin_out_width'),
+            parameter.Int('memc_dspin_in_width'),
+            parameter.Int('memc_dspin_out_width'),
         ],
 
@@ -50 +50 @@
             Port('caba:dspin_input',
                 'p_dspin_p2m',
-                dspin_data_size = parameter.Reference('dspin_in_width')
+                dspin_data_size = parameter.Reference('memc_dspin_in_width')
             ),
             Port('caba:dspin_output',
                 'p_dspin_m2p',
-                dspin_data_size = parameter.Reference('dspin_out_width')
+                dspin_data_size = parameter.Reference('memc_dspin_out_width')
             ),
             Port('caba:dspin_output',
                 'p_dspin_clack',
-                dspin_data_size = parameter.Reference('dspin_out_width')
+                dspin_data_size = parameter.Reference('memc_dspin_out_width')
             ),
         ],

branches/MESI/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h

@@ -65 +65 @@
   template<typename vci_param_int, 
            typename vci_param_ext,
-           size_t   dspin_in_width,
-           size_t   dspin_out_width>
+           size_t   memc_dspin_in_width,
+           size_t   memc_dspin_out_width>
     class VciMemCache
     : public soclib::caba::BaseModule
@@ -494 +494 @@
       soclib::caba::VciTarget<vci_param_int>      p_vci_tgt;
       soclib::caba::VciInitiator<vci_param_ext>   p_vci_ixr;
-      soclib::caba::DspinInput<dspin_in_width>    p_dspin_p2m;
-      soclib::caba::DspinOutput<dspin_out_width>  p_dspin_m2p;
-      soclib::caba::DspinOutput<dspin_out_width>  p_dspin_clack;
+      soclib::caba::DspinInput<memc_dspin_in_width>    p_dspin_p2m;
+      soclib::caba::DspinOutput<memc_dspin_out_width>  p_dspin_m2p;
+      soclib::caba::DspinOutput<memc_dspin_out_width>  p_dspin_clack;
 
 #if MONITOR_MEMCACHE_FSM == 1

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

@@ -335 +335 @@
     template<typename vci_param_int, \
     typename vci_param_ext, \
-    size_t dspin_in_width,  \
-    size_t dspin_out_width> x \
-    VciMemCache<vci_param_int, vci_param_ext, dspin_in_width, dspin_out_width>
+    size_t memc_dspin_in_width,  \
+    size_t memc_dspin_out_width> x \
+    VciMemCache<vci_param_int, vci_param_ext, memc_dspin_in_width, memc_dspin_out_width>
 
     using namespace soclib::common;