Disabled Debug

[tpg/acess2.git] / Kernel / arch / x86 / mm_virt.c

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index a022da2..7db7ced 100644 (file)
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -9,6 +9,7 @@
  * 0xFE - Unused
  * 0xFF - System Calls / Kernel's User Code
  */
+#define DEBUG  1
 #include <common.h>
 #include <mm_phys.h>
 #include <proc.h>
@@ -105,7 +106,7 @@ void MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs)
         && gaPageTable[Addr>>12] & PF_COW )
        {
                tPAddr  paddr;
-               if(MM_GetRefCount( gaPageTable[Addr>>12] & ~0xFFF ) == 0)
+               if(MM_GetRefCount( gaPageTable[Addr>>12] & ~0xFFF ) == 1)
                {
                        gaPageTable[Addr>>12] &= ~PF_COW;
                        gaPageTable[Addr>>12] |= PF_PRESENT|PF_WRITE;
@@ -117,6 +118,7 @@ void MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs)
                        gaPageTable[Addr>>12] &= PF_USER;
                        gaPageTable[Addr>>12] |= paddr|PF_PRESENT|PF_WRITE;
                }
+               //LOG("Duplicated page at %p to 0x%x", Addr&~0xFFF, gaPageTable[Addr>>12]);
                INVLPG( Addr & ~0xFFF );
                //LEAVE('-')
                return;
@@ -157,6 +159,22 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
        const tPAddr    MASK = ~0xF98;
        
        Start >>= 12;   End >>= 12;
+       
+       Log("Directory Entries:");
+       for(page = Start >> 10;
+               page < (End >> 10)+1;
+               page ++)
+       {
+               if(gaPageDir[page])
+               {
+                       Log(" 0x%08x-0x%08x :: 0x%08x",
+                               page<<22, ((page+1)<<22)-1,
+                               gaPageDir[page]&~0xFFF
+                               );
+               }
+       }
+       
+       Log("Table Entries:");
        for(page = Start, curPos = Start<<12;
                page < End;
                curPos += 0x1000, page++)
@@ -166,7 +184,7 @@ void MM_DumpTables(tVAddr Start, tVAddr End)
                ||  (gaPageTable[page] & MASK) != expected)
                {
                        if(expected) {
-                               Log("0x%08x-0x%08x => 0x%08x-0x%08x (%s%s%s%s)",
+                               Log(" 0x%08x-0x%08x => 0x%08x-0x%08x (%s%s%s%s)",
                                        rangeStart, curPos - 1,
                                        gaPageTable[rangeStart>>12] & ~0xFFF,
                                        (expected & ~0xFFF) - 1,
@@ -368,10 +386,12 @@ Uint MM_ClearUser()
                }
                
                MM_DerefPhys( gaPageDir[i] & ~0xFFF );
+               gaPageDir[i] = 0;
+               INVLPG( &gaPageTable[i*1024] );
        }
+       INVLPG( gaPageDir );
        
-       
-       return *gTmpCR3;
+       return *gaPageCR3;
 }
 
 /**
@@ -381,7 +401,8 @@ Uint MM_ClearUser()
 Uint MM_Clone()
 {
        Uint    i, j;
-       Uint    kStackBase = gCurrentThread->KernelStack - KERNEL_STACK_SIZE;
+       Uint    page = 0;
+       Uint    kStackBase = Proc_GetCurThread()->KernelStack - KERNEL_STACK_SIZE;
        void    *tmp;
        
        //ENTER("");
@@ -398,29 +419,31 @@ Uint MM_Clone()
                // Check if table is allocated
                if( !(gaPageDir[i] & PF_PRESENT) ) {
                        gaTmpDir[i] = 0;
+                       page += 1024;
                        continue;
                }
                
                // Allocate new table
                gaTmpDir[i] = MM_AllocPhys() | (gaPageDir[i] & 7);
-               INVLPG( &gaTmpTable[i*1024] );
+               INVLPG( &gaTmpTable[page] );
                // Fill
-               for( j = 0; j < 1024; j ++ )
+               for( j = 0; j < 1024; j ++, page++ )
                {
-                       if( !(gaPageTable[i*1024+j] & PF_PRESENT) ) {
-                               gaTmpTable[i*1024+j] = 0;
+                       if( !(gaPageTable[page] & PF_PRESENT) ) {
+                               gaTmpTable[page] = 0;
                                continue;
                        }
                        
                        // Refrence old page
-                       MM_RefPhys( gaPageTable[i*1024+j] & ~0xFFF );
+                       MM_RefPhys( gaPageTable[page] & ~0xFFF );
                        // Add to new table
-                       if(gaPageTable[i*1024+j] & PF_WRITE) {
-                               gaTmpTable[i*1024+j] = (gaPageTable[i*1024+j] & ~PF_WRITE) | PF_COW;
-                               gaPageTable[i*1024+j] = (gaPageTable[i*1024+j] & ~PF_WRITE) | PF_COW;
+                       if(gaPageTable[page] & PF_WRITE) {
+                               gaTmpTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
+                               gaPageTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
+                               INVLPG( page << 12 );
                        }
                        else
-                               gaTmpTable[i*1024+j] = gaPageTable[i*1024+j];
+                               gaTmpTable[page] = gaPageTable[page];
                }
        }
        
@@ -621,7 +644,7 @@ Uint MM_MapTemp(tPAddr PAddr)
                        return TEMP_MAP_ADDR + (i << 12);
                }
                RELEASE( &gilTempMappings );
-               Proc_Yield();
+               Threads_Yield();
        }
 }