Changeset 163 for soft/giet_vm/boot/boot_handler.c

Timestamp:

Jun 21, 2012, 2:47:19 PM (12 years ago)

Author:

karaoui

Message:

changing mover to memo
changing soft.bin to soft.elf
...

File:

• soft/giet_vm/boot/boot_handler.c (modified) (7 diffs)

soft/giet_vm/boot/boot_handler.c

@@ -61 +61 @@
 #endif
 
-#if !defined(GIET_NB_PT2_MAX)
-# error The GIET_NB_PT2_MAX value must be defined in the 'giet_config.h' file !
-#endif
-
-
 ////////////////////////////////////////////////////////////////////////////
 //  Global variables
@@ -434 +429 @@
 // As the set of PT2s is implemented as a fixed size array (no dynamic 
 // allocation), this function checks a possible overflow of the PT2 array.
+//
+// The parametre global is a boolean taht indicate wether a global vseg is
+// being mapped.
 //////////////////////////////////////////////////////////////////////////////
 void boot_add_pte( unsigned int    vspace_id,    
-                           unsigned int    vpn,           
-                           unsigned int    flags,
-                           unsigned int    ppn )
+                   unsigned int    vpn,           
+                   unsigned int    flags,
+                   unsigned int    ppn,
+                   unsigned char   global )
 {
     unsigned int    ix1;
@@ -488 +487 @@
     if ( ( *pt_flags & PTE_V) != 0 )    // page already mapped
     {
-        boot_tty_puts("\n[BOOT ERROR] in boot_add_pte() function\n");
-        boot_tty_puts("page already mapped\n");
-        boot_exit();
-    }
-    else                                          // set PTE2
-    {
-        *pt_flags = flags;
-        *pt_ppn   = ppn;
-    }
+        if(global)
+        {
+            boot_tty_puts("\n[BOOT ERROR] in boot_add_pte() function\n");
+            boot_tty_puts("page already mapped\n");
+            boot_exit();
+        }else
+        {
+            /**
+             * The case where a global vseg is already mapped as private vseg of a
+             * vspace_id. Typically used when a vseg is being replicated.
+             */  
+            boot_tty_puts("\n[BOOT] global PTE for vspace ");
+            boot_tty_putw(vspace_id);
+            boot_tty_puts(" already mapped, vpn = ");
+            boot_tty_putw(vpn);
+            boot_tty_puts("\n");
+            return;
+        }
+    }
+
+    // set PTE2
+    *pt_flags = flags;
+    *pt_ppn   = ppn;
+
 } // end boot_add_pte()
                 
@@ -517 +531 @@
     mapping_vspace_t*  vspace = boot_get_vspace_base( header );
     mapping_vseg_t*    vseg   = boot_get_vseg_base( header );
+    
+    // private segments
+    for ( vseg_id = vspace[vspace_id].vseg_offset ; 
+          vseg_id < (vspace[vspace_id].vseg_offset + vspace[vspace_id].vsegs) ; 
+          vseg_id++ )
+    {
+        vpn       = vseg[vseg_id].vbase >> 12;
+        ppn       = vseg[vseg_id].pbase >> 12;
+        npages    = vseg[vseg_id].length >> 12;
+        if ( (vseg[vseg_id].length & 0xFFF) != 0 ) npages++;
+
+        flags = PTE_V;
+        if ( vseg[vseg_id].mode & C_MODE_MASK )  flags = flags | PTE_C;
+        if ( vseg[vseg_id].mode & X_MODE_MASK )  flags = flags | PTE_X;
+        if ( vseg[vseg_id].mode & W_MODE_MASK )  flags = flags | PTE_W;
+        if ( vseg[vseg_id].mode & U_MODE_MASK )  flags = flags | PTE_U;
+
+#if BOOT_DEBUG_PT
+boot_tty_puts("- vseg ");
+boot_tty_puts( vseg[vseg_id].name );
+boot_tty_puts(" / flags = ");
+boot_tty_putw( flags );
+boot_tty_puts("\n");
+#endif        
+        // loop on 4K pages
+        for ( page_id = 0 ; page_id < npages ; page_id++ )
+        {
+            boot_add_pte( vspace_id,
+                          vpn,
+                          flags,
+                          ppn,
+                          0 );
+            vpn++;
+            ppn++;
+        }
+    }
 
     // global segments
@@ -547 +597 @@
                           vpn,
                           flags,
-                          ppn );
-            vpn++;
-            ppn++;
-        }
-    }
-    
-    // private segments
-    for ( vseg_id = vspace[vspace_id].vseg_offset ; 
-          vseg_id < (vspace[vspace_id].vseg_offset + vspace[vspace_id].vsegs) ; 
-          vseg_id++ )
-    {
-        vpn       = vseg[vseg_id].vbase >> 12;
-        ppn       = vseg[vseg_id].pbase >> 12;
-        npages    = vseg[vseg_id].length >> 12;
-        if ( (vseg[vseg_id].length & 0xFFF) != 0 ) npages++;
-
-        flags = PTE_V;
-        if ( vseg[vseg_id].mode & C_MODE_MASK )  flags = flags | PTE_C;
-        if ( vseg[vseg_id].mode & X_MODE_MASK )  flags = flags | PTE_X;
-        if ( vseg[vseg_id].mode & W_MODE_MASK )  flags = flags | PTE_W;
-        if ( vseg[vseg_id].mode & U_MODE_MASK )  flags = flags | PTE_U;
-
-#if BOOT_DEBUG_PT
-boot_tty_puts("- vseg ");
-boot_tty_puts( vseg[vseg_id].name );
-boot_tty_puts(" / flags = ");
-boot_tty_putw( flags );
-boot_tty_puts("\n");
-#endif        
-        // loop on 4K pages
-        for ( page_id = 0 ; page_id < npages ; page_id++ )
-        {
-            boot_add_pte( vspace_id,
-                          vpn,
-                          flags,
-                          ppn );
+                          ppn,
+                          1 );
             vpn++;
             ppn++;
@@ -628 +644 @@
         _max_pte2[region_id]    = (vobj->length - PT1_SIZE) / PT2_SIZE;
 
+#if BOOT_DEBUG_VIEW
         boot_tty_puts("ptabs for vspace ");
         boot_tty_putw(region_id);
-        boot_tty_puts("address:");
+        boot_tty_puts(" address: ");
         boot_tty_putw((unsigned)_ptabs[region_id]);
         boot_tty_puts("\n");
+#endif
     } 
 }
@@ -780 +798 @@
     }
 
-    // GIET_NB_PT2_MAX must be even
-    if ( (GIET_NB_PT2_MAX & 0x1) != 0 )
-    {
-        boot_tty_puts("\n[BOOT ERROR] : GIET_NB_PT2_MAX must be an even numver\n");
-        boot_tty_puts("\n");
-        boot_exit();
-    }
-
     // number of virtual spaces no larger than GIET_NB_VSPACE_MAX
     if ( header->vspaces > GIET_NB_VSPACE_MAX )