Changeset 379 for Whitix/branches/hybrid/kernel

Timestamp:

05/01/08 15:13:46 (7 months ago)

Author:

mwhitworth

Message:

Extend module loading code, add ModuleFindSymbol function.

Files:

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

Whitix/branches/hybrid/kernel/module.c

@@ -20 +20 @@
 #include <elf.h>
 #include <error.h>
+#include <malloc.h>
+#include <module.h>
 #include <i386/i386.h>
+#include <i386/virtual.h>
+#include <slab.h>
 #include <sys.h>
+
+#define MODULE_START    0xD8000000
+#define MODULE_END              0xE0000000
+
+void* ModuleSymbolFind(struct Module* module, const char* symName, int type)
+{
+        int i;
+        struct ElfSymbol* symbol;
+
+        for (i=1; i<module->symTableSize/(sizeof(struct ElfSymbol)); i++)
+        {
+                symbol=&module->symTable[i];
+
+                if (symbol->symIndex == STN_UNDEF)
+                        continue;
+
+                if (ELF_ST_TYPE(symbol->symInfo) != type)
+                        continue;
+
+                if (strcmp(symName, module->strTable+symbol->symName))
+                        continue;
+
+                /* Handle data? */
+                return (module->textAddr+symbol->symValue);
+        }
+
+        return NULL;
+}
 
 int ModuleAdd(void* data, unsigned long length, int flags)
 {
         struct ElfHeader* elfHeader=(struct ElfHeader*)data;
+        struct Module* module;
+        struct ElfSectionHeader* sectionHeaders;
+        DWORD loadAddr=(DWORD)data;
+        int i;
 
-        if (ElfCheckHeader(elfHeader, ELF_REL))
+        if (!ELF_HEAD_CHECK(elfHeader) || (elfHeader->fileType != ELF_REL) || (elfHeader->shEntrySize != sizeof(struct ElfSectionHeader)))
                 return -EINVAL;
+        
+        /* Get basic information about the module. */
+        module=(struct Module*)malloc(sizeof(struct Module));
+        module->loadAddr=loadAddr;
 
-        
-        /* Find the init and exit functions. */
-        
+        /* Iterate through section headers. */
+        sectionHeaders=(struct ElfSectionHeader*)((char*)data+elfHeader->shOffset);
 
-        /* Call ModuleInit */
+        for (i=0; i<elfHeader->shEntries; i++)
+        {
+                if (sectionHeaders[i].shFlags & SEC_FLAGS_EXEC)
+                        module->textAddr=loadAddr+sectionHeaders[i].shOffset;
+
+                /* Save the symbol table off for resolving later. */
+                if (sectionHeaders[i].shType == SEC_TYPE_SYMTAB)
+                {
+                        module->symTable=loadAddr+sectionHeaders[i].shOffset;
+                        module->symTableSize=sectionHeaders[i].shSize;
+                }
+
+                if (sectionHeaders[i].shType == SEC_TYPE_STRTAB)
+                        module->strTable=loadAddr+sectionHeaders[i].shOffset;
+        }
+
+        /* Resolve entries in the module file. */
+
+        /* Find the init and exit functions, using the symbol and string table addresses. */
+        int (*modInit)(void);
+
+        modInit=ModuleSymbolFind(module, "ModuleInit", STT_FUNC);
+
+        printf("modInit = %#X\n", modInit);
+
+        if (modInit)
+                /* Call ModuleInit */
+                printf("ret = %d\n", (*modInit)());
 
         return 0;
@@ -41 +107 @@
 int SysModuleAdd(void* data, unsigned long length)
 {
-        /* Copy in data from userspace. */
-        return ModuleAdd(data, length, 0);
+        void* kData;
+
+        /* Check data is ok to access. */
+
+        kData=(void*)VirtMapPhysRange(MODULE_START, MODULE_END, PAGE_ALIGN_UP(length) >> PAGE_SHIFT, 3);
+
+        memcpy(kData, data, length);
+
+        return ModuleAdd(kData, length, 0);
 }