Changeset 481 for Whitix/branches/hybrid

Timestamp:

05/11/08 01:36:14 (4 months ago)

Author:

mwhitworth

Message:

Fix module relocation code.

Files:

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

Whitix/branches/hybrid/kernel/module.c

@@ -123 +123 @@
                 }
 
-                if (symbol->symIndex > 0 && symbol->symIndex < 0xF000)
-                        *relAddr+=module->sectionHeaders[symbol->symIndex].shAddr-module->loadAddr;
-
                 switch (ELF_R_TYPE(reloc->info))
                 {
@@ -132 +129 @@
 
                         case R_386_32:
-                                *relAddr+=module->loadAddr;
-                                break;
+                        {
+                                if (symbol->symIndex == STN_UNDEF)
+                                        *relAddr+=symbolAddr;
+
+                                if (symbol->symIndex > 0 && symbol->symIndex < 0xF000)
+                                        *relAddr+=module->sectionHeaders[symbol->symIndex].shAddr;
+                        }
+                        break;
 
                         case R_386_PC32: