Changeset 732 for Whitix/branches

Timestamp:

07/06/08 12:20:02 (5 months ago)

Author:

mwhitworth

Message:

Update fs branch with recent changes.

Location:

Whitix/branches/fs

Files:

• devices/misc.c (deleted)
• devices/misc/Makefile (modified) (1 diff)
• include/elf.h (modified) (1 diff)
• kernel/module.c (modified) (6 diffs)

Whitix/branches/fs/devices/misc/Makefile

@@ -5 +5 @@
 
 modules_install:
-        cp misc.sys ../../CdRoot/System/Modules/Unix
+        cp misc.sys ../../CdRoot/System/Modules/Core
 
 include $(DEPTH)make.inc

Whitix/branches/fs/include/elf.h

@@ -95 +95 @@
 #define SEC_TYPE_SYMTAB         2
 #define SEC_TYPE_STRTAB         3
+#define SEC_TYPE_RELA           4
 #define SEC_TYPE_NOBITS         8
 #define SEC_TYPE_REL            9

Whitix/branches/fs/kernel/module.c

@@ -226 +226 @@
         DWORD relSize=module->sectionHeaders[sec].shSize/sizeof(struct ElfReloc);
 
+        if (!module->sectionHeaders[ module->sectionHeaders[sec].shInfo ].shAddr)
+                return;
+
         for (i=0; i<relSize; i++)
         {
@@ -354 +357 @@
                         /* Resolve entries in the module. */
                         ModuleSymbolResolve(module, file, i);
+                else if (sectionHeaders[i].shType == SEC_TYPE_RELA)
+                        KePrint("RELA\n");
         }
 
@@ -368 +373 @@
         module->keSymTab=ModuleSectionFind(module, (char*)file+sectionHeaders[elfHeader->strTabSectionIndex].shOffset, ".symtable", elfHeader->shEntries, &module->keSymTabSize);
 
-        SpinLock(&moduleListLock);
         ListAdd(&module->next, &moduleList);
-        SpinUnlock(&moduleListLock);
 
         return ret;
@@ -398 +401 @@
                 void* kData=(void*)VirtMapPhysRange(MODULE_START, MODULE_END, PAGE_ALIGN_UP(*length) >> PAGE_SHIFT, 3);
                 char buf[32];
-
                 int j=0;
 
@@ -409 +411 @@
                 strcat(buf, ".sys");
 
+                KePrint("length = %#X: ", *length);
+
                 if (ModuleAdd(data, kData, *length, 0))
                         KernelPanic("Could not initialize the kernel");
@@ -428 +432 @@
 {
         void* kData;
+        int ret;
+
+        SpinLock(&moduleListLock);
 
         /* Check data is ok to access. */
         kData=(void*)VirtMapPhysRange(MODULE_START, MODULE_END, PAGE_ALIGN_UP(length) >> PAGE_SHIFT, 3);
 
-        return ModuleAdd(data, kData, length, 0);
+        ret=ModuleAdd(data, kData, length, 0);
+        SpinUnlock(&moduleListLock);
+
+        return ret;
 }