Index: soft/giet_vm/giet_python/genmap
===================================================================
--- soft/giet_vm/giet_python/genmap	(revision 580)
+++ soft/giet_vm/giet_python/genmap	(revision 591)
@@ -30,12 +30,15 @@
 ###################################################################################
 # The supported applications are:
-# - sort 
-# - transpose
+# - classif
 # - convol 
-# - router 
-# - classif
+# - coproc
+# - dhrystone
 # - display
 # - gameoflife
-# - coproc
+# - ocean
+# - router 
+# - sort 
+# - shell
+# - transpose
 ###################################################################################
 
@@ -102,39 +105,47 @@
 ############  supported applications   ############################################
 
+parser.add_option( '--classif', action = 'store_true', dest = 'classif',     
+                   default = False,
+                   help = 'map the "classif" application for the GietVM' )
+
+parser.add_option( '--convol', action = 'store_true', dest = 'convol',     
+                   default = False,
+                   help = 'map the "convol" application for the GietVM' )
+
+parser.add_option( '--coproc', action = 'store_true', dest = 'coproc',     
+                   default = False,
+                   help = 'map the "coproc" application for the GietVM' )
+
+parser.add_option( '--dhrystone', action = 'store_true', dest = 'dhrystone',     
+                   default = False,
+                   help = 'map the "dhrystone" application for the GietVM' )
+
+parser.add_option( '--display', action = 'store_true', dest = 'display',     
+                   default = False,
+                   help = 'map the "display" application for the GietVM' )
+
+parser.add_option( '--gameoflife', action = 'store_true', dest = 'gameoflife',     
+                   default = False,
+                   help = 'map the "gameoflife" application for the GietVM' )
+
+parser.add_option( '--ocean', action = 'store_true', dest = 'ocean',     
+                   default = False,
+                   help = 'map the "ocean" application for the GietVM' )
+
+parser.add_option( '--router', action = 'store_true', dest = 'router',     
+                   default = False,
+                   help = 'map the "router" application for the GietVM' )
+
+parser.add_option( '--shell', action = 'store_true', dest = 'shell',     
+                   default = False,
+                   help = 'map the "shell" application for the GietVM' )
+
+parser.add_option( '--sort', action = 'store_true', dest = 'sort',     
+                   default = False,
+                   help = 'map the "sort" application for the GietVM' )
+
 parser.add_option( '--transpose', action = 'store_true', dest = 'transpose',
                    default = False,
                    help = 'map the "transpose" application for the GietVM' )
-
-parser.add_option( '--sort', action = 'store_true', dest = 'sort',     
-                   default = False,
-                   help = 'map the "sort" application for the GietVM' )
-
-parser.add_option( '--convol', action = 'store_true', dest = 'convol',     
-                   default = False,
-                   help = 'map the "convol" application for the GietVM' )
-
-parser.add_option( '--router', action = 'store_true', dest = 'router',     
-                   default = False,
-                   help = 'map the "router" application for the GietVM' )
-
-parser.add_option( '--display', action = 'store_true', dest = 'display',     
-                   default = False,
-                   help = 'map the "display" application for the GietVM' )
-
-parser.add_option( '--classif', action = 'store_true', dest = 'classif',     
-                   default = False,
-                   help = 'map the "classif" application for the GietVM' )
-
-parser.add_option( '--gameoflife', action = 'store_true', dest = 'gameoflife',     
-                   default = False,
-                   help = 'map the "gameoflife" application for the GietVM' )
-
-parser.add_option( '--coproc', action = 'store_true', dest = 'coproc',     
-                   default = False,
-                   help = 'map the "coproc" application for the GietVM' )
-
-parser.add_option( '--ocean', action = 'store_true', dest = 'ocean',     
-                   default = False,
-                   help = 'map the "ocean" application for the GietVM' )
 
 ###################################################################################
@@ -163,13 +174,15 @@
 xml_path       = options.xml_path    # path for map.xml file     
 
