Index: soft/giet_vm/mappings/4c_1p_four.xml
===================================================================
--- soft/giet_vm/mappings/4c_1p_four.xml	(revision 246)
+++ soft/giet_vm/mappings/4c_1p_four.xml	(revision 277)
@@ -1,168 +1,237 @@
 <?xml version="1.0"?>
 
-<mapping_info signature = "0xdeadbeef" name = "C4_P1_FOUR" cluster_x = "2" cluster_y = "2" vspaces = "4" >
+<mapping_info signature    = "0xdeadbeef" 
+              name         = "4c_1p_four" 
+              x_size       = "2" 
+              y_size       = "2" 
+              x_width      = "4"
+              y_width      = "4"
+              vspaces      = "4"
+              increment    = "0x10000" >
+
+*** The "increment" parameter is the virtual address cluster increment 
+*** The physical address cluster increment is 0x10000000000 / NB_CLUSTERS
+
+*** This first section describes an instance of the "tsar_generic_iob" architecture
+*** with 4 clusters, 1 processor per cluster and 40 bits physical address.
 
     <clusterset>
 
-        <cluster index = "0" >
-
-            <pseg name = "PSEG_RAM" type = "RAM"  base = "0x00000000" length = "0x00C00000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0x00F00000" length = "0x00002000" />
-            <pseg name = "PSEG_DMA" type = "PERI" base = "0x00F30000" length = "0x00008000" />
-
-            <proc index = "0" >
-                <irq type = "HARD" icuid = "0" isr = "ISR_SWITCH" />
-                <irq type = "HARD" icuid = "8" isr = "ISR_DMA" channel = "0" />
-            </proc>
-
-            <periph type = "DMA" psegname = "PSEG_DMA" channels = "1" />
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
-
-        </cluster>
-        <cluster index = "1" >
-
-            <pseg name = "PSEG_RAM" type = "RAM"  base = "0x40000000" length = "0x00C00000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0x40F00000" length = "0x00002000" />
-            <pseg name = "PSEG_DMA" type = "PERI" base = "0x40F30000" length = "0x00008000" />
-
-            <proc index = "0" >
-                <irq type = "HARD" icuid = "0"  isr = "ISR_SWITCH" />
-                <irq type = "HARD" icuid = "8"  isr = "ISR_DMA" channel = "0" />
-            </proc>
-
-            <periph type = "DMA" psegname = "PSEG_DMA" channels = "1" />
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
-
-        </cluster>
-        <cluster index = "2" >
-
-            <pseg name = "PSEG_RAM" type = "RAM"  base = "0x80000000" length = "0x00C00000" /> 
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0x80F00000" length = "0x00002000" />
-            <pseg name = "PSEG_DMA" type = "PERI" base = "0x80F30000" length = "0x00008000" />
-
-*** Boot ROM and non replicated peripherals
-
-            <pseg name = "PSEG_FBF" type = "PERI" base = "0xBFD00000" length = "0x00200000" /> 
-            <pseg name = "PSEG_TTY" type = "PERI" base = "0xBFF20000" length = "0x00001000" /> 
-            <pseg name = "PSEG_IOC" type = "PERI" base = "0xBFF10000" length = "0x00001000" /> 
-            <pseg name = "PSEG_NIC" type = "PERI" base = "0xBFF80000" length = "0x00021000" />
-            <pseg name = "PSEG_ROM" type = "ROM"  base = "0xBFC00000" length = "0x00100000" />
+        <cluster x = "0" y = "0" >
+            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0000000000" length = "0x0001000000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x00B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x00B1000000" length = "0x0000008000" />
+            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x00B8000000" length = "0x0000001000" />
+
+*** Non replicated peripherals (including the ROM containing the preloader code)
+
+            <pseg name = "PSEG_FBF"  type = "PERI" base = "0x00B2000000" length = "0x0000004000" /> 
+            <pseg name = "PSEG_IOC"  type = "PERI" base = "0x00B3000000" length = "0x0000001000" /> 
+            <pseg name = "PSEG_TTY"  type = "PERI" base = "0x00B4000000" length = "0x0000001000" /> 
+            <pseg name = "PSEG_NIC"  type = "PERI" base = "0x00B5000000" length = "0x0000080000" />
+            <pseg name = "PSEG_CMA"  type = "PERI" base = "0x00B6000000" length = "0x0000008000" />
+            <pseg name = "PSEG_ROM"  type = "PERI" base = "0x00BFC00000" length = "0x0000004000" />
 
             <proc index  = "0" >
