Changeset 433 for soft/giet_vm/giet_boot/boot.c

Timestamp:

Oct 12, 2014, 6:53:47 PM (10 years ago)

Author:

cfuguet

Message:

boot: two modifications in the GietVM bootloader

1. Verifying that all vsegs sharing a big page have the same flags.

2. Bugfixes in the _physical_memset() function

File:

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

soft/giet_vm/giet_boot/boot.c

@@ -568 +568 @@
                     {
                         // allocate contiguous big physical pages 
-                        ppn = _get_big_ppn( palloc, npages ); 
+                        ppn = _get_big_ppn( palloc, npages );
                     }
                     else                           // BPP already allocated
                     {
+                        // test if new vseg has the same mode bits than
+                        // the other vsegs in the same big page
+                        unsigned int pte1_mode = 0;
+                        if (pte1 & PTE_C) pte1_mode |= C_MODE_MASK;
+                        if (pte1 & PTE_X) pte1_mode |= X_MODE_MASK;
+                        if (pte1 & PTE_W) pte1_mode |= W_MODE_MASK;
+                        if (pte1 & PTE_U) pte1_mode |= U_MODE_MASK;
+                        if (vseg->mode != pte1_mode) {
+                            _puts("\n[BOOT ERROR] in boot_vseg_map() : vseg ");
+                            _puts( vseg->name );
+                            _puts(" has different flags (");
+                            _putx( vseg->mode );
+                            _puts(") than other vsegs sharing the same big page (");
+                            _putx( pte1_mode );
+                            _puts(")");
+                            _exit();
+                        }
+
                         ppn = ((pte1 << 9) & 0x0FFFFE00);
                     }
@@ -613 +631 @@
         // compute max_pt2
         _ptabs_max_pt2 = ((nsp<<12) - PT1_SIZE) / PT2_SIZE;
-        
+
         for ( vs = 0 ; vs < nspaces ; vs++ )
         {
-            _ptabs_vaddr   [vs][x_dest][y_dest] = (vpn + offset) << 12;  
+            _ptabs_vaddr   [vs][x_dest][y_dest] = (vpn + offset) << 12;
             _ptabs_paddr   [vs][x_dest][y_dest] = ((paddr_t)(ppn + offset)) << 12;
             _ptabs_next_pt2[vs][x_dest][y_dest] = 0;
             offset += nsp;
-/*
+
             // reset all entries in PT1 (8 Kbytes)
             _physical_memset( _ptabs_paddr[vs][x_dest][y_dest], PT1_SIZE, 0 );
-            
-*/
         }
     }
@@ -630 +646 @@
 #if BOOT_DEBUG_PT
 _puts("[BOOT DEBUG] ");
-_puts( vseg->name ); 
+_puts( vseg->name );
 _puts(" in cluster[");
 _putd( x_dest );