Kernel/x86 - Fixed usage of Proc_Clone

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

diff --git a/Kernel/arch/x86/main.c b/Kernel/arch/x86/main.c
index 8660343..a65c230 100644 (file)
--- a/Kernel/arch/x86/main.c
+++ b/Kernel/arch/x86/main.c
@@ -12,22 +12,31 @@
 
 #define        VGA_ERRORS      0
 
+#define MAX_ARGSTR_POS (0x400000-0x2000)
+
 // === IMPORTS ===
 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(void);
+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(void);
-extern void    Threads_Exit(void);
+// --- Core ---
+extern void    System_Init(char *Commandline);
 
-extern int     Modules_LoadBuiltins(void);
+// === PROTOTYPES ===
+ int   kmain(Uint MbMagic, void *MbInfoPtr);
 
 // === GLOBALS ===
 char   *gsBootCmdLine = NULL;
+struct {
+       Uint32  PBase;
+       void    *Base;
+       Uint    Size;
+       char    *ArgString;
+}      *gaArch_BootModules;
+ int   giArch_NumBootModules = 0;
 
 // === CODE ===
 int kmain(Uint MbMagic, void *MbInfoPtr)
@@ -41,7 +50,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)
        {
@@ -56,7 +65,7 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        
        // Multiboot 2
        case MULTIBOOT2_MAGIC:
-               Warning("Multiboot 2 Not yet supported");
+               Panic("Multiboot 2 not yet supported");
                //MM_InstallMBoot2( MbInfo );   // Set up physical memory manager
                return 0;
                break;
@@ -70,46 +79,81 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        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();
        
-       // Initialise builtin modules
-       Log("Initialising builtin modules...");
-       Modules_LoadBuiltins();
-       
-       Log("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 ++ )
        {
-               // Adjust into higher half
-               mods[i].Start += KERNEL_BASE;
-               mods[i].End += KERNEL_BASE;
-               mods[i].String += KERNEL_BASE;
-               
-               Log("Loading '%s'", mods[i].String);
+                int    ofs;
+       
+               Log_Log("Arch", "Multiboot Module at 0x%08x, 0x%08x bytes (String at 0x%08x)",
+                       mods[i].Start, mods[i].End-mods[i].Start, mods[i].String);
+       
+               gaArch_BootModules[i].PBase = mods[i].Start;
+               gaArch_BootModules[i].Size = mods[i].End - mods[i].Start;
+       
+               // Always HW map the module data        
+               ofs = mods[i].Start&0xFFF;
+               gaArch_BootModules[i].Base = (void*)( MM_MapHWPages(mods[i].Start,
+                       (gaArch_BootModules[i].Size+ofs+0xFFF) / 0x1000
+                       ) + ofs );
                
-               if( !Module_LoadMem( (void *)mods[i].Start, mods[i].End-mods[i].Start, (char *)mods[i].String ) )
+               // Only map the string if needed
+               if( (tVAddr)mods[i].String > MAX_ARGSTR_POS )
                {
-                       Log_Warning("ARCH", "Unable to load module\n");
+                       // Assumes the string is < 4096 bytes long)
+                       gaArch_BootModules[i].ArgString = (void*)(
+                               MM_MapHWPages(mods[i].String, 2) + (mods[i].String&0xFFF)
+                               );
                }
+               else
+                       gaArch_BootModules[i].ArgString = (char *)mods[i].String + KERNEL_BASE;
        }
        
        // Pass on to Independent Loader
-       Log("Loading Configuration...");
-       System_Init( gsBootCmdLine );
+       Log_Log("Arch", "Starting system");
+       System_Init(gsBootCmdLine);
        
        // Sleep forever (sleeping beauty)
        for(;;)
                Threads_Sleep();
        return 0;
 }
+
+void Arch_LoadBootModules(void)
+{
+        int    i, j, numPages;
+       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");
+               }
+               
+               // Unmap and free
+               numPages = (gaArch_BootModules[i].Size + ((Uint)gaArch_BootModules[i].Base&0xFFF) + 0xFFF) >> 12;
+               MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].Base, numPages );
+               
+               for( j = 0; j < numPages; j++ )
+                       MM_DerefPhys( gaArch_BootModules[i].PBase + (j << 12) );
+               
+               if( (tVAddr) gaArch_BootModules[i].ArgString > MAX_ARGSTR_POS )
+                       MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].ArgString, 2 );
+       }
+       Log_Log("Arch", "Boot modules loaded");
+       free( gaArch_BootModules );
+}