Changeset 518 for Whitix/branches/hybrid

Timestamp:

05/24/08 09:46:43 (3 months ago)

Author:

mwhitworth

Message:

Convert code to use new APIs, use function pointers, fix VirtToPhys.

Files:

• Whitix/branches/hybrid/arch/i386/mm/virt.c (modified) (12 diffs)

Whitix/branches/hybrid/arch/i386/mm/virt.c

@@ -22 +22 @@
 #include <fs/vfs.h>
 #include <vmm.h>
+#include <module.h>
+#include <init.h>
 #include <sections.h>
 #include <malloc.h>
 #include <slab.h>
+#include <imports.h>
 
 #define PGDIR_SELF 1023 /* Entry in the page directory of the page directory itself */
@@ -62 +65 @@
 int VirtMemManagerSetup(struct Process* process)
 {
-        process->memManager=(struct MemManager*)MemCacheAlloc(managerCache);
+        process->memManager=(struct MemManager*)memCacheAlloc(managerCache);
         if (!process->memManager)
                 return -EFAULT;
@@ -174 +177 @@
 
 error:
-        printf("VirtMemManagerInit failed\n");
+        KePrint("VirtMemManagerInit failed\n");
         IrqRestoreFlags(flags);
         return -ENOMEM;
@@ -194 +197 @@
         return 0;
 }
+
+SYMBOL_EXPORT(VirtSetCurrent);
 
 int VirtDestroyMemManager(struct MemManager* manager)
@@ -221 +226 @@
         VirtUnmapPhysPage((DWORD)vPageDir);
         ListRemove(&manager->list);
-        MemCacheFree(managerCache,manager);
-
-        return 0;
-}
-
-extern int SlabInit();
+        memCacheFree(managerCache,manager);
+
+        return 0;
+}
+
+int VirtEarlyInit()
+{
+        /* Init the kernel page tables */
+        VirtMemManagerInit(&kernelMem, true);
+
+        return 0;
+}
 
 int VirtInit()
 {
-        /* Init the kernel page tables */
-        VirtMemManagerInit(&kernelMem,true);
-
-        /* And the slab allocator */
-        SlabInit();
-
-        managerCache=MemCacheCreate("Manager Cache",sizeof(struct MemManager),NULL,NULL,0);
+        managerCache=memCacheCreate("Manager Cache",sizeof(struct MemManager),NULL,NULL,0);
         if (!managerCache)
                 return -ENOMEM;
@@ -282 +287 @@
 }
 
+SYMBOL_EXPORT(VirtMemMapPage);
+
 void VirtUnmapPages(DWORD start,DWORD len)
 {
@@ -325 +332 @@
         }
 
-        printf("VirtMapPhysPage failed\n");
-        IrqRestoreFlags(flags);
-        return 0;
-}
+        KePrint("VirtMapPhysPage failed\n");
+        IrqRestoreFlags(flags);
+        return 0;
+}
+
+SYMBOL_EXPORT(VirtMapPhysPage);
 
 DWORD VirtMapPhysRange(DWORD virt,DWORD endVirt,DWORD numPages,int perms)
@@ -339 +348 @@
         IrqSaveFlags(flags);
 
-//      printf("VirtMapPhysRange(%#X,%#X,%u,%d)\n",virt,endVirt,numPages,perms);
+//      KePrint("VirtMapPhysRange(%#X,%#X,%u,%d)\n",virt,endVirt,numPages,perms);
 
         for (i=virt; i<endVirt; i+=PAGE_SIZE)
@@ -366 +375 @@
         /* Now map them in */
         for (i=start; i<start+(numPages*PAGE_SIZE); i+=PAGE_SIZE)
-                VirtMemMapPage(i,PageAlloc()->physAddr,perms);
+        {
+                struct PhysPage* page=PageAlloc();
+
+                if (!page)
+                {
+                        for (i-=PAGE_SIZE; i>start; i-=PAGE_SIZE)
+                                VirtUnmapPhysPage(PageGetStruct(PAGE_ALIGN(VirtToPhys(i))));
+
+                        return 0;
+                }
+
+                VirtMemMapPage(i,page->physAddr,perms);
+        }
 
         IrqRestoreFlags(flags);
@@ -372 +393 @@
         return start;
 }
+
+SYMBOL_EXPORT(VirtMapPhysRange);
 
 void VirtUnmapPhysPage(DWORD virt)
@@ -383 +406 @@
 }
 
+SYMBOL_EXPORT(VirtUnmapPhysPage);
+
 DWORD VirtAllocateTemp(DWORD phys)
 {
@@ -400 +425 @@
 }
 
+SYMBOL_EXPORT(VirtAllocateTemp);
+
 void VirtShowFault(DWORD address,int error)
 {
-        printf("\nAddress = %#X (pageDir[%d] = %#X)",address,address >> 22,pageDir[address >> 22]);
+        KePrint("\nAddress = %#X (pageDir[%d] = %#X)",address,address >> 22,pageDir[address >> 22]);
 
         if (pageDir[address >> 22])
-                printf(" pageTable[%d] = %#X",address >> 12,pageTable[address >> 12]);
-
-        printf("\n");
+                KePrint(" pageTable[%d] = %#X",address >> 12,pageTable[address >> 12]);
+
+        KePrint("\n");
 
         if (error & 1)
-                printf("Protection violation, ");
+                KePrint("Protection violation, ");
         else
-                printf("Page not present, ");
+                KePrint("Page not present, ");
                                 
         if (error & 2)
-                printf("writing, ");
+                KePrint("writing, ");
         else
-                printf("reading, ");
+                KePrint("reading, ");
                                 
         if (error & 4)
-                printf("in user mode\n");
+                KePrint("in user mode\n");
         else
-                printf("in kernel mode\n");     
+                KePrint("in kernel mode\n");    
 }
 
 DWORD VirtToPhys(DWORD virt)
 {
-        return pageTable[PGTABLE_ENT(virt)];
-}
-
+        return PAGE_ALIGN(pageTable[PGTABLE_ENT(virt)])+PAGE_OFFSET(virt);
+}
+
+SYMBOL_EXPORT(VirtToPhys);
+