Attempt to fix multiboot module support

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

diff --git a/Kernel/arch/x86/main.c b/Kernel/arch/x86/main.c
index fa3cb45..8c09442 100644 (file)
--- a/Kernel/arch/x86/main.c
+++ b/Kernel/arch/x86/main.c
@@ -22,12 +22,20 @@ extern void Threads_Init(void);
 extern int     Time_Setup(void);
 extern Uint    Proc_Clone(Uint *Err, Uint Flags);
 extern void    Threads_Sleep(void);
-extern void    Threads_Exit(void);
+// --- Core ---
+extern void    System_Init(char *Commandline);
 
-extern int     Modules_LoadBuiltins(void);
+// === 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, void *MbInfoPtr)
@@ -41,7 +49,7 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        
        // Set up non-boot info dependent stuff
        Desctab_Install();      // Set up GDT and IDT
-       MM_PreinitVirtual();    // Initialise vital mappings
+       MM_PreinitVirtual();    // Initialise virtual mappings
        
        switch(MbMagic)
        {
@@ -81,35 +89,63 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        // Load Virtual Filesystem
        VFS_Init();
        
-       // Initialise builtin modules
-       Log_Log("Arch", "Initialising builtin modules...");
-       Modules_LoadBuiltins();
-       
-       Log_Log("Arch", "Loading %i Modules...", mbInfo->ModuleCount);
-       
        // Load initial modules
        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 ++ )
        {
+                int    ofs;
+               // TODO: Handle this better by using MM_MapHW/MM_MapTemp
                // 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_Log("Arch", "Loading '%s'", mods[i].String);
+               gaArch_BootModules[i].Size = mods[i].End - mods[i].Start;
                
-               if( !Module_LoadMem( (void *)mods[i].Start, mods[i].End-mods[i].Start, (char *)mods[i].String ) )
-               {
-                       Log_Warning("Arch", "Unable to load module\n");
-               }
+               ofs = mods[i].Start&0xFFF;
+               gaArch_BootModules[i].Base = (void*)( MM_MapHWPages(mods[i].Start,
+                       (gaArch_BootModules[i].Size+ofs+0xFFF) / 0x1000
+                       ) + ofs );
+               //gaArch_BootModules[i].ArgString = MM_MapHW(mods[i].String, 1)
+               // + (mods[i].String&0xFFF);
+               
+               //gaArch_BootModules[i].Base = (void *)mods[i].Start;
+               gaArch_BootModules[i].ArgString = (char *)mods[i].String + KERNEL_BASE;
        }
        
        // Pass on to Independent Loader
        Log_Log("Arch", "Starting system");
-       System_Init( gsBootCmdLine );
+       System_Init(gsBootCmdLine);
        
        // Sleep forever (sleeping beauty)
        for(;;)
                Threads_Sleep();
        return 0;
 }
+
+void Arch_LoadBootModules(void)
+{
+        int    i;
+       for( i = 0; i < giArch_NumBootModules; i ++ )
+       {
+               Log_Debug("Arch", "Module %i: %p - %p 0x%x",
+                       i, gaArch_BootModules[i].ArgString,
+                       gaArch_BootModules[i].Base, gaArch_BootModules[i].Size
+                       );
+               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");
+               }
+               
+               MM_UnmapHWPages(
+                       (tVAddr)gaArch_BootModules[i].Base,
+                       (gaArch_BootModules[i].Size + ((Uint)gaArch_BootModules[i].Base&0xFFF) + 0xFFF) >> 12
+                       );
+       }
+       Log_Log("Arch", "Boot modules loaded");
+       free( gaArch_BootModules );
+}