Changeset 351 for branches/v5/platforms/tsar_mono_mmu

Timestamp:

Apr 4, 2013, 2:36:54 PM (11 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/platforms/tsar_mono_mmu

Files:

• . (moved) (moved from branches/v5/platforms/tsar_mono_mmu_dspin_coherence)
• soclib.conf (modified) (1 diff)
• top.cpp (modified) (5 diffs)
• top.desc (modified) (2 diffs)

branches/v5/platforms/tsar_mono_mmu/soclib.conf

@@ -1 +1 @@
 config.default.toolchain.set("cflags", config.default.toolchain.cflags + ['-DI_WANT_ILLEGAL_VCI'])
 
-#config.addDescPath("/path/to/tsar/trunk/lib/")
-#config.addDescPath("/path/to/tsar/trunk/modules/")
-#config.addDescPath("/path/to/tsar/branches/v5/modules/")
-#config.addDescPath("/path/to/tsar/branches/v5/communication/")
+#config.addDescPath("path/to/tsar/trunk/lib/")
+#config.addDescPath("path/to/tsar/trunk/modules/")
+#config.addDescPath("path/to/tsar/branches/v5/modules/")
+#config.addDescPath("path/to/tsar/branches/v5/communication/")

branches/v5/platforms/tsar_mono_mmu/top.cpp

@@ -14 +14 @@
 #include "vci_multi_tty.h"
 #include "vci_vgmn.h"
-#include "vci_mem_cache_dspin_coherence.h"
-#include "vci_cc_vcache_wrapper_dspin_coherence.h"
+#include "vci_mem_cache.h"
+#include "vci_cc_vcache_wrapper.h"
 #include "vci_xicu.h"
 #include "vci_simhelper.h"
@@ -194 +194 @@
     VciCcVCacheWrapper<vci_param, proc_iss > 
     proc("proc", 
-         0,                     // proc_id 
+         0,                         // proc_id 
          maptabd,               // direct space
-         maptabc,               // coherence space
-         IntTab(0),             // srcid_d
-         IntTab(0),             // srcid_c
-         IntTab(0),             // tgtid_c
+         0,                     // srcid_d
+         0,                     // id_c
          8,8,                   // itlb size
          8,8,                   // dtlb size
@@ -205 +203 @@
          4,64,16,               // dcache size
          4, 4,                  // wbuf size
-         0, 0,                  // x, y Width
-         nprocs,                // memory cache local id
-         max_frozen,            // max frozen cycles
+         0, 0,          // x, y Width
+         max_frozen,    // max frozen cycles
          from_cycle, trace_ok);
 
@@ -225 +222 @@
     memc("memc",
          maptabd,
-         maptabc,
          maptabd,
-         IntTab(0),             // srcid_x
-         IntTab(1),             // srcid_c
-         IntTab(0),             // tgtid_d
-         IntTab(1),             // tgtid_c
+         0,             // srcid_x
+         0,             // tgtid_d
+         1,             // cc_id
          16,256,16,             // cache size
+         3,              // MAX NUMBER OF COPIES
          1024,                  // HEAP size
          4,                     // TRT size
@@ -291 +287 @@
     proc.p_irq[4]               (signal_false); 
     proc.p_irq[5]               (signal_false); 
-    proc.p_vci_ini_d    (signal_vci_ini_d_proc);
+    proc.p_vci          (signal_vci_ini_d_proc);
     proc.p_dspin_in             (signal_dspin_from_memc);
     proc.p_dspin_out    (signal_dspin_from_proc);

branches/v5/platforms/tsar_mono_mmu/top.desc

@@ -4 +4 @@
     uses = [
                 Uses('common:mapping_table'),
-                Uses('caba:vci_cc_vcache_wrapper_dspin_coherence', iss_t = 'common:mips32el'),
+                Uses('caba:vci_cc_vcache_wrapper', iss_t = 'common:mips32el'),
                 Uses('caba:vci_simple_ram'),
                 Uses('caba:vci_logger'),
@@ -12 +12 @@
                 Uses('caba:vci_vgmn'),
                 Uses('caba:vci_simhelper'),
-                Uses('caba:vci_mem_cache_dspin_coherence'),
+                Uses('caba:vci_mem_cache'),
                 Uses('common:elf_file_loader'),
         ],