More work on x86_64 build, error handling and IDT

[tpg/acess2.git] / Kernel / arch / x86 / main.c

diff --git a/Kernel/arch/x86/main.c b/Kernel/arch/x86/main.c
index f6879f8..34cc414 100644 (file)
--- a/Kernel/arch/x86/main.c
+++ b/Kernel/arch/x86/main.c
@@ -5,6 +5,7 @@
  */
 #include <acess.h>
 #include <mboot.h>
+#include <multiboot2.h>
 #include <init.h>
 #include <mm_virt.h>
 #include <mp.h>
@@ -12,69 +13,121 @@
 #define        VGA_ERRORS      0
 
 // === IMPORTS ===
-extern void    Heap_Install();
-extern void    Desctab_Install();
-extern void    MM_PreinitVirtual();
+extern void    Heap_Install(void);
+extern void    Desctab_Install(void);
+extern void    MM_PreinitVirtual(void);
 extern void    MM_Install(tMBoot_Info *MBoot);
-extern void MM_InstallVirtual();
-extern void    Threads_Init();
-extern int     Time_Setup();
+extern void MM_InstallVirtual(void);
+extern void    Threads_Init(void);
+extern int     Time_Setup(void);
 extern Uint    Proc_Clone(Uint *Err, Uint Flags);
-extern void    Threads_Sleep();
-extern void    Threads_Exit();
+extern void    Threads_Sleep(void);
+extern void    Threads_Exit(void);
+// --- Core ---
+extern void    System_Init(char *Commandline);
+
+// === PROTOTYPES ===
+void   Arch_LoadBootModules(void);
 
 // === GLOBALS ===
+char   *gsBootCmdLine = NULL;
+struct {
+       void    *Base;
+       Uint    Size;
+       char    *ArgString;
+}      *gaArch_BootModules;
+ int   giArch_NumBootModules = 0;
 
 // === CODE ===
-int kmain(Uint MbMagic, tMBoot_Info *MbInfo)
+int kmain(Uint MbMagic, void *MbInfoPtr)
 {
         int    i;
        tMBoot_Module   *mods;
+       tMBoot_Info     *mbInfo;
        
-       // Adjust Multiboot structure address
-       MbInfo = (void*)( (Uint)MbInfo + KERNEL_BASE );
+       Log("MbMagic = %08x", MbMagic);
+       Log("MbInfoPtr = %p", MbInfoPtr);
        
+       // Set up non-boot info dependent stuff
        Desctab_Install();      // Set up GDT and IDT
-       MM_PreinitVirtual();    // Initialise vital mappings
-       MM_Install( MbInfo );   // Set up physical memory manager
+       MM_PreinitVirtual();    // Initialise virtual mappings
+       
+       switch(MbMagic)
+       {
+       // Multiboot 1
+       case MULTIBOOT_MAGIC:
+               // Adjust Multiboot structure address
+               mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
+               gsBootCmdLine = (char*)(mbInfo->CommandLine + KERNEL_BASE);
+               
+               MM_Install( mbInfo );   // Set up physical memory manager
+               break;
+       
+       // Multiboot 2
+       case MULTIBOOT2_MAGIC:
+               Warning("Multiboot 2 Not yet supported");
+               //MM_InstallMBoot2( MbInfo );   // Set up physical memory manager
+               return 0;
+               break;
+       
+       default:
+               Panic("Multiboot magic invalid %08x, expected %08x or %08x\n",
+                       MbMagic, MULTIBOOT_MAGIC, MULTIBOOT2_MAGIC);
+               return 0;
+       }
+       
        MM_InstallVirtual();    // Clean up virtual address space
        Heap_Install();         // Create initial heap
        
-       Log("Starting Multitasking...");
+       //Log_Log("Arch", "Starting Multitasking...");
        // Start Multitasking
        Threads_Init();
        
        // Start Timers
        Time_Setup();
        
-       Log("Starting VFS...");
+       Log_Log("Arch", "Starting VFS...");
        // Load Virtual Filesystem
        VFS_Init();
        
-       Log("Loading Modules...");
-       
        // Load initial modules
-       mods = (void*)( MbInfo->Modules + KERNEL_BASE );
-       for(i=0;i<MbInfo->ModuleCount;i++)
+       mods = (void*)( mbInfo->Modules + KERNEL_BASE );
+       giArch_NumBootModules = mbInfo->ModuleCount;
+       gaArch_BootModules = malloc( giArch_NumBootModules * sizeof(*gaArch_BootModules) );
+       for( i = 0; i < mbInfo->ModuleCount; i ++ )
        {
                // Adjust into higher half
-               mods[i].Start += KERNEL_BASE;
-               mods[i].End += KERNEL_BASE;
+               mods[i].Start  += KERNEL_BASE;
+               mods[i].End    += KERNEL_BASE;
                mods[i].String += KERNEL_BASE;
                
-               Log("Loading '%s'", mods[i].String);
-               
-               if( !Module_LoadMem( (void *)mods[i].Start, mods[i].End-mods[i].Start, (char *)mods[i].String ) )
-               {
-                       Warning("Unable to load module\n");
-               }
+               gaArch_BootModules[i].Base = (void *)mods[i].Start;
+               gaArch_BootModules[i].Size = mods[i].End - mods[i].Start;
+               gaArch_BootModules[i].ArgString = (char *)mods[i].String;
        }
        
        // Pass on to Independent Loader
-       Log("Loading Configuration...");
-       System_Init( (char*)(MbInfo->CommandLine + KERNEL_BASE) );
+       Log_Log("Arch", "Starting system");
+       System_Init(gsBootCmdLine);
        
        // Sleep forever (sleeping beauty)
-       for(;;) Threads_Sleep();
+       for(;;)
+               Threads_Sleep();
        return 0;
 }
+
+void Arch_LoadBootModules(void)
+{
+        int    i;
+       for( i = 0; i < giArch_NumBootModules; i ++ )
+       {
+               Log_Log("Arch", "Loading '%s'", gaArch_BootModules[i].ArgString);
+               
+               if( !Module_LoadMem( gaArch_BootModules[i].Base, gaArch_BootModules[i].Size, gaArch_BootModules[i].ArgString ) )
+               {
+                       Log_Warning("Arch", "Unable to load module");
+               }
+       }
+       Log_Log("Arch", "Boot modules loaded");
+       free( gaArch_BootModules );
+}