+map_classif    = options.classif     # map "classif" application if True
+map_convol     = options.convol      # map "convol" application if True
+map_coproc     = options.coproc      # map "coproc" application if True
+map_dhrystone  = options.dhrystone   # map "dhrystone" application if True
+map_display    = options.display     # map "display" application if True
+map_gameoflife = options.gameoflife  # map "gameoflife" application if True
+map_ocean      = options.ocean       # map "ocean" application if True
+map_router     = options.router      # map "router" application if True
+map_shell      = options.shell       # map "shell" application if True
+map_sort       = options.sort        # map "sort" application if True
 map_transpose  = options.transpose   # map "transpose" application if True
-map_sort       = options.sort        # map "sort" application if True
-map_convol     = options.convol      # map "convol" application if True
-map_router     = options.router      # map "router" application if True
-map_display    = options.display     # map "display" application if True
-map_classif    = options.classif     # map "classif" application if True
-map_gameoflife = options.gameoflife  # map "gameoflife" application if True
-map_coproc     = options.coproc      # map "coproc" application if True
-map_ocean      = options.ocean       # map "ocean" application if True
 
 ###################################################################################
@@ -192,51 +205,61 @@
 
 ###################################################################################
-#   complete mapping with application(s) as required
-###################################################################################
+#   extend mapping with application(s) as required
+###################################################################################
+
+if ( map_classif ):      
+    appli = __import__( 'classif' )
+    appli.extend( mapping )
+    print '[genmap] application "classif" will be loaded'
+
+if ( map_convol ):   
+    appli = __import__( 'convol' )
+    appli.extend( mapping )
+    print '[genmap] application "convol" will be loaded'
+
+if ( map_coproc ):
+    appli = __import__( 'coproc' )
+    appli.extend( mapping )
+    print '[genmap] application "coproc" will be loaded'
+
+if ( map_dhrystone ):      
+    appli = __import__( 'dhrystone' )
+    appli.extend( mapping )
+    print '[genmap] application "dhrystone" will be loaded'
+
+if ( map_display ):      
+    appli = __import__( 'display' )
+    appli.extend( mapping )
+    print '[genmap] application "display" will be loaded'
+
+if ( map_gameoflife ):
+    appli = __import__( 'gameoflife' )
+    appli.extend( mapping )
+    print '[genmap] application "gameoflife" will be loaded'
+
+if ( map_ocean ):
+    appli = __import__( 'ocean' )
+    appli.extend( mapping )
+    print '[genmap] application "ocean" will be loaded'
+
+if ( map_router ):      
+    appli = __import__( 'router' )
+    appli.extend( mapping )
+    print '[genmap] application "router" will be loaded'
+
+if ( map_shell ):
+    appli = __import__( 'shell' )
+    appli.extend( mapping )
+    print '[geneap] application "shell" will be loaded'
+
+if ( map_sort ):      
+    appli = __import__( 'sort' )
+    appli.extend( mapping )
+    print '[genmap] application "sort" will be loaded'
 
 if ( map_transpose ):
-    app = __import__( 'transpose' )
-    app.transpose( mapping )
+    appli = __import__( 'transpose' )
+    appli.extend( mapping )
     print '[genmap] application "transpose" will be loaded'
-
-if ( map_sort ):      
-    app = __import__( 'sort' )
-    app.sort( mapping )
-    print '[genmap] application "sort" will be loaded'
-
-if ( map_convol ):      
-    app = __import__( 'convol' )
-    app.convol( mapping )
-    print '[genmap] application "convol" will be loaded'
-
-if ( map_router ):      
-    app = __import__( 'router' )
-    app.router( mapping )
-    print '[genmap] application "router" will be loaded'
-
-if ( map_display ):      
-    app = __import__( 'display' )
-    app.display( mapping )
-    print '[genmap] application "display" will be loaded'
-
-if ( map_classif ):      
-    app = __import__( 'classif' )
-    app.classif( mapping )
-    print '[genmap] application "classif" will be loaded'
-
-if ( map_gameoflife ):
-    app = __import__( 'gameoflife' )
-    app.gameoflife( mapping )
-    print '[genmap] application "gameoflife" will be loaded'
-
-if ( map_coproc ):
-    app = __import__( 'coproc' )
-    app.coproc( mapping )
-    print '[genmap] application "coproc" will be loaded'
-
-if ( map_ocean ):
-    app = __import__( 'ocean' )
-    app.ocean( mapping )
-    print '[genmap] application "ocean" will be loaded'
 
 ###################################################################################