Changeset 425 for Whitix/branches/hybrid/kernel

Timestamp:

05/05/08 16:09:04 (7 months ago)

Author:

mwhitworth

Message:

Make detection and resolving of relocation sections more flexible.

Files:

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

Whitix/branches/hybrid/kernel/module.c

@@ -74 +74 @@
 }
 
-int ModuleSymbolResolve(struct Module* module)
+int ModuleSymbolResolve(struct Module* module, int sec)
 {
         int i;
         struct ElfReloc* reloc;
+        struct ElfReloc* relTable=(struct ElfReloc*)(module->loadAddr+module->sectionHeaders[sec].shOffset);
+        DWORD relSize=module->sectionHeaders[sec].shSize/sizeof(struct ElfReloc);
 
-        for (i=0; i<module->relSize/(sizeof(struct ElfReloc)); i++)
+        for (i=0; i<relSize; i++)
         {
-                reloc=&module->relTable[i];
+                reloc=&relTable[i];
 
-                unsigned long* relAddr=(unsigned long*)(module->loadAddr+module->sectionHeaders[ module->sectionHeaders[module->relSection].shInfo ].shOffset+reloc->addr);
+                unsigned long* relAddr=(unsigned long*)(module->loadAddr+module->sectionHeaders[ module->sectionHeaders[sec].shInfo ].shOffset+reloc->addr);
                 int symTabIdx=ELF_R_SYM(reloc->info);
                 struct ElfSymbol* symbol=&module->symTable[symTabIdx];
@@ -146 +148 @@
                         module->textAddr=loadAddr+sectionHeaders[i].shOffset;
 
-                if (sectionHeaders[i].shType == SEC_TYPE_REL)
-                {
-                        if (!module->relTable)
-                                module->relTable=(struct ElfReloc*)(loadAddr+sectionHeaders[i].shOffset);
-                        module->relSize+=sectionHeaders[i].shSize;
-
-                        if (!module->relSection)
-                                module->relSection=i;
-                }
-
                 /* Save the symbol table off for resolving later. */
                 if (sectionHeaders[i].shType == SEC_TYPE_SYMTAB)
+
                 {
                         module->symTable=loadAddr+sectionHeaders[i].shOffset;
@@ -167 +160 @@
         }
 
-        /* Resolve entries in the module file. */
-        if (ModuleSymbolResolve(module) < 0)
-                return -EINVAL;
+        for (i=0; i<elfHeader->shEntries; i++)
+        {
+                if (sectionHeaders[i].shType == SEC_TYPE_REL)
+                        /* Resolve entries in the module file. */
+                        if (ModuleSymbolResolve(module, i) < 0)
+                                return -EINVAL;
+        }
 
         /* Find the init and exit functions, using the symbol and string table addresses. */