Changeset 738 for branches/fault_tolerance/platforms/tsar_generic_iob/arch.py

Timestamp:

Jul 4, 2014, 4:27:51 PM (10 years ago)

Author:

cfuguet

Message:

fault_tolerance/tsar_generic_iob:

• Merging arch.py from trunk
• Erasing compilation defined variable for activation of distributed boot. Using instead an environment variable: DISTRIBUTED_BOOT.

File:

• branches/fault_tolerance/platforms/tsar_generic_iob/arch.py (modified) (6 diffs)

branches/fault_tolerance/platforms/tsar_generic_iob/arch.py

@@ -12 +12 @@
 #  physical space segmentation) and the mapping of all kernel objects (global vsegs).
 #  This platform includes 6 external peripherals, accessible through two IO_Bridge
-# components located in cluster [0,0] and cluster [x_size-1, y_size-1].
-# Available peripherals are: TTY, BDV, FBF, ROM, NIC, CMA.
+#  components located in cluster [0,0] and cluster [x_size-1, y_size-1].
+#  Available peripherals are: TTY, BDV, FBF, ROM, NIC, CMA.
 #
 #  The "constructor" parameters are:
@@ -41 +41 @@
     ### define architecture constants
 
-    distptabs      = 1
-    nb_ttys        = 1
-    nb_nics        = 2
-    fbf_width      = 1024
-    x_io           = 0
-    y_io           = 0
-    x_width        = 4
-    y_width        = 4
-    paddr_width    = 40
-    irq_per_proc   = 4
-    use_ramdisk    = False
-    peri_increment = 0x10000
+    nb_ttys           = 1
+    nb_nics           = 2
+    fbf_width         = 1024
+    x_io              = 0
+    y_io              = 0
+    x_width           = 4
+    y_width           = 4
+    paddr_width       = 40
+    irq_per_proc      = 4
+    use_ramdisk       = False
+    peri_increment    = 0x10000
+    distributed_ptabs = True
 
     ### parameters checking
@@ -161 +161 @@
                        x_io           = x_io,
                        y_io           = y_io,
-                       peri_increment = peri_increment )
+                       peri_increment = peri_increment,
+                       ram_base       = ram_base,
+                       ram_size       = ram_size )
 
     ###  external peripherals (accessible in cluster[0,0] only for this mapping)
@@ -241 +243 @@
     ### global vsegs for kernel
 
-    if distptabs:
+    if distributed_ptabs:
         for x in xrange( x_size ):
             for y in xrange( y_size ):
@@ -291 +293 @@
                        vtype = 'PERI', x = 0, y = 0, pseg = 'PIC', identity = True )
 
-    ### Global vsegs for replicated peripherals, and for schedulers
-    ### name is indexed by (x,y), base address is incremented by (cluster_xy * peri_increment)
+    ### global vsegs for internal peripherals, and for schedulers
+    ### name is indexed by (x,y) / vbase address is incremented by (cluster_xy * peri_increment)
 
     for x in xrange( x_size ):
@@ -322 +324 @@
 if __name__ == '__main__':
 
-    mapping = genmap( x_size    = 2,
-                      y_size    = 2,
-                      nb_procs  = 2,
-                      nb_ttys   = 1,
-                      nb_nics   = 2,
-                      fbf_width = 128,
-                      x_io      = 0,
-                      y_io      = 0 )
+    mapping = arch( x_size    = 2,
+                    y_size    = 2,
+                    nb_procs  = 2 )
 
 #   print mapping.netbsd_dts()