Changeset 771

Timestamp:

07/09/08 18:48:27 (5 months ago)

Author:

mwhitworth

Message:

Add some more Preempt* macros.

Files:

• Whitix/branches/fs/kernel/module.c (modified) (6 diffs)

Whitix/branches/fs/kernel/module.c

@@ -121 +121 @@
 #endif
 
+SYMBOL_EXPORT(ModuleSymbolPrint);
+
 DWORD ModuleResolveKernel(char* name)
 {
@@ -136 +138 @@
         struct Module* curr;
 
+        PreemptDisable();
+
         /* Look through the kernel symbol table of different modules. */
         ListForEachEntry(curr, &moduleList, next)
@@ -148 +152 @@
                 {
                         if (!strcmp(currSym->name, name))
+                        {
+                                PreemptEnable();
                                 return currSym->addr;
+                        }
 
                         currSym++;
@@ -155 +162 @@
         }
 
-        KePrint("Could not resolve %s\n", name);
+        PreemptEnable();
 
         return 0;
@@ -198 +205 @@
                                         break;
 
-                                KePrint("Could not resolve %s\n", symName);
+                                KePrint(KERN_ERROR "%u: Could not resolve %s (%d, %#X), %#X %#X, %u < %u\n", current->pid, symName, strlen(symName), symName, module->strTable, symbol->symName, i, symSize);
+                                cli();
+                                hlt();
+
                                 return -ENOENT;
 
@@ -373 +383 @@
         module->keSymTab=ModuleSectionFind(module, (char*)file+sectionHeaders[elfHeader->strTabSectionIndex].shOffset, ".symtable", elfHeader->shEntries, &module->keSymTabSize);
 
+        PreemptDisable();
         ListAddTail(&module->next, &moduleList);
+        PreemptEnable();
 
         return ret;