Changeset 477

Timestamp:

Jan 1, 2015, 6:46:46 PM (9 years ago)

Author:

alain

Message:

Cosmetic: simplify the map.bin file checking.

File:

• soft/giet_vm/giet_boot/boot.c (modified) (4 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -172 +172 @@
 __attribute__((section (".bootdata"))) 
 unsigned int           _tty_rx_full[NB_TTY_CHANNELS];
+#if BOOT_DEBUG_MAPPING
+unsigned int  word;
+unsigned int  line;
+unsigned int* pointer = (unsigned int*)SEG_BOOT_MAPPING_BASE;
+_puts("\n[BOOT] First block of mapping");
+for ( line = 0 ; line < 8 ; line++ )
+{
+    for ( word = 0 ; word < 8 ; word++ )
+    {
+        _puts(" | ");
+        _putx( *(pointer + word) );
+    }
+    _puts(" |\n");
+    pointer = pointer + 8;
+}
+#endif
 
 __attribute__((section (".bootdata"))) 
@@ -178 +194 @@
 
 
-/////////////////////////////////////////////////////////////////////
-// This function checks consistence beween the  mapping_info data 
-// structure (soft), and the giet_config file (hard).
-/////////////////////////////////////////////////////////////////////
-void boot_mapping_check() 
-{
-    mapping_header_t * header = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
-
-    // checking mapping availability
-    if (header->signature != IN_MAPPING_SIGNATURE) 
-    {
-        _puts("\n[BOOT ERROR] Illegal mapping signature: ");
-        _putx(header->signature);
-        _puts("\n");
-        _exit();
-    }
-
-    // checking number of clusters
-    if ( (header->x_size  != X_SIZE)  || 
-         (header->y_size  != Y_SIZE)  ||
-         (header->x_width != X_WIDTH) ||
-         (header->y_width != Y_WIDTH) )
-    {
-        _puts("\n[BOOT ERROR] Incoherent X_SIZE or Y_SIZE ");
-        _puts("\n             - In hard_config:  X_SIZE = ");
-        _putd( X_SIZE );
-        _puts(" / Y_SIZE = ");
-        _putd( Y_SIZE );
-        _puts(" / X_WIDTH = ");
-        _putd( X_WIDTH );
-        _puts(" / Y_WIDTH = ");
-        _putd( Y_WIDTH );
-        _puts("\n             - In mapping_info: x_size = ");
-        _putd( header->x_size );
-        _puts(" / y_size = ");
-        _putd( header->y_size );
-        _puts(" / x_width = ");
-        _putd( header->x_width );
-        _puts(" / y_width = ");
-        _putd( header->y_width );
-        _puts("\n");
-        _exit();
-    }
-    // checking number of virtual spaces
-    if (header->vspaces > GIET_NB_VSPACE_MAX) 
-    {
-        _puts("\n[BOOT ERROR] : number of vspaces > GIET_NB_VSPACE_MAX\n");
-        _puts("\n");
-        _exit();
-    }
-
-#if BOOT_DEBUG_MAPPING
-_puts("\n - x_size    = ");
-_putd( header->x_size );
-_puts("\n - y_size    = ");
-_putd( header->y_size );
-_puts("\n - procs     = ");
-_putd( header->procs );
-_puts("\n - periphs   = ");
-_putd( header->periphs );
-_puts("\n - vspaces   = ");
-_putd( header->vspaces );
-_puts("\n - tasks     = ");
-_putd( header->tasks );
-_puts("\n");
-_puts("\n - size of header  = ");
-_putd( MAPPING_HEADER_SIZE );
-_puts("\n - size of cluster = ");
-_putd( MAPPING_CLUSTER_SIZE );
-_puts("\n - size of pseg    = ");
-_putd( MAPPING_PSEG_SIZE );
-_puts("\n - size of proc    = ");
-_putd( MAPPING_PROC_SIZE );
-_puts("\n - size of vspace  = ");
-_putd( MAPPING_VSPACE_SIZE );
-_puts("\n - size of vseg    = ");
-_putd( MAPPING_VSEG_SIZE );
-_puts("\n - size of vobj    = ");
-_putd( MAPPING_VOBJ_SIZE );
-_puts("\n - size of task    = ");
-_putd( MAPPING_TASK_SIZE );
-_puts("\n");
-
-unsigned int cluster_id;
-mapping_cluster_t * cluster = _get_cluster_base(header);
-for( cluster_id = 0; cluster_id < X_SIZE*Y_SIZE ; cluster_id++) 
-{
-    _puts("\n - cluster[");
-    _putd( cluster[cluster_id].x );
-    _puts(",");
-    _putd( cluster[cluster_id].y );
-    _puts("]\n   procs   = ");
-    _putd( cluster[cluster_id].procs );
-    _puts("\n   psegs   = ");
-    _putd( cluster[cluster_id].psegs );
-    _puts("\n   periphs = ");
-    _putd( cluster[cluster_id].periphs );
-    _puts("\n");
-}
-#endif
-
-} // end boot_mapping_check()
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1618 +1532 @@
     }
 
+#if BOOT_DEBUG_MAPPING
+_puts("\n[BOOT] map.bin buffer pbase = ");
+_putx( SEG_BOOT_MAPPING_BASE );
+_puts(" / buffer size = ");
+_putx( SEG_BOOT_MAPPING_SIZE );
+_puts(" / file size = ");
+_putx( size );
+_puts("\n");
+#endif
+
     // load "map.bin" file into buffer
     unsigned int nblocks = size >> 9;
@@ -1633 +1557 @@
         _exit();
     }
+
+#if BOOT_DEBUG_MAPPING
+_puts("\n[BOOT] map.bin file successfully loaded at cycle ");
+_putd(_get_proctime());
+_puts("\n");
+#endif
+
+    // check mapping signature, number of clusters, number of vspaces  
+    mapping_header_t * header = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
+    if ( (header->signature != IN_MAPPING_SIGNATURE) ||
+         (header->x_size    != X_SIZE)               || 
+         (header->y_size    != Y_SIZE)               ||
+         (header->vspaces   > GIET_NB_VSPACE_MAX)    )
+    {
+
+#if BOOT_DEBUG_MAPPING
+unsigned int  word;
+unsigned int  line;
+unsigned int* pointer = (unsigned int*)SEG_BOOT_MAPPING_BASE;
+_puts("\n[BOOT] First block of mapping\n");
+for ( line = 0 ; line < 8 ; line++ )
+{
+    for ( word = 0 ; word < 8 ; word++ )
+    {
+        _puts(" | ");
+        _putx( *(pointer + word) );
+    }
+    _puts(" |\n");
+    pointer = pointer + 8;
+}
+#endif
+        _puts("\n[BOOT ERROR] Illegal mapping signature: ");
+        _putx(header->signature);
+        _puts("\n");
+        _exit();
+    }
+
+#if BOOT_DEBUG_MAPPING
+_puts("\n[BOOT] map.bin file checked at cycle ");
+_putd(_get_proctime());
+_puts("\n");
+#endif
+
+    // close file "map.bin"
     _fat_close( fd_id );
     
-    // close file "map.bin"
-    boot_mapping_check();
-
 } // end boot_mapping_init()