Changes in boot/arch/ppc32/src/main.c [a35b458:4646710] in mainline

File:

• boot/arch/ppc32/src/main.c (modified) (10 diffs)

boot/arch/ppc32/src/main.c

@@ -60 +60 @@
         version_print();
         ofw_memmap(&bootinfo.memmap);
-
+        
         void *bootinfo_pa = ofw_translate(&bootinfo);
         void *real_mode_pa = ofw_translate(&real_mode);
         void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS);
-
+        
         printf("\nMemory statistics (total %llu MB)\n", bootinfo.memmap.total >> 20);
         printf(" %p|%p: real mode trampoline\n", &real_mode, real_mode_pa);
@@ -72 +72 @@
         printf(" %p|%p: loader entry point\n",
             (void *) LOADER_ADDRESS, loader_address_pa);
-
+        
         size_t i;
         for (i = 0; i < COMPONENTS; i++)
@@ -78 +78 @@
                     ofw_translate(components[i].addr), components[i].name,
                     components[i].inflated, components[i].size);
-
+        
         size_t dest[COMPONENTS];
         size_t top = 0;
@@ -85 +85 @@
         for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-
+                
                 if (i > 0) {
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr =
@@ -91 +91 @@
                         bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size =
                             components[i].inflated;
-
+                        
                         str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-
+                        
                         bootinfo.taskmap.cnt++;
                 }
-
+                
                 dest[i] = top;
                 top += components[i].inflated;
                 cnt++;
         }
-
+        
         if (top >= (size_t) loader_address_pa) {
                 printf("Inflated components overlap loader area.\n");
@@ -108 +108 @@
                 halt();
         }
-
+        
         void *balloc_base;
         void *balloc_base_pa;
@@ -114 +114 @@
             BALLOC_MAX_SIZE, loader_address_pa);
         printf(" %p|%p: boot allocator area\n", balloc_base, balloc_base_pa);
-
+        
         void *inflate_base;
         void *inflate_base_pa;
@@ -120 +120 @@
             loader_address_pa);
         printf(" %p|%p: inflate area\n", inflate_base, inflate_base_pa);
-
+        
         uintptr_t balloc_start = ALIGN_UP(top, PAGE_SIZE);
         size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE))
@@ -129 +129 @@
             pages * sizeof(void *), loader_address_pa);
         printf(" %p|%p: translate table\n", transtable, transtable_pa);
-
+        
         check_overlap("boot allocator area", balloc_base_pa, pages);
         check_overlap("inflate area", inflate_base_pa, pages);
         check_overlap("translate table", transtable_pa, pages);
-
+        
         printf("\nInflating components ... ");
-
+        
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
-
+                
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     inflate_base + dest[i - 1], components[i - 1].inflated);
-
+                
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d, halting.\n",
@@ -148 +148 @@
                 }
         }
-
+        
         printf(".\n");
-
+        
         printf("Setting up boot allocator ...\n");
         balloc_init(&bootinfo.ballocs, balloc_base, PA2KA(balloc_start),
             BALLOC_MAX_SIZE);
-
+        
         printf("Setting up screens ...\n");
         ofw_setup_screens();
-
+        
         printf("Canonizing OpenFirmware device tree ...\n");
         bootinfo.ofw_root = ofw_tree_build();
-
+        
         printf("Setting up translate table ...\n");
         for (i = 0; i < pages; i++) {
                 uintptr_t off = i << PAGE_WIDTH;
                 void *phys;
-
+                
                 if (off < balloc_start)
                         phys = ofw_translate(inflate_base + off);
                 else
                         phys = ofw_translate(balloc_base + off - balloc_start);
-
+                
                 ((void **) transtable)[i] = phys;
         }
-
+        
         printf("Booting the kernel...\n");
         jump_to_kernel(bootinfo_pa, transtable_pa, pages, real_mode_pa);