-                <irq type = "HARD" icuid = "0"  isr = "ISR_SWITCH" /> 
-                <irq type = "HARD" icuid = "8"  isr = "ISR_DMA" channel = "0" /> 
-                <irq type = "HARD" icuid = "16" isr = "ISR_TTY" channel = "0" /> 
-                <irq type = "HARD" icuid = "17" isr = "ISR_TTY" channel = "1" /> 
-                <irq type = "HARD" icuid = "18" isr = "ISR_TTY" channel = "2" /> 
-                <irq type = "HARD" icuid = "19" isr = "ISR_TTY" channel = "3" /> 
-                <irq type = "HARD" icuid = "20" isr = "ISR_TTY" channel = "4" /> 
-                <irq type = "HARD" icuid = "21" isr = "ISR_TTY" channel = "5" /> 
-                <irq type = "HARD" icuid = "22" isr = "ISR_TTY" channel = "6" /> 
-                <irq type = "HARD" icuid = "23" isr = "ISR_TTY" channel = "7" /> 
-                <irq type = "HARD" icuid = "24" isr = "ISR_TTY" channel = "8" /> 
-                <irq type = "HARD" icuid = "25" isr = "ISR_TTY" channel = "9" />
-                <irq type = "HARD" icuid = "26" isr = "ISR_TTY" channel = "10" /> 
-                <irq type = "HARD" icuid = "27" isr = "ISR_TTY" channel = "11" /> 
-                <irq type = "HARD" icuid = "28" isr = "ISR_TTY" channel = "12" /> 
-                <irq type = "HARD" icuid = "29" isr = "ISR_TTY" channel = "13" /> 
-                <irq type = "HARD" icuid = "30" isr = "ISR_TTY" channel = "14" /> 
+                <irq type = "SOFT" icuid = "0"  isr = "ISR_WAKUP" /> 
+                <irq type = "TIME" icuid = "1"  isr = "ISR_SWITCH" /> 
+
+                <irq type = "HARD" icuid = "16" isr = "ISR_TTY"     channel = "0" /> 
+                <irq type = "HARD" icuid = "17" isr = "ISR_TTY"     channel = "1" /> 
+                <irq type = "HARD" icuid = "18" isr = "ISR_TTY"     channel = "2" /> 
+                <irq type = "HARD" icuid = "19" isr = "ISR_TTY"     channel = "3" /> 
+                <irq type = "HARD" icuid = "20" isr = "ISR_TTY"     channel = "4" /> 
+                <irq type = "HARD" icuid = "21" isr = "ISR_TTY"     channel = "5" /> 
+                <irq type = "HARD" icuid = "22" isr = "ISR_TTY"     channel = "6" /> 
+                <irq type = "HARD" icuid = "23" isr = "ISR_TTY"     channel = "7" /> 
+
                 <irq type = "HARD" icuid = "31" isr = "ISR_IOC" /> 
             </proc> 
 
-            <periph type = "DMA" psegname = "PSEG_DMA" channels = "1" /> 
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "18" />
-            <periph type = "IOC" psegname = "PSEG_IOC" channels = "1" /> 
-            <periph type = "TTY" psegname = "PSEG_TTY" channels = "8" /> 
-            <periph type = "NIC" psegname = "PSEG_NIC" channels = "8" />
-            <periph type = "FBF" psegname = "PSEG_FBF" />
+            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1"  /> 
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1"  />
+            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1"  />
+            <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1"  /> 
+            <periph type = "TTY"  psegname = "PSEG_TTY"  channels = "8"  /> 
+            <periph type = "NIC"  psegname = "PSEG_NIC"  channels = "2"  />
+            <periph type = "CMA"  psegname = "PSEG_CMA"  channels = "4"  />
+            <periph type = "FBF"  psegname = "PSEG_FBF"  channels = "1"  />
+            <periph type = "ROM"  psegname = "PSEG_ROM"  channels = "1"  />
 
         </cluster>
-        <cluster index = "3" >
-
-            <pseg name = "PSEG_RAM" type = "RAM"  base = "0xC0000000" length = "0x00C00000" />
-            <pseg name = "PSEG_XICU" type = "PERI" base = "0xC0F00000" length = "0x00001000" />
-            <pseg name = "PSEG_DMA" type = "PERI" base = "0xC0F30000" length = "0x00008000" />
+
+        <cluster x = "0" y = "1" >
+            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0100000000" length = "0x0001000000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x01B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x01B1000000" length = "0x0000008000" />
+            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x01B8000000" length = "0x0000001000" />
 
             <proc index = "0" >
