Changeset 734

Timestamp:

Jul 3, 2014, 6:04:16 PM (11 years ago)

Author:

alain

Message:

The RAM size (in each cluster) is now defined as a parameter
in the arch.py file (not anymore as a define in the top.cpp).

Location:

trunk/platforms/tsar_generic_iob

Files:

• arch.py (modified) (3 diffs)
• top.cpp (modified) (1 diff)

trunk/platforms/tsar_generic_iob/arch.py

@@ -41 +41 @@
     ### define architecture constants
 
-    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
@@ -158 +159 @@
                        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)
@@ -240 +243 @@
                        identity = True )
 
-    ### local global vsegs for kernel / same virtual address / different physical address
-
-    for x in xrange( x_size ):
-        for y in xrange( y_size ):
-            cluster_xy = (x << y_width) + y;
-
-            mapping.addGlobal( 'seg_kernel_code', kernel_code_vbase, kernel_code_size,
-                               'CXW_', vtype = 'ELF', x = x , y = y , pseg = 'RAM',
-                               binpath = 'build/kernel/kernel.elf', local = True )
-
-            mapping.addGlobal( 'seg_kernel_init', kernel_init_vbase, kernel_init_size,
-                               'CXW_', vtype = 'ELF', x = x , y = y , pseg = 'RAM',
-                               binpath = 'build/kernel/kernel.elf', local = True )
+    ### the code global vsegs for kernel can be replicated in all clusters 
+    ### if the page tables are distributed in all clusters.
+
+    if distributed_ptabs:
+        for x in xrange( x_size ):
+            for y in xrange( y_size ):
+                cluster_xy = (x << y_width) + y;
+
+                mapping.addGlobal( 'seg_kernel_code', kernel_code_vbase, kernel_code_size,
+                                   'CXW_', vtype = 'ELF', x = x , y = y , pseg = 'RAM',
+                                   binpath = 'build/kernel/kernel.elf', local = True )
+
+                mapping.addGlobal( 'seg_kernel_init', kernel_init_vbase, kernel_init_size,
+                                   'CXW_', vtype = 'ELF', x = x , y = y , pseg = 'RAM',
+                                   binpath = 'build/kernel/kernel.elf', local = True )
+    else:
+        mapping.addGlobal( 'seg_kernel_code', kernel_code_vbase, kernel_code_size,
+                           'CXW_', vtype = 'ELF', x = 0 , y = 0 , pseg = 'RAM',
+                            binpath = 'build/kernel/kernel.elf', local = False )
+
+        mapping.addGlobal( 'seg_kernel_init', kernel_init_vbase, kernel_init_size,
+                           'CXW_', vtype = 'ELF', x = 0 , y = 0 , pseg = 'RAM',
+                           binpath = 'build/kernel/kernel.elf', local = False )
 
     ### shared global vsegs for kernel

trunk/platforms/tsar_generic_iob/top.cpp

@@ -234 +234 @@
 /////////////////////////////////////////////////////////
 
-// Replicated RAMs : address is incremented by a cluster offset
-//     offset  = cluster(x,y) << (address_width-x_width-y_width);
-
-#define SEG_RAM_BASE          0x0000000000
-#define SEG_RAM_SIZE          0x0004000000   // 64 Mbytes
+// All physical segments base addresses and sizes are defined
+// in the hard_config.h file. For replicated segments, the
+// base address is incremented by a cluster offset:
+// offset  = cluster(x,y) << (address_width-x_width-y_width);
 
 ////////////////////////////////////////////////////////////////////////