Changeset 538 for Whitix/branches/hybrid/kernel/module.c

Timestamp:

05/24/08 09:54:46 (6 months ago)

Author:

mwhitworth

Message:

Create startup module.

Files:

• Whitix/branches/hybrid/kernel/module.c (modified) (10 diffs)

Whitix/branches/hybrid/kernel/module.c

@@ -29 +29 @@
 #include <sys.h>
 #include <task.h>
+#include <imports.h>
 
 LIST_HEAD(moduleList);
+
+static struct Module bootModules[20];
+int bootIndex=0;
 
 #define MODULE_START    0xD8000000
@@ -83 +87 @@
 
                 if (name)
-                        printf("%s+%#X/%#X\n", name, offset, size);
+                        KePrint("%s+%#X/%#X\n", name, offset, size);
                 else
-                        printf("%#X\n", address);
+                        KePrint("%#X\n", address);
         }else
-                printf("%#X\n", address);
+                KePrint("%#X\n", address);
 }
 
@@ -106 +110 @@
 void ModuleSymbolPrint(DWORD address)
 {
-        printf("%#X\n", address);
+        KePrint("%#X\n", address);
 }
 
@@ -148 +152 @@
         }
 
-        printf("Could not resolve %s\n", name);
+        KePrint("Could not resolve %s\n", name);
 
         return 0;
@@ -191 +195 @@
                                         break;
 
-                                printf("Could not resolve %s\n", symName);
+                                KePrint("Could not resolve %s\n", symName);
                                 return -ENOENT;
 
@@ -200 +204 @@
                         /* Common symbols aren't supported by the module loading code. */
                         case STN_COMMON:
-                                printf("Please recompile the module with -fno-common.\n");
+                                KePrint("Please recompile the module with -fno-common.\n");
                                 return -ENOENT;
 
@@ -240 +244 @@
 
                         default:
-                                printf("ModuleSymbolResolve: type = %u, %u\n", ELF_R_TYPE(reloc->info), symbol->symIndex);
+                                KePrint("ModuleSymbolResolve: type = %u, %u\n", ELF_R_TYPE(reloc->info), symbol->symIndex);
                 }
         }
@@ -286 +290 @@
 
         /* Get basic information about the module. */
-        module=(struct Module*)malloc(sizeof(struct Module));
+        if (MemAlloc)
+                module=(struct Module*)MemAlloc(sizeof(struct Module));
+        else
+                module=&bootModules[bootIndex++];
+
         module->loadAddr=loadAddr;
         module->sectionHeaders=sectionHeaders;
@@ -362 +370 @@
 }
 
+#define SYS_MODULE_BASE         51
+
+int SysModuleAdd(void* data, unsigned long length);
+int SysModuleRemove(const char* name);
+
+struct SysCall moduleSysCalls[]={
+        { SysModuleAdd, 8 },
+        { SysModuleRemove, 4},
+        { 0, 0 }
+};
+
+void ModulesBootLoad()
+{
+        /* The modules are located above the kernel in memory. */
+        BYTE* numModules=(BYTE*)0x2FFFF;
+        int i=0;
+        DWORD* length=(DWORD*)0x40000;
+        char* names=(char*)0x30000;
+
+        for (i=0; i<*numModules; i++)
+        {
+                /* Load each module, one at a time. */
+                BYTE* data=(BYTE*)(length+1);
+                void* kData=(void*)VirtMapPhysRange(MODULE_START, MODULE_END, PAGE_ALIGN_UP(*length) >> PAGE_SHIFT, 3);
+                char buf[32];
+
+                int j=0;
+
+                while (names[j] != '\n')
+                        j++;
+
+                names[j]='\0';
+
+                strcpy(buf, names);
+                strcat(buf, ".sys");
+
+                if (ModuleAdd(data, kData, *length, 0))
+                        KernelPanic("Could not initialize the kernel");
+
+                KePrint("MODULES: Loaded %s, %dkb\n", buf, (*length)/1024);
+
+                names+=strlen(names)+1;
+
+                length+=(*length/4)+1;
+        }
+
+        /* Free the low pages. */
+
+        /* Add the calls to the system table. */
+        SysRegisterRange(SYS_MODULE_BASE, moduleSysCalls);
+}
+
 int SysModuleAdd(void* data, unsigned long length)
 {
@@ -374 +434 @@
 int SysModuleRemove(const char* name)
 {
-        printf("SysModuleRemove\n");
+        KePrint("SysModuleRemove\n");
         return 0;
 }