-                <irq type = "HARD" icuid = "0" isr = "ISR_SWITCH" />
-                <irq type = "HARD" icuid = "8" isr = "ISR_DMA" channel = "0" />
+                <irq type = "SOFT" icuid = "0" isr = "ISR_WAKUP" />
+                <irq type = "TIME" icuid = "1" isr = "ISR_SWITCH" />
             </proc>
 
-            <periph  type = "DMA" psegname  = "PSEG_DMA" channels = "1" />
-            <periph type = "XICU" psegname = "PSEG_XICU" channels = "2" />
+            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
+        </cluster>
+
+        <cluster x = "1" y = "0" >
+            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x1000000000" length = "0x0001000000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x10B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x10B1000000" length = "0x0000008000" />
+            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x10B8000000" length = "0x0000001000" />
+
+            <proc index = "0" >
+                <irq type = "SOFT" icuid = "0" isr = "ISR_WAKUP" />
+                <irq type = "TIME" icuid = "1" isr = "ISR_SWITCH" />
+            </proc>
+
+            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
+        </cluster>
+
+        <cluster x = "1" y = "1" >
+            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x1100000000" length = "0x0001000000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x11B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x11B1000000" length = "0x0000008000" />
+            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x11B8000000" length = "0x0000001000" />
+
+            <proc index = "0" >
+                <irq type = "SOFT" icuid = "0" isr = "ISR_WAKUP" />
+                <irq type = "TIME" icuid = "1" isr = "ISR_SWITCH" />
+            </proc>
+
+            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>
     </clusterset>
 
     <globalset> 
-        <vseg name = "seg_boot_code"      vbase = "0xBFC00000" mode = "CXW_" clusterid = "2" psegname = "PSEG_ROM" ident = "1" >
-            <vobj name = "boot_code"      type = "ELF" length = "0x00008000" binpath	= "build/boot/boot.elf" />
-        </vseg>
-        <vseg name = "seg_boot_stack"     vbase = "0xBFC08000" mode = "C_W_" clusterid = "2" psegname = "PSEG_ROM" ident = "1" >
-            <vobj name = "boot_stack"     type = "BUFFER" length = "0x00004000" />
-        </vseg>
-        <vseg name = "seg_boot_mapping"   vbase = "0xBFC0c000" mode = "C_W_" clusterid = "2" psegname = "PSEG_ROM" ident = "1" >
-            <vobj name = "boot_mapping"   type = "BLOB" length  = "0x00004000" binpath	= "map.bin" />
-        </vseg>
-
-*** On voudrait rÃ©pliquer le segment de code du systÃšme (seg_kernel_code) dans tous les clusters...
+
+*** Segments used by the boot code / A[31:28] = 0x0 / Identity mapping
+- seg_boot_mapping is loaded by the boot-loader. It contains the mapping info. The content is reused by the kernel.
+- seg_boot_code and seg_boot data are loaded by the preloader, used by the boot-loader The content is not reused by the kernel.
+- seg_boot_stack is contains the stacks used by all processors during reset and boot. The content is not reused by the Kernel.
+- seg_boot_buffer is used by the boot-loader. It can contain a complete .elf file. The content is not reused by the kernel.
+
+        <vseg name = "seg_boot_mapping"   vbase = "0x00000000" mode = "C_W_" x = "0" y = "0" psegname = "PSEG_RAM" ident = "1" >
+            <vobj name = "boot_mapping"   type = "BLOB"   length = "0x00010000" binpath	= "map.bin" />
+        </vseg>
+        <vseg name = "seg_boot_code"      vbase = "0x00010000" mode = "CXW_" x = "0" y = "0" psegname = "PSEG_RAM" ident = "1" >
+            <vobj name = "boot_code"      type = "BUFFER" length = "0x00020000" />
+        </vseg>
+        <vseg name = "seg_boot_data"      vbase = "0x00030000" mode = "C_W_" x = "0" y = "0" psegname = "PSEG_RAM" ident = "1" >
+            <vobj name = "boot_data"      type = "BUFFER" length = "0x00010000" />
+        </vseg>
+        <vseg name = "seg_boot_buffer"    vbase = "0x00040000" mode = "C_W_" x = "0" y = "0" psegname = "PSEG_RAM" ident = "1" >
+            <vobj name = "boot_buffer"    type = "BUFFER" length = "0x00020000" />
+        </vseg>
+        <vseg name = "seg_boot_stack"     vbase = "0x00060000" mode = "C_W_" x = "0" y = "0" psegname = "PSEG_RAM" ident = "1" >
+            <vobj name = "boot_stack"     type = "BUFFER" length = "0x00090000" />
+        </vseg>
+
+*** Segments used by the kernel / A[31:28] = 0x8 
   
-        <vseg name = "seg_kernel_code"    vbase = "0x80000000" mode = "CX__" clusterid = "0" psegname = "PSEG_RAM" > 
-            <vobj name = "kernel_code"    type = "ELF" length = "0x00010000" binpath = "build/sys/sys.elf" />
-        </vseg>
-        <vseg name = "seg_kernel_data"    vbase = "0x80010000" mode = "C_W_" clusterid = "0" psegname = "PSEG_RAM" > 
-            <vobj name = "kernel_data"    type = "ELF" length = "0x00040000" binpath = "build/sys/sys.elf" />
+        <vseg name = "seg_kernel_code"    vbase = "0x80000000" mode = "CXW_" x = "0" y = "0" psegname = "PSEG_RAM" > 
+            <vobj name = "kernel_code"    type = "ELF" length = "0x00020000" binpath = "build/kernel/kernel.elf" />
+        </vseg>
+        <vseg name = "seg_kernel_data"    vbase = "0x80020000" mode = "C_W_" x = "0" y = "0" psegname = "PSEG_RAM" > 
+            <vobj name = "kernel_data"    type = "ELF" length = "0x00060000" binpath = "build/kernel/kernel.elf" />
 		</vseg>
-        <vseg name = "seg_kernel_uncdata" vbase = "0x80080000" mode = "__W_" clusterid = "0" psegname = "PSEG_RAM" > 
-            <vobj name = "kernel_uncdata" type = "ELF" length = "0x00010000" binpath = "build/sys/sys.elf" />
-        </vseg>
-        <vseg name = "seg_kernel_init"    vbase = "0x80090000" mode = "CX__" clusterid = "0" psegname = "PSEG_RAM" > 
-            <vobj name	= "kernel_init"   type = "ELF" length = "0x00010000" binpath	= "build/sys/sys.elf" />
-        </vseg>
-
-*** Non replicated peripherals
-
-        <vseg name = "seg_ioc"            vbase = "0xBFF10000" mode = "__W_" clusterid = "2" psegname = "PSEG_IOC" ident = "1" >
+        <vseg name = "seg_kernel_uncdata" vbase = "0x80080000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_RAM" > 
+            <vobj name = "kernel_uncdata" type = "ELF" length = "0x00040000" binpath = "build/kernel/kernel.elf" />
+        </vseg>
+        <vseg name = "seg_kernel_init"    vbase = "0x800C0000" mode = "CXW_" x = "0" y = "0" psegname = "PSEG_RAM" > 
+            <vobj name = "kernel_init"    type = "ELF" length = "0x00010000" binpath = "build/kernel/kernel.elf" />
+        </vseg>
+
+*** Segments for non replicated peripherals / A[31:28] = 0xB / Identity mapping
+
+        <vseg name = "seg_fbf"            vbase = "0xB2000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_FBF" ident = "1" >
+            <vobj name = "fbf"            type = "PERI" length  = "0x00004000" /> 
+        </vseg>
+        <vseg name = "seg_ioc"            vbase = "0xB3000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_IOC" ident = "1" >
             <vobj name = "ioc"            type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_tty"            vbase = "0xBFF20000" mode = "__W_" clusterid = "2" psegname = "PSEG_TTY" ident = "1" >
+        <vseg name = "seg_tty"            vbase = "0xB4000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_TTY" ident = "1" >
    			<vobj name = "tty"            type = "PERI" length  = "0x00001000" />
         </vseg>
-        <vseg name = "seg_fbf"            vbase = "0xBFD00000" mode = "__W_" clusterid = "2" psegname = "PSEG_FBF" ident = "1" >
-            <vobj name = "fbf"            type = "PERI" length  = "0x00200000" /> 
-        </vseg>
-        <vseg name = "seg_nic"            vbase = "0xBFF80000" mode = "__W_" clusterid = "2" psegname = "PSEG_NIC" ident = "1" >
-            <vobj name = "nic"            type = "PERI" length  = "0x00021000" /> 
-        </vseg>
-
-*** On pourrait supprimer les vsegs associÃ©s aux composants XICU en les traitant comme les schedulers : 
-*** accÃšs en addresse physique et stockage de l'adresse de base de chaque XICU dans chaque processeur.
-*** On peut aussi dÃ©finir un vseg factorisÃ© en introduisant le CLUSTER_SIZE...
-
-        <vseg name = "seg_icu_0"          vbase = "0x00F00000" mode = "__W_" clusterid = "0" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_nic"            vbase = "0xB5000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_NIC" ident = "1" >
+            <vobj name = "nic"            type = "PERI" length  = "0x00080000" /> 
+        </vseg>
+        <vseg name = "seg_cma"            vbase = "0xB6000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_CMA" ident = "1" >
+            <vobj name = "cma"            type = "PERI" length  = "0x00008000" /> 
+        </vseg>
+        <vseg name = "seg_rom"            vbase = "0xBFC00000" mode = "CXW_" x = "0" y = "0" psegname = "PSEG_ROM" ident = "1" >
+            <vobj name = "rom"            type = "PERI" length  = "0x00004000" /> 
+        </vseg>
+
+*** Segments for replicated ICUS / A[31:24] = 0xB0 / Increment = 0x10000 / Identity mapping in cluster 0            
+
+        <vseg name = "seg_icu_0"          vbase = "0xB0000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_XCU" ident = "1" > 
             <vobj name = "icu_0"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_1"          vbase = "0x40F00000" mode = "__W_" clusterid = "1" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_icu_1"          vbase = "0xB0010000" mode = "__W_" x = "0" y = "1" psegname = "PSEG_XCU" > 
             <vobj name = "icu_1"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_2"          vbase = "0x80F00000" mode = "__W_" clusterid = "2" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_icu_2"          vbase = "0xB0100000" mode = "__W_" x = "1" y = "0" psegname = "PSEG_XCU" > 
             <vobj name = "icu_2"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
-        <vseg name = "seg_icu_3"          vbase = "0xC0F00000" mode = "__W_" clusterid = "3" psegname = "PSEG_XICU" > 
+        <vseg name = "seg_icu_3"          vbase = "0xB0110000" mode = "__W_" x = "1" y = "1" psegname = "PSEG_XCU" > 
             <vobj name = "icu_3"          type = "PERI" length  = "0x00001000" /> 
         </vseg>
 
-*** Il faudrait trouver un moyen de supprimer les vsegs associÃ©s aux composants DMA distribuÃ©s, ou de les factoriser...
-
-        <vseg name = "seg_dma_0"          vbase = "0x00F30000" mode = "__W_" clusterid = "0" psegname = "PSEG_DMA" >
+*** segments for replicated DMAs / A[31:24] = 0xB1 / Increment = 0x10000 / Tdentity mapping in cluster 0
+*** The peripheral type must be entirely defined by the 8 virtual address MSB bits (mask_type = 0xFF000000)
+*** The cluster id must be encoded in the next 8 virtual address bits (cluster_mask = 0x00FF0000)
+
+        <vseg name = "seg_dma_0"          vbase = "0xB1000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_DMA" ident = "1" >
             <vobj name = "dma_0"          type = "PERI" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_dma_1"          vbase = "0x40F30000" mode = "__W_" clusterid = "1" psegname = "PSEG_DMA" >
+        <vseg name = "seg_dma_1"          vbase = "0xB1010000" mode = "__W_" x = "0" y = "1" psegname = "PSEG_DMA" >
             <vobj name = "dma_1"          type = "PERI" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_dma_2"          vbase = "0x80F30000" mode = "__W_" clusterid = "2" psegname = "PSEG_DMA" >
+        <vseg name = "seg_dma_2"          vbase = "0xB1100000" mode = "__W_" x = "1" y = "0" psegname = "PSEG_DMA" >
             <vobj name = "dma_2"          type = "PERI" length  = "0x00008000" />
         </vseg>
-        <vseg name = "seg_dma_3"          vbase = "0xC0F30000" mode = "__W_" clusterid = "3" psegname = "PSEG_DMA" >
+        <vseg name = "seg_dma_3"          vbase = "0xB1110000" mode = "__W_" x = "1" y = "1" psegname = "PSEG_DMA" >
             <vobj name = "dma_3"          type = "PERI" length  = "0x00008000" />
