Changeset 230 for soft/giet_vm/boot

Timestamp:

Feb 22, 2013, 4:03:48 PM (12 years ago)

Author:

meunier

Message:

Correction d'un bug lors du boot pour les alignements
Modification de l'appel SRL pour les CONST

File:

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

soft/giet_vm/boot/boot_init.c

@@ -740 +740 @@
 
     // get physical segment pointer
-    mapping_pseg_t *pseg = boot_pseg_get(vseg->psegid);
+    mapping_pseg_t * pseg = boot_pseg_get(vseg->psegid);
 
     // compute vseg physical base address
@@ -757 +757 @@
     // loop on vobjs contained in vseg to :
     // (1) computes the length of the vseg,
-    // (2) initialise the vaddr and paddr fields of all vobjs,
-    // (3) initialise the page table pointers arrays 
+    // (2) initialize the vaddr and paddr fields of all vobjs,
+    // (3) initialize the page table pointers arrays 
 
     cur_vaddr = vseg->vbase;
@@ -766 +766 @@
         if (vobj[vobj_id].align) {
             cur_paddr = align_to(cur_paddr, vobj[vobj_id].align);
+            cur_vaddr = align_to(cur_vaddr, vobj[vobj_id].align);
         }
         // set vaddr/paddr for current vobj
         vobj[vobj_id].vaddr = cur_vaddr;
         vobj[vobj_id].paddr = cur_paddr;
-
+        
         // initialise boot_ptabs_vaddr[] if current vobj is a PTAB
         if (vobj[vobj_id].type == VOBJ_TYPE_PTAB) {
@@ -1191 +1192 @@
                     boot_puts(" / paddr = ");
                     boot_putx(vobj[vobj_id].paddr);
+                    boot_puts(" / vaddr = ");
+                    boot_putx(vobj[vobj_id].vaddr);
                     boot_puts(" / length = ");
                     boot_putx(vobj[vobj_id].length);
+                    boot_puts(" / buffer = ");
+                    boot_putx(memspace->buffer);
+                    boot_puts(" / size = ");
+                    boot_putx(memspace->size);
                     boot_puts("\n");
 #endif
                     break;
                 }
-                case VOBJ_TYPE_PTAB:    // nothing to initialise
+                case VOBJ_TYPE_PTAB:    // nothing to initialize
                 {
                     ptab_found = 1;
@@ -1211 +1218 @@
                 case VOBJ_TYPE_CONST:
                 {
+                    unsigned int *addr = (unsigned int *) vobj[vobj_id].paddr;
+                    *addr = vobj[vobj_id].init;
 #if BOOT_DEBUG_VOBJS
                     boot_puts("CONST   : ");
@@ -1217 +1226 @@
                     boot_putx(vobj[vobj_id].paddr);
                     boot_puts(" / init = ");
-                    boot_putx(vobj[vobj_id].init);
+                    boot_putx(*addr);
                     boot_puts("\n");
 #endif
-                    unsigned int *addr = (unsigned int *) vobj[vobj_id].paddr;
-                    *addr = vobj[vobj_id].init;
                     break;
                 }
@@ -1228 +1235 @@
                     boot_puts("\n[INIT ERROR] illegal vobj type: ");
                     boot_putd(vobj[vobj_id].type);
-                    boot_puts("\n ");
+                    boot_puts("\n");
                     boot_exit();
                 }