Index: soft/giet_vm/map.xml
===================================================================
--- soft/giet_vm/map.xml	(revision 167)
+++ soft/giet_vm/map.xml	(revision 169)
@@ -5,12 +5,12 @@
                 clusters = "1"
                 psegs    = "9"
-                ttys     = "8"
-                fbs      = "0"
-                vspaces  = "4" 
+                ttys     = "2"
+                fbs      = "1"
+                vspaces  = "1" 
                 globals  = "13" >
 
         <clusterset>
                 <cluster index  = "0"
-                         procs  = "4" />
+                         procs  = "2" />
         </clusterset>
 
@@ -139,5 +139,5 @@
     					<vobj   name	= "tty"
 	    						type	= "PERI"
-		    					length  = "0x00001000" />
+		    					length  = "0x00000100" />
 				</vseg>
 
@@ -149,5 +149,5 @@
     					<vobj   name	= "timer"
 	    						type	= "PERI"
-		    					length  = "0x00001000" />
+		    					length  = "0x00000080" />
 				</vseg>
 
@@ -169,5 +169,5 @@
     					<vobj   name	= "dma"
 	    						type	= "PERI"
-		    					length  = "0x00001000" />
+		    					length  = "0x00000100" />
 				</vseg>
 
@@ -194,135 +194,15 @@
 
           <vspaceset>
-                <vspace name      = "router"
-                        startname = "seg_data_router" >
-
-                        <vseg   name      = "seg_data_router"
+                <vspace name      = "display" 
+                        startname = "seg_data_display" >
+
+                        <vseg   name      = "seg_data_display"
                                 vbase     = "0x00800000" 
-                                mode      = "__WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_data_router"
-								    	type	= "ELF"
-					    				length  = "0x00010000" 
-                                        binpath = "build/router.elf" />
-						</vseg>
-
-                        <vseg   name      = "seg_code_router"
-                                vbase     = "0x00400000" 
-                                mode      = "CX_U"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_code_router"
+                                mode      = "C_WU"
+                                psegname  = "PSEG_RAU" >
+							    <vobj   name	= "seg_data_display"
 								    	type	= "ELF"
 									    length  = "0x00010000" 
-                                        binpath = "build/router.elf" />
-						</vseg>
-
-                        <vseg   name      = "seg_ptab"
-                                vbase     = "0x00300000" 
-                                mode      = "C___"
-                                psegname  = "PSEG_RAU" >
-                                <vobj   name	= "ptab_router"
-                                        type	= "PTAB"
-                                        length  = "0x00012000" 
-                                        align   = "13" />
-                        </vseg>
-
-                        <vseg   name      = "seg_stack_producer"
-				                vbase     = "0x00010000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "stack_producer"
-								    	type	= "BUFFER"
-									    length  = "0x00010000" />
-						</vseg>
-
-                        <vseg   name      = "seg_stack_consumer"
-				                vbase     = "0x00020000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "stack_consumer"
-								    	type	= "BUFFER"
-									    length  = "0x00010000" />
-						</vseg>
-
-                        <vseg   name      = "seg_stack_router_A"
-                				vbase     = "0x00030000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "stack_router_A"
-								    	type	= "BUFFER"
-									    length  = "0x00010000" />
-						</vseg>
-
-                        <vseg   name      = "seg_stack_router_B"
-				                vbase     = "0x00040000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "stack_router_B"
-								    	type	= "BUFFER"
-									    length  = "0x00010000" />
-						</vseg>
-
-                        <vseg   name      = "seg_mwmr_channels"
-                                vbase     = "0x00050000"
-                                mode      = "__WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "mwmr_in"
-								    	type	= "MWMR"
-									    length  = "0x00000020" />
-							    <vobj   name	= "mwmr_out"
-								    	type	= "MWMR"
-									    length  = "0x00000020" />
-						</vseg>
-
-                        <task   name      = "producer"
-                                clusterid = "0"
-                                proclocid = "0"
-                                stackname = "stack_producer"
-                                startid   = "0"
-                                usetty    = "1" />
-
-                        <task   name      = "consumer"
-                                clusterid = "0"
-                                proclocid = "1"
-                                stackname = "stack_consumer"
-                                startid   = "1" 
-                                usetty    = "1" />
-
-                        <task   name      = "router_A"
-                                clusterid = "0"
-                                proclocid = "2"
-                                stackname = "stack_router_A"
-                                startid   = "2"
-                                usetty    = "1" />
-
-                        <task   name      = "router_B"
-                                clusterid = "0"
-                                proclocid = "3"
-                                stackname = "stack_router_B"
-                                startid   = "2"
-                                usetty    = "1" />
-                </vspace>
-
-                <vspace name      = "hello" 
-                        startname = "seg_data_hello" >
-
-                        <vseg   name      = "seg_data_hello"
-                                vbase     = "0x00800000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_data_hello"
-								    	type	= "ELF"
-									    length    = "0x00010000" 
-                                        binpath = "build/hello.elf" />
-						</vseg>
-
-                        <vseg   name      = "seg_code_hello"
-                                vbase     = "0x00400000" 
-                                mode      = "CX_U"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_code_hello"
-								    	type	= "ELF"
-									    length    = "0x00010000" 
-                                        binpath = "build/hello.elf" />
+                                        binpath = "build/display.elf" />
 						</vseg>
 