+        </vseg>
+
+*** segments for replicated MMC / A[31:24] = 0xB8 / Increment = 0x10000 / Identity mapping in cluster 0
+*** The peripheral type must be entirely defined by the 8 virtual address MSB bits (mask_type = 0xFF000000)
+*** The cluster id must be encoded in the next 8 virtual address bits (cluster_mask = 0x00FF0000)
+
+        <vseg name = "seg_memc_0"         vbase = "0xB8000000" mode = "__W_" x = "0" y = "0" psegname = "PSEG_MMC" ident = "1" >
+            <vobj name = "memc_0"         type = "PERI" length  = "0x00001000" />
+        </vseg>
+        <vseg name = "seg_memc_1"         vbase = "0xB8010000" mode = "__W_" x = "0" y = "1" psegname = "PSEG_MMC" >
+            <vobj name = "memc_1"         type = "PERI" length  = "0x00001000" />
+        </vseg>
+        <vseg name = "seg_memc_2"         vbase = "0xB8100000" mode = "__W_" x = "1" y = "0" psegname = "PSEG_MMC" >
+            <vobj name = "memc_2"         type = "PERI" length  = "0x00001000" />
+        </vseg>
+        <vseg name = "seg_memc_3"         vbase = "0xB8110000" mode = "__W_" x = "1" y = "1" psegname = "PSEG_MMC" >
+            <vobj name = "memc_3"         type = "PERI" length  = "0x00001000" />
+        </vseg>
+
+*** segments for replicated schedulers / A[31:28] = 0xF / Increment = 0x10000
+*** The type must be entirely defined by the 8 virtual address MSB bits (mask_type = 0xFF000000)
+*** The cluster id must be encoded in the next 8 virtual address bits (cluster_mask = 0x00FF0000)
+
+        <vseg name = "seg_sched_0"        vbase = "0xF0000000" mode = "C_W_" x = "0" y = "0" psegname = "PSEG_RAM" >
+            <vobj name = "sched_0"        type = "SCHED" length  = "0x00008000" />
+        </vseg>
+        <vseg name = "seg_sched_1"        vbase = "0xF0010000" mode = "C_W_" x = "0" y = "1" psegname = "PSEG_RAM" >
+            <vobj name = "sched_1"        type = "SCHED" length  = "0x00008000" />
+        </vseg>
+        <vseg name = "seg_sched_2"        vbase = "0xF0100000" mode = "C_W_" x = "1" y = "0" psegname = "PSEG_RAM" >
+            <vobj name = "sched_2"        type = "SCHED" length  = "0x00008000" />
+        </vseg>
+        <vseg name = "seg_sched_3"        vbase = "0xF0110000" mode = "C_W_" x = "1" y = "1" psegname = "PSEG_RAM" >
+            <vobj name = "sched_3"        type = "SCHED" length  = "0x00008000" />
         </vseg>
 ***
@@ -170,94 +239,102 @@
 
     <vspaceset>
+
+*** For each vspace, the startname field is the name of the vobj containing the start_vector (entry point array)
+*** For each task, the startid field define the task entry point as an index in the start_vector
+*** For each task, the x,y and proclocid arguments define the task static placement
+*** For each task, the stackname field is the name of the vobj containing the task stack 
+*** For each task, the heapname field is the name of the vobj containing the task heap 
+
         <vspace name = "router" startname = "data" > 
-            <vseg name = "seg_data"        vbase = "0x00800000" mode = "__WU" clusterid = "0" psegname = "PSEG_RAM" >
+            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" x = "0" y = "0" psegname = "PSEG_RAM" > 
+                <vobj name = "code"        type	= "ELF" length = "0x00010000" binpath = "build/router/router.elf" /> 
+            </vseg>
+            <vseg name = "seg_data"        vbase = "0x00500000" mode = "__WU" x = "0" y = "0" psegname = "PSEG_RAM" >
                 <vobj name = "data"        type	= "ELF" length = "0x00010000" binpath = "build/router/router.elf" />
             </vseg>
-            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" clusterid = "0" psegname = "PSEG_RAM" > 
-                <vobj name = "code"        type	= "ELF" length = "0x00010000" binpath = "build/router/router.elf" /> 
-            </vseg>
-            <vseg name = "seg_ptab"        vbase = "0x00300000" mode = "C___" clusterid = "0" psegname = "PSEG_RAM" > 
+            <vseg name = "seg_ptab"        vbase = "0x00600000" mode = "C___" x = "0" y = "0" psegname = "PSEG_RAM" > 
                 <vobj name = "ptab"        type	= "PTAB" length  = "0x00012000" align   = "13" />
             </vseg>
-            <vseg name = "seg_stack_prod"  vbase = "0x00010000" mode = "C_WU" clusterid = "0" psegname = "PSEG_RAM" >
+            <vseg name = "seg_stack_prod"  vbase = "0x00700000" mode = "C_WU" x = "0" y = "0" psegname = "PSEG_RAM" >
                 <vobj name = "stack_prod"  type	= "BUFFER" length = "0x00010000" /> 
                 <vobj name = "heap_prod"   type	= "BUFFER" length = "0x00010000" /> 
             </vseg>
-            <vseg name = "seg_stack_cons"  vbase = "0x00030000" mode = "C_WU" clusterid = "1" psegname = "PSEG_RAM" > 
+            <vseg name = "seg_stack_cons"  vbase = "0x00800000" mode = "C_WU" x = "0" y = "1" psegname = "PSEG_RAM" > 
                 <vobj name = "stack_cons"  type	= "BUFFER" length = "0x00010000" />
                 <vobj name = "heap_cons"   type	= "BUFFER" length = "0x00010000" /> 
             </vseg>
