Created architecture specific init processes, fixed gcc warnings
[akaros.git] / kern / src / init.c
index 2ea8098..95600a5 100644 (file)
@@ -1,5 +1,9 @@
 /* See COPYRIGHT for copyright information. */
 
+#ifdef __SHARC__
+#pragma nosharc
+#endif
+
 #ifdef __BSD_ON_CORE_0__
 #include Everything For Free -- It just works!!
 #else
 #include <syscall.h>
 #include <kclock.h>
 #include <manager.h>
+#include <testing.h>
+
+#include <arch/init.h>
 
-#include <rl8168.h>
-#include <ne2k.h>
-#include <mptables.h>
-#include <pci.h>
-#include <arch/ioapic.h>
+// zra: flag for Ivy
+int booting = 1;
 
 void kernel_init(multiboot_info_t *mboot_info)
 {
-       extern char (BND(__this, end) edata)[], (SNT end)[];
+       extern char (RO BND(__this, end) edata)[], (RO SNT end)[];
 
        // Before doing anything else, complete the ELF loading process.
        // Clear the uninitialized global data (BSS) section of our program.
@@ -43,32 +47,33 @@ void kernel_init(multiboot_info_t *mboot_info)
 
        print_cpuinfo();
 
-       // zra: using KADDR macro gives a runtime warning, but it is possibly more
-    //      clear what's going on this way?
+       // Old way, pre Zach's Ivy annotations
        //multiboot_detect_memory((multiboot_info_t*)((uint32_t)mboot_info + KERNBASE));
        //multiboot_print_memory_map((multiboot_info_t*)((uint32_t)mboot_info + KERNBASE));
-       multiboot_detect_memory((multiboot_info_t*COUNT(1))KADDR((physaddr_t)mboot_info));
-       multiboot_print_memory_map((multiboot_info_t*COUNT(1))KADDR((physaddr_t)mboot_info));
+       
+       // Paul: Can't use KADDR as arg to multiboot_detect_memory
+       //  since multiboot_detect_memory is what sets npages. 
+       //  Must simulate KADDR macro (ugly).
+       multiboot_detect_memory((multiboot_info_t*CT(1))TC((physaddr_t)mboot_info + KERNBASE));
+
+       multiboot_print_memory_map((multiboot_info_t*CT(1))KADDR((physaddr_t)mboot_info));
 
        vm_init();
 
        cache_init();
        page_init();
        page_check();
-
-       env_init();
+       //test_page_coloring();
 
        idt_init();
        sysenter_init();
        timer_init();
-       mptables_parse();
-       pci_init();
-       ioapic_init(); // MUST BE AFTER PCI/ISA INIT!
-       // this returns when all other cores are done and ready to receive IPIs
-       smp_boot();
        
-       rl8168_init();          
-       ne2k_init();
+       // At this point our boot paths diverge based on arch. 
+       arch_init();
+
+       // zra: let's Ivy know we're done booting
+       booting = 0;
 
        manager();
 }