Changeset 943 for trunk/platforms

Timestamp:

Feb 14, 2015, 5:22:08 PM (9 years ago)

Author:

alain

Message:

Remove vobj from mapping_info, and remove seg_kernel_uncdata.

Location:

trunk/platforms/tsar_generic_iob

Files:

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

trunk/platforms/tsar_generic_iob/arch.py

@@ -83 +83 @@
              or (y_size == 8) or (y_size == 16) )
 
-    assert( (nb_ttys >= 1) and (nb_ttys <= 16) )
+    assert( (nb_ttys >= 1) and (nb_ttys <= 8) )
 
     assert( ((x_io == 0) and (y_io == 0)) or
@@ -280 +280 @@
                 mapping.addIrq( pic, index = 22, isrtype = 'ISR_TTY_RX', channel = 6 )
                 mapping.addIrq( pic, index = 23, isrtype = 'ISR_TTY_RX', channel = 7 )
-                mapping.addIrq( pic, index = 24, isrtype = 'ISR_TTY_RX', channel = 8 )
-                mapping.addIrq( pic, index = 25, isrtype = 'ISR_TTY_RX', channel = 9 )
-                mapping.addIrq( pic, index = 26, isrtype = 'ISR_TTY_RX', channel = 10 )
-                mapping.addIrq( pic, index = 27, isrtype = 'ISR_TTY_RX', channel = 11 )
-                mapping.addIrq( pic, index = 28, isrtype = 'ISR_TTY_RX', channel = 12 )
-                mapping.addIrq( pic, index = 29, isrtype = 'ISR_TTY_RX', channel = 13 )
-                mapping.addIrq( pic, index = 30, isrtype = 'ISR_TTY_RX', channel = 14 )
-                mapping.addIrq( pic, index = 31, isrtype = 'ISR_TTY_RX', channel = 15 )
 
 
@@ -313 +305 @@
                        'CXW_', vtype = 'BUFFER', x = 0, y = 0, pseg = 'RAM',
                        identity = True , local = False, big = True )
+
+    ### global vseg kernel_data : big / non local
+    ### Only mapped in cluster[0][0]
+    mapping.addGlobal( 'seg_kernel_data', kernel_data_vbase, kernel_data_size, 
+                       'CXW_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
+                       binpath = 'build/kernel/kernel.elf', 
+                       local = False, big = True )
 
     ### global vsegs kernel_code, kernel_init : big / local
@@ -337 +336 @@
                                'CXW_', vtype = 'PTAB', x = x, y = y, pseg = 'RAM', 
                                local = False , big = True )
-
-    ### global vseg kernel_data : big / non local
-    ### Only mapped in cluster[0][0]
-    mapping.addGlobal( 'seg_kernel_data', kernel_data_vbase, kernel_data_size, 
-                       'CXW_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
-                       binpath = 'build/kernel/kernel.elf', 
-                       local = False, big = True )
-
-    ### global vseg kernel_uncdata : small / non local
-    ### Only mapped in cluster[0][0]
-    mapping.addGlobal( 'seg_kernel_uncdata', kernel_uncdata_vbase, kernel_uncdata_size,
-                       '__W_', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM', 
-                       binpath = 'build/kernel/kernel.elf', 
-                       local = False, big = False )
 
     ### global vsegs kernel_sched_x_y : small / non local

trunk/platforms/tsar_generic_iob/top.cpp

@@ -1431 +1431 @@
 
         // Monitor a specific address for one L1 cache
-        // clusters[0][0]->proc[0]->cache_monitor(0xC0180ULL);
+        // clusters[0][0]->proc[0]->cache_monitor(0x600800ULL);
 
         // Monitor a specific address for one L2 cache
-        // clusters[0][0]->memc->cache_monitor( 0x0ULL, true );   // one word
+        // clusters[0][0]->memc->cache_monitor( 0x600800ULL, false );   // full line
 
         // Monitor a specific address for one XRAM
-        // clusters[0][0]->xram->start_monitor( 0x0ULL , 64);
+        // clusters[0][0]->xram->start_monitor( 0x600800ULL , 64);
 
         if ( debug_ok and (n > debug_from) )