Immense cleanup of libc, implemening login program. Slight changes to ACL handling...

[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 be9a7ec..3d3fee1 100644 (file)
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -40,6 +40,7 @@
 // === IMPORTS ===
 extern Uint32  gaInitPageDir[1024];
 extern Uint32  gaInitPageTable[1024];
+extern void    Threads_SegFault(Uint Addr);
 
 // === PROTOTYPES ===
 void   MM_PreinitVirtual();
@@ -118,12 +119,18 @@ 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;
        }
        
+       // If it was a user, tell the thread handler
+       if(ErrorCode & 4) {
+               Threads_SegFault(Addr);
+               return ;
+       }
+       
        // -- Check Error Code --
        if(ErrorCode & 8)
                Warning("Reserved Bits Trashed!");
@@ -159,6 +166,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++)
@@ -168,7 +191,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,
@@ -370,10 +393,12 @@ Uint MM_ClearUser()
                }
                
                MM_DerefPhys( gaPageDir[i] & ~0xFFF );
+               gaPageDir[i] = 0;
+               INVLPG( &gaPageTable[i*1024] );
        }
+       INVLPG( gaPageDir );
        
-       
-       return *gTmpCR3;
+       return *gaPageCR3;
 }
 
 /**
@@ -383,6 +408,7 @@ Uint MM_ClearUser()
 Uint MM_Clone()
 {
        Uint    i, j;
+       Uint    page = 0;
        Uint    kStackBase = Proc_GetCurThread()->KernelStack - KERNEL_STACK_SIZE;
        void    *tmp;
        
@@ -400,29 +426,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];
                }
        }