Changeset 825


Ignore:
Timestamp:
Oct 1, 2014, 11:30:41 AM (8 years ago)
Author:
cfuguet
Message:

tsar_generic_leti: bugfixes in the GIET-VM part of the arch.py

  • Flags in the kernel_data segment must be the same than kernel_code and kernel_init because they share the same big page.
  • Remove unused soclib.conf file
Location:
trunk/platforms/tsar_generic_leti
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_leti/arch.py

    r822 r825  
    158158    kernel_data_size     = 0x00100000      # 1 Mbytes in cluster[0][0]
    159159
    160     kernel_ptab_vbase    = 0xB0000000
     160    kernel_uncdata_vbase = 0x80200000
     161    kernel_uncdata_size  = 0x00001000      # 4 Kbytes
     162
     163    kernel_sched_vbase   = 0x80400000            # distributed in all clusters
     164    kernel_sched_size    = 0x00002000 * nb_procs # 8 kbytes per processor
     165
     166    kernel_ptab_vbase    = 0xC0000000
    161167    kernel_ptab_size     = 0x00200000      # 2 Mbytes per cluster
    162 
    163     kernel_uncdata_vbase = 0x90000000
    164     kernel_uncdata_size  = 0x00001000      # 4 Kbytes
    165 
    166     kernel_sched_vbase   = 0xA0000000            # distributed in all clusters
    167     kernel_sched_size    = 0x00002000 * nb_procs # 8 kbytes per processor
    168168
    169169    ### create mapping
     
    267267    for x in xrange( x_size ):
    268268        for y in xrange( y_size ):
    269             cluster_xy = (x << y_width) + y;
    270 
    271269            mapping.addGlobal( 'seg_kernel_code', kernel_code_vbase, kernel_code_size,
    272270                               'CXW_', vtype = 'ELF', x = x, y = y, pseg = 'RAM',
     
    282280    ### Only mapped in cluster[0][0]
    283281    mapping.addGlobal( 'seg_kernel_data', kernel_data_vbase, kernel_data_size,
    284                        'C_W_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
    285                        binpath = 'build/kernel/kernel.elf', local = False )
     282                       'CXW_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
     283                       binpath = 'build/kernel/kernel.elf',
     284                       local = False, big = True )
    286285
    287286    ### global vseg kernel_uncdata: non local / small page
     
    289288    mapping.addGlobal( 'seg_kernel_uncdata', kernel_uncdata_vbase, kernel_uncdata_size,
    290289                       '__W_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
    291                        binpath = 'build/kernel/kernel.elf', local = False )
     290                       binpath = 'build/kernel/kernel.elf',
     291                       local = False, big = False )
    292292
    293293    for x in xrange( x_size ):
     
    307307            ### as vbase address is incremented by (cluster_xy * vseg_increment)
    308308            offset = cluster_xy * sched_increment
    309             mapping.addGlobal( 'seg_kernel_sched_%d_%d' %(x,y), kernel_sched_vbase + offset , kernel_sched_size,
     309            mapping.addGlobal( 'seg_kernel_sched_%d_%d' %(x,y), kernel_sched_vbase + offset, kernel_sched_size,
    310310                               'C_W_', vtype = 'SCHED', x = x, y = y, pseg = 'RAM',
    311311                               local = False, big = False )
Note: See TracChangeset for help on using the changeset viewer.