-            <vseg name = "seg_stack_routA" vbase = "0x00050000" mode = "C_WU" clusterid = "2" psegname = "PSEG_RAM" > 
+            <vseg name = "seg_stack_routA" vbase = "0x00900000" mode = "C_WU" x = "1" y = "0" psegname = "PSEG_RAM" > 
                 <vobj name = "stack_routA" type	= "BUFFER" length = "0x00010000" />
                 <vobj name = "heap_routA"  type	= "BUFFER" length = "0x00010000" /> 
             </vseg>
-            <vseg name = "seg_stack_routB" vbase = "0x00070000" mode = "C_WU" clusterid = "3" psegname = "PSEG_RAM" > 
+            <vseg name = "seg_stack_routB" vbase = "0x00A00000" mode = "C_WU" x = "1" y = "1" psegname = "PSEG_RAM" > 
                 <vobj name = "stack_routB" type	= "BUFFER" length = "0x00010000" />
                 <vobj name = "heap_routB"  type	= "BUFFER" length = "0x00010000" /> 
             </vseg>
-            <vseg name = "seg_mwmrs"       vbase = "0x00090000" mode = "__WU" clusterid = "0" psegname = "PSEG_RAM" > 
+            <vseg name = "seg_mwmrs"       vbase = "0x00B00000" mode = "__WU" x = "0" y = "0" psegname = "PSEG_RAM" > 
                 <vobj name = "mwmr_in"     type = "MWMR" length = "0x00000020" init = "1" />
                 <vobj name = "mwmr_out"    type = "MWMR" length = "0x00000020" init = "1" />
 		    </vseg>
 
-            <task name = "producer" clusterid = "0" proclocid = "0" stackname = "stack_prod"  heapname = "heap_prod"  startid = "0" usetty = "1" />
-            <task name = "consumer" clusterid = "1" proclocid = "0" stackname = "stack_cons"  heapname = "heap_cons"  startid = "1" usetty = "1" />
-            <task name = "router_A" clusterid = "2" proclocid = "0" stackname = "stack_routA" heapname = "heap_routA" startid = "2" usetty = "1" />
-            <task name = "router_B" clusterid = "3" proclocid = "0" stackname = "stack_routB" heapname = "heap_routB" startid = "2" usetty = "1" />
+            <task name = "producer" x = "0" y = "0" proclocid = "0" stackname = "stack_prod"  heapname = "heap_prod"  startid = "0" usetty = "1" />
+            <task name = "consumer" x = "0" y = "1" proclocid = "0" stackname = "stack_cons"  heapname = "heap_cons"  startid = "1" usetty = "1" />
+            <task name = "router_A" x = "1" y = "0" proclocid = "0" stackname = "stack_routA" heapname = "heap_routA" startid = "2" usetty = "1" />
+            <task name = "router_B" x = "1" y = "0" proclocid = "0" stackname = "stack_routB" heapname = "heap_routB" startid = "2" usetty = "1" />
         </vspace>
 
         <vspace name = "hello" startname = "data" >
-            <vseg name = "seg_data"        vbase = "0x00800000" mode = "C_WU" clusterid = "1" psegname = "PSEG_RAM" >
+            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" x = "0" y = "1" psegname = "PSEG_RAM" > 
+                <vobj name = "code"	       type	= "ELF" length = "0x00010000" binpath = "build/hello/hello.elf" />
+            </vseg>
+            <vseg name = "seg_data"        vbase = "0x00500000" mode = "C_WU" x = "0" y = "1" psegname = "PSEG_RAM" >
                 <vobj name = "data"        type	= "ELF" length = "0x00010000" binpath = "build/hello/hello.elf" />
             </vseg>
-            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" clusterid = "1" psegname = "PSEG_RAM" > 
-                <vobj name = "code"	       type	= "ELF" length = "0x00010000" binpath = "build/hello/hello.elf" />
-            </vseg>
-            <vseg name = "seg_ptab"        vbase = "0x00300000" mode = "C___" clusterid = "1" psegname = "PSEG_RAM" >
+            <vseg name = "seg_ptab"        vbase = "0x00600000" mode = "C___" x = "0" y = "1" psegname = "PSEG_RAM" >
                 <vobj name = "ptab"        type	= "PTAB" length = "0x00012000" align = "13" /> 
             </vseg>
-            <vseg name = "seg_stack"       vbase = "0x00010000" mode = "C_WU" clusterid = "1" psegname = "PSEG_RAM" >
+            <vseg name = "seg_stack"       vbase = "0x00700000" mode = "C_WU" x = "0" y = "1" psegname = "PSEG_RAM" >
                 <vobj name = "stack"       type	= "BUFFER" length = "0x00010000" />
                 <vobj name = "heap"        type	= "BUFFER" length = "0x00010000" />
             </vseg>
 
