Changes in kernel/generic/src/main/main.c [1caeb2d:98000fb] in mainline

File:

• kernel/generic/src/main/main.c (modified) (17 diffs)

kernel/generic/src/main/main.c

@@ -84 +84 @@
 #include <main/main.h>
 #include <ipc/event.h>
-#include <sysinfo/sysinfo.h>
-#include <sysinfo/stats.h>
 
 /** Global configuration structure. */
@@ -97 +95 @@
 /** Boot allocations. */
 ballocs_t ballocs = {
-        .base = (uintptr_t) NULL,
+        .base = NULL,
         .size = 0
 };
@@ -103 +101 @@
 context_t ctx;
 
+/*
+ * These 'hardcoded' variables will be intialized by
+ * the linker or the low level assembler code with
+ * appropriate sizes and addresses.
+ */
+
+/** Virtual address of where the kernel is loaded. */
+uintptr_t hardcoded_load_address = 0;
+/** Size of the kernel code in bytes. */
+size_t hardcoded_ktext_size = 0;
+/** Size of the kernel data in bytes. */
+size_t hardcoded_kdata_size = 0;
 /** Lowest safe stack virtual address. */
-uintptr_t stack_safe = 0;
+uintptr_t stack_safe = 0;               
 
 /*
@@ -113 +123 @@
  */
 static void main_bsp_separated_stack(void);
-
 #ifdef CONFIG_SMP
 static void main_ap_separated_stack(void);
 #endif
 
-#define CONFIG_STACK_SIZE  ((1 << STACK_FRAMES) * STACK_SIZE)
+#define CONFIG_STACK_SIZE       ((1 << STACK_FRAMES) * STACK_SIZE)
 
 /** Main kernel routine for bootstrap CPU.
@@ -131 +140 @@
  *
  */
-NO_TRACE void main_bsp(void)
+void main_bsp(void)
 {
         config.cpu_count = 1;
@@ -147 +156 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_OVERLAPS(config.stack_base, config.stack_size,
+                if (PA_overlaps(config.stack_base, config.stack_size,
                     init.tasks[i].addr, init.tasks[i].size))
                         config.stack_base = ALIGN_UP(init.tasks[i].addr +
                             init.tasks[i].size, config.stack_size);
         }
-        
+
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
-                if (PA_OVERLAPS(config.stack_base, config.stack_size,
+                if (PA_overlaps(config.stack_base, config.stack_size,
                     ballocs.base, ballocs.size))
                         config.stack_base = ALIGN_UP(ballocs.base +
@@ -171 +180 @@
 }
 
+
 /** Main kernel routine for bootstrap CPU using new stack.
  *
@@ -176 +186 @@
  *
  */
-void main_bsp_separated_stack(void)
+void main_bsp_separated_stack(void) 
 {
         /* Keep this the first thing. */
@@ -183 +193 @@
         version_print();
         
-        LOG("\nconfig.base=%p config.kernel_size=%zu"
-            "\nconfig.stack_base=%p config.stack_size=%zu",
-            (void *) config.base, config.kernel_size,
-            (void *) config.stack_base, config.stack_size);
+        LOG("\nconfig.base=%#" PRIp " config.kernel_size=%" PRIs
+            "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs,
+            config.base, config.kernel_size, config.stack_base,
+            config.stack_size);
         
 #ifdef CONFIG_KCONSOLE
@@ -194 +204 @@
          * commands.
          */
-        kconsole_init();
+        LOG_EXEC(kconsole_init());
 #endif
         
@@ -201 +211 @@
          * starts adding its own handlers
          */
-        exc_init();
+        LOG_EXEC(exc_init());
         
         /*
          * Memory management subsystems initialization.
          */
-        arch_pre_mm_init();
-        frame_init();
+        LOG_EXEC(arch_pre_mm_init());
+        LOG_EXEC(frame_init());
         
         /* Initialize at least 1 memory segment big enough for slab to work. */
-        slab_cache_init();
-        sysinfo_init();
-        btree_init();
-        as_init();
-        page_init();
-        tlb_init();
-        ddi_init();
-        tasklet_init();
-        arch_post_mm_init();
-        arch_pre_smp_init();
-        smp_init();
+        LOG_EXEC(slab_cache_init());
+        LOG_EXEC(btree_init());
+        LOG_EXEC(as_init());
+        LOG_EXEC(page_init());
+        LOG_EXEC(tlb_init());
+        LOG_EXEC(ddi_init());
+        LOG_EXEC(tasklet_init());
+        LOG_EXEC(arch_post_mm_init());
+        LOG_EXEC(arch_pre_smp_init());
+        LOG_EXEC(smp_init());
         
         /* Slab must be initialized after we know the number of processors. */
-        slab_enable_cpucache();
-        
-        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
-            config.cpu_count, SIZE2MB(zones_total_size()));
-        
-        cpu_init();
-        
-        calibrate_delay_loop();
-        clock_counter_init();
-        timeout_init();
-        scheduler_init();
-        task_init();
-        thread_init();
-        futex_init();
+        LOG_EXEC(slab_enable_cpucache());
+        
+        printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
+            config.cpu_count, SIZE2MB(zone_total_size()));
+        
+        LOG_EXEC(cpu_init());
+        
+        LOG_EXEC(calibrate_delay_loop());
+        LOG_EXEC(clock_counter_init());
+        LOG_EXEC(timeout_init());
+        LOG_EXEC(scheduler_init());
+        LOG_EXEC(task_init());
+        LOG_EXEC(thread_init());
+        LOG_EXEC(futex_init());
         
         if (init.cnt > 0) {
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
-                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
+                        LOG("init[%" PRIs "].addr=%#" PRIp ", init[%" PRIs
+                            "].size=%#" PRIs, i, init.tasks[i].addr, i,
+                            init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");
         
-        ipc_init();
-        event_init();
-        klog_init();
-        stats_init();
+        LOG_EXEC(ipc_init());
+        LOG_EXEC(event_init());
+        LOG_EXEC(klog_init());
         
         /*
@@ -265 +274 @@
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");
-        thread_ready(kinit_thread);
+        LOG_EXEC(thread_ready(kinit_thread));
         
         /*
@@ -275 +284 @@
 }
 
+
 #ifdef CONFIG_SMP
-
 /** Main kernel routine for application CPUs.
  *
@@ -295 +304 @@
          */
         config.cpu_active++;
-        
+
         /*
          * The THE structure is well defined because ctx.sp is used as stack.
@@ -310 +319 @@
         calibrate_delay_loop();
         arch_post_cpu_init();
-        
+
         the_copy(THE, (the_t *) CPU->stack);
-        
+
         /*
          * If we woke kmp up before we left the kernel stack, we could
@@ -325 +334 @@
 }
 
+
 /** Main kernel routine for application CPUs using new stack.
  *
@@ -336 +346 @@
          */
         timeout_init();
-        
+
         waitq_wakeup(&ap_completion_wq, WAKEUP_FIRST);
         scheduler();
         /* not reached */
 }
-
 #endif /* CONFIG_SMP */