@@ -337,95 +217,4 @@
                         </vseg>
 
-                        <vseg   name      = "seg_stack"
-                                vbase     = "0x00000000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "stack"
-								    	type	= "BUFFER"
-									    length  = "0x00010000" />
-						</vseg>
-
-
-                        <task   name      = "main_hello"
-                                clusterid = "0"
-                                proclocid = "2"
-                                stackname = "stack"
-                                startid   = "0" 
-                                usetty    = "1" />
-                </vspace>
-
-                <vspace name      = "pgcd" 
-                        startname = "seg_data_pgcd" >
-
-                        <vseg   name      = "seg_data_pgcd"
-                                vbase     = "0x00800000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_data_pgcd"
-								    	type	= "ELF"
-									    length  = "0x00010000" 
-                                        binpath = "build/pgcd.elf" />
-						</vseg>
-
-                        <vseg   name      = "seg_ptab"
-                                vbase     = "0x00300000" 
-                                mode      = "C___"
-                                psegname  = "PSEG_RAU" >
-                                <vobj   name	= "ptab"
-                                        type	= "PTAB"
-                                        length  = "0x00012000" 
-                                        align   = "13" />
-                        </vseg>
-
-                        <vseg   name      = "seg_code_pgcd"
-                                vbase     = "0x00400000" 
-                                mode      = "CX_U"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_code_pgcd"
-								    	type	= "ELF"
-									    length  = "0x00010000" 
-                                        binpath = "build/pgcd.elf" />
-						</vseg>
-
-                        <vseg   name      = "seg_stack"
-                                vbase     = "0x00000000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "stack"
-								    	type	= "BUFFER"
-									    length  = "0x00010000" />
-						</vseg>
-
-                        <task   name      = "main_pgcd"
-                                clusterid = "0"
-                                proclocid = "3"
-                                stackname = "stack"
-                                startid   = "0" 
-                                usetty    = "1" />
-                </vspace>
-
-                <vspace name      = "display" 
-                        startname = "seg_data_display" >
-
-                        <vseg   name      = "seg_data_display"
-                                vbase     = "0x00800000" 
-                                mode      = "C_WU"
-                                psegname  = "PSEG_RAU" >
-							    <vobj   name	= "seg_data_display"
-								    	type	= "ELF"
-									    length  = "0x00010000" 
-                                        binpath = "build/display.elf" />
-						</vseg>
-
-                        <vseg   name      = "seg_ptab_display"
-                                vbase     = "0x00300000" 
-                                mode      = "C___"
-                                psegname  = "PSEG_RAU" >
-                                <vobj   name	= "ptab"
-                                        type	= "PTAB"
-                                        length  = "0x00012000" 
-                                        align   = "13" />
-                        </vseg>
-
                         <vseg   name      = "seg_code_display"
                                 vbase     = "0x00400000" 
@@ -449,8 +238,9 @@
                         <task   name      = "main_display"
                                 clusterid = "0"
-                                proclocid = "3"
+                                proclocid = "1"
                                 stackname = "stack_display"
                                 startid   = "0" 
-                                usetty    = "1" />
+                                usetty    = "1"
+                                usefb     = "1" />
                 </vspace>
 
