Changeset 433

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

Location:

soft/giet_vm

Files:

• giet_boot/boot.c (modified) (3 diffs)
• giet_common/utils.c (modified) (2 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 );

soft/giet_vm/giet_common/utils.c

@@ -348 +348 @@
 {
     // check alignment constraints
-    if ( (paddr & 3) || (size & 3) ) 
+    if ( (paddr & 3) || (size & 7) )
     {
         _printf("\n[GIET ERROR] in _physical_memset() : buffer unaligned\n");
@@ -360 +360 @@
     _it_disable(&sr);
 
-    asm volatile( "move   $4,     %0                 \n"     /* $4 < lsb               */
-                  "move   $5,     %1                 \n"     /* $5 < msb               */
-                  "move   $6,     %2                 \n"     /* $6 < size              */
-                  "move   $7,     %3                 \n"     /* $7 < data              */
-
-                  "mfc2   $2,     $1                 \n"     /* $2 <= current MMU_MODE */
-                  "andi   $3,     $2,        0xb     \n"     /* $3 <= new MMU_MODE     */
-                  "mtc2   $3,     $1                 \n"     /* DTLB off               */    
-                  "mtc2   $5,     $24                \n"     /* PADDR_EXT <= msb       */   
-          
-                  "ph_memset_loop:                   \n"
-                  "sw     $7,     0($4)              \n"     /* data <= *src_paddr     */
-                  "addi   $4,     $4,        4       \n"     /* iter = iter - 1        */
-                  "bne    $4,     $6, ph_memcpy_loop \n"
-                  "nop                               \n"
-
-                  "mtc2   $0,     $24                \n"     /* PADDR_EXT <= 0         */   
-                  "mtc2   $2,     $1                 \n"     /* restore MMU_MODE       */
-                  : "=r" (data)
-                  : "r" (lsb), "r" (msb), "r" (size), "r"(data)
-                  : "$2", "$3", "$4", "$5", "$6", "$7" );
+    asm volatile( "mfc2   $8,     $1                 \n"     /* $8 <= current MMU_MODE */
+                  "andi   $9,     $8,        0xb     \n"     /* $9 <= new MMU_MODE     */
+                  "mtc2   $9,     $1                 \n"     /* DTLB off               */
+                  "mtc2   %3,     $24                \n"     /* PADDR_EXT <= msb       */
+
+                  "1:                                \n"     /* set 8 bytes per iter   */
+                  "sw     %2,     0(%0)              \n"     /* *src_paddr     = data  */
+                  "sw     %2,     4(%0)              \n"     /* *(src_paddr+4) = data  */
+                  "addi   %1,     %1,       -8       \n"     /* size -= 8              */
+                  "addi   %0,     %0,        8       \n"     /* src_paddr += 8         */
+                  "bnez   %1,     1b                 \n"     /* loop while size != 0   */
+
+                  "mtc2   $0,     $24                \n"     /* PADDR_EXT <= 0         */
+                  "mtc2   $8,     $1                 \n"     /* restore MMU_MODE       */
+                  : "+r"(lsb), "+r"(size)
+                  : "r"(data), "r" (msb)
+                  : "$8", "$9", "memory" );
 
     _it_restore(&sr);
-}  // _pysical_memset()
+}  // _physical_memset()
 
 ///////////////////////////////////////////////////////////////////////////////////