Kernel/x86 - Fix PMem bitmap overflow

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

diff --git a/KernelLand/Kernel/arch/x86/main.c b/KernelLand/Kernel/arch/x86/main.c
index 83ed7fe..93470a4 100644 (file)
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -8,8 +8,8 @@
 #include <multiboot2.h>
 #include <init.h>
 #include <mm_virt.h>
-#include <mp.h>
 #include <pmemmap.h>
+#include <semaphore.h>
 
 #define        VGA_ERRORS      0
 
@@ -19,12 +19,13 @@
 
 // === IMPORTS ===
 extern char    gKernelEnd[];
-extern void    Heap_Install(void);
 extern void    MM_PreinitVirtual(void);
 extern void    MM_Install(int NPMemRanges, tPMemMapEnt *PMemRanges);
 extern void    MM_InstallVirtual(void);
 extern int     Time_Setup(void);
 extern int     ACPICA_Initialise(void);
+// - Modules/Display/VESA
+extern void    VBE_int_SetBootMode(Uint16 ModeID, const void *ModeInfo);
 
 // === PROTOTYPES ===
  int   kmain(Uint MbMagic, void *MbInfoPtr);
@@ -52,13 +53,26 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        // Multiboot 1
        case MULTIBOOT_MAGIC: {
                // TODO: Handle when this isn't in the mapped area
+               ASSERT( mbInfo->CommandLine < 4*1024*1024 );
                gsBootCmdLine = (char*)(mbInfo->CommandLine + KERNEL_BASE);
 
                // Adjust Multiboot structure address
                mbInfo = (void*)( (tVAddr)MbInfoPtr + KERNEL_BASE );
 
+               // Parse memory map
+               // - mbInfo->Flags is checked in this function
                nPMemMapEnts = Multiboot_LoadMemoryMap(mbInfo, KERNEL_BASE, pmemmap, MAX_PMEMMAP_ENTS,
                        KERNEL_LOAD, (tVAddr)&gKernelEnd - KERNEL_BASE);
+               
+               
+               // Get video mode
+               Debug("mbInfo->Flags = 0x%x", mbInfo->Flags);
+               if( mbInfo->Flags & (1 << 11) )
+               {
+                       // TODO: Ensure address is in mapped area
+                       ASSERT( mbInfo->vbe_mode_info < 4*1024*1024 );
+                       VBE_int_SetBootMode(mbInfo->vbe_mode, (void*)(mbInfo->vbe_mode_info + KERNEL_BASE));
+               }
 
                break; }
        
@@ -74,7 +88,7 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
                        MbMagic, MULTIBOOT_MAGIC, MULTIBOOT2_MAGIC);
                return 0;
        }
-       
+
        // Set up physical memory manager
        MM_Install(nPMemMapEnts, pmemmap);
        
@@ -85,8 +99,10 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        // Start Multitasking
        Threads_Init();
 
+       #if USE_ACPICA
        // Poke ACPICA
-       ACPICA_Initialise();    
+       ACPICA_Initialise();
+       #endif
 
        Log_Log("Arch", "Starting VFS...");
        // Load Virtual Filesystem
@@ -107,27 +123,29 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
 
 void Arch_LoadBootModules(void)
 {
-        int    i, j, numPages;
-       for( i = 0; i < giArch_NumBootModules; i ++ )
+       for( int i = 0; i < giArch_NumBootModules; i ++ )
        {
-               Log_Log("Arch", "Loading '%s'", gaArch_BootModules[i].ArgString);
+               const tBootModule       *mod = &gaArch_BootModules[i];
+               Log_Log("Arch", "Loading (%p[%P]+%x) '%s'",
+                       mod->Base, mod->PBase, mod->Size,
+                       mod->ArgString);
                
-               if( !Module_LoadMem( gaArch_BootModules[i].Base,
-                       gaArch_BootModules[i].Size, gaArch_BootModules[i].ArgString
-                       ) )
-               {
+               if( !Module_LoadMem( mod->Base, mod->Size, mod->ArgString) ) {
                        Log_Warning("Arch", "Unable to load module");
+                       continue ;
                }
                
+               #if 0
                // Unmap and free
-               numPages = (gaArch_BootModules[i].Size + ((Uint)gaArch_BootModules[i].Base&0xFFF) + 0xFFF) >> 12;
+               int numPages = (mod->Size + ((tVAddr)mod->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) );
+               //for( int j = 0; j < numPages; j++ )
+               //      MM_DerefPhys( mod->PBase + (j << 12) );
                
-               if( (tVAddr) gaArch_BootModules[i].ArgString > MAX_ARGSTR_POS )
-                       MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].ArgString, 2 );
+               if( (tVAddr) mod->ArgString > MAX_ARGSTR_POS )
+                       MM_UnmapHWPages( (tVAddr)mod->ArgString, 2 );
+               #endif
        }
        Log_Log("Arch", "Boot modules loaded");
        if( gaArch_BootModules )