-            <task name = "main_hello" clusterid = "1" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" />
+            <task name = "main_hello" x = "0" y = "1" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" />
         </vspace>
 
         <vspace name = "pgcd" startname = "data" >
-            <vseg name = "seg_data"        vbase = "0x00800000" mode = "C_WU" clusterid = "2" psegname = "PSEG_RAM" >
+            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" x = "1" y = "0" psegname = "PSEG_RAM" >
+                <vobj name = "code"        type = "ELF" length = "0x00010000" binpath = "build/pgcd/pgcd.elf" />
+            </vseg>
+            <vseg name = "seg_data"        vbase = "0x00500000" mode = "C_WU" x = "1" y = "0" psegname = "PSEG_RAM" >
                 <vobj name	= "data"       type	= "ELF" length = "0x00010000" binpath = "build/pgcd/pgcd.elf" />
             </vseg>
-            <vseg name = "seg_ptab"        vbase = "0x00300000" mode = "C___" clusterid = "2" psegname = "PSEG_RAM" >
+            <vseg name = "seg_ptab"        vbase = "0x00600000" mode = "C___" x = "1" y = "0" psegname = "PSEG_RAM" >
                 <vobj name = "ptab"        type	= "PTAB" length = "0x00012000" align = "13" />
             </vseg>
-            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" clusterid = "2" psegname = "PSEG_RAM" >
-                <vobj name = "code"        type = "ELF" length = "0x00010000" binpath = "build/pgcd/pgcd.elf" />
-            </vseg>
-            <vseg name = "seg_stack"       vbase = "0x00010000" mode = "C_WU" clusterid = "2" psegname = "PSEG_RAM" >
+            <vseg name = "seg_stack"       vbase = "0x00700000" mode = "C_WU" x = "1" y = "0" psegname = "PSEG_RAM" >
                 <vobj name = "stack"       type = "BUFFER" length = "0x00010000" /> 
                 <vobj name = "heap"        type = "BUFFER" length = "0x00010000" /> 
             </vseg>
 
-            <task name = "main_pgcd" clusterid = "2" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" />
+            <task name = "main_pgcd" x = "1" y = "0" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" />
         </vspace>
 
         <vspace name = "display" startname = "data" >
-            <vseg name = "seg_data"        vbase = "0x00800000" mode = "C_WU" clusterid = "3" psegname = "PSEG_RAM" >
+            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" x = "1" y = "1" psegname = "PSEG_RAM" >
+                <vobj name = "code"        type	= "ELF" length = "0x00010000" binpath = "build/display/display.elf" />
+            </vseg>
+            <vseg name = "seg_data"        vbase = "0x00500000" mode = "C_WU" x = "1" y = "1" psegname = "PSEG_RAM" >
                 <vobj name = "data"        type	= "ELF" length = "0x00010000" binpath = "build/display/display.elf" />
 			   </vseg>
-            <vseg name = "seg_ptab"        vbase = "0x00300000" mode = "C___" clusterid = "3" psegname = "PSEG_RAM" >
+            <vseg name = "seg_ptab"        vbase = "0x00600000" mode = "C___" x = "1" y = "1" psegname = "PSEG_RAM" >
                 <vobj name = "ptab"        type	= "PTAB" length  = "0x00012000" align   = "13" />
             </vseg>
-            <vseg name = "seg_code"        vbase = "0x00400000" mode = "CX_U" clusterid = "3" psegname = "PSEG_RAM" >
-                <vobj name = "code"        type	= "ELF" length = "0x00010000" binpath = "build/display/display.elf" />
-            </vseg>
-            <vseg name = "seg_stack"       vbase = "0x00010000" mode = "C_WU" clusterid = "3" psegname = "PSEG_RAM" >
+            <vseg name = "seg_stack"       vbase = "0x00700000" mode = "C_WU" x = "1" y = "1" psegname = "PSEG_RAM" >
                 <vobj name = "stack"       type	= "BUFFER" length = "0x00010000" />
                 <vobj name = "heap"        type	= "BUFFER" length = "0x00010000" />
             </vseg>
 
-            <task name = "main_display" clusterid = "3" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" usefbdma = "1" />
+            <task name = "main_display" x = "1" y = "1" proclocid = "0" stackname = "stack" heapname = "heap" startid = "0" usetty = "1" usecma = "1" />
         </vspace>
+
     </vspaceset>
 </mapping_info>
