Slight change to VMM defines

[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 fc689f7..2a23d3f 100644 (file)
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -56,7 +56,7 @@
 #define        PF_WRITE        0x2
 #define        PF_USER         0x4
 #define        PF_COW          0x200
-#define        PF_PAGED        0x400
+#define        PF_NOPAGE       0x400
 
 #define INVLPG(addr)   __asm__ __volatile__ ("invlpg (%0)"::"r"(addr))
 
@@ -95,8 +95,8 @@ tPAddr        MM_DuplicatePage(tVAddr VAddr);
 #define gaPAE_TmpDir   ((tTabEnt*)PAE_TMP_DIR_ADDR)
 #define gaPAE_TmpPDPT  ((tTabEnt*)PAE_TMP_PDPT_ADDR)
  int   gbUsePAE = 0;
- int   gilTempMappings = 0;
- int   gilTempFractal = 0;
+tMutex glTempMappings;
+tMutex glTempFractal;
 Uint32 gWorkerStacks[(NUM_WORKER_STACKS+31)/32];
  int   giLastUsedWorker = 0;
 
@@ -158,7 +158,6 @@ void MM_InstallVirtual(void)
        
        // Unset kernel on the User Text pages
        for( i = ((tVAddr)&_UsertextEnd-(tVAddr)&_UsertextBase+0xFFF)/4096; i--; ) {
-               Log("MM_SetFlags( 0x%08x, 0, MM_PFLAG_KERNEL)", (tVAddr)&_UsertextBase + i*4096);
                MM_SetFlags( (tVAddr)&_UsertextBase + i*4096, 0, MM_PFLAG_KERNEL );
        }
 }
@@ -253,6 +252,12 @@ void MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs)
        //Log("SS:ESP %04x:%08x", Regs->ss, Regs->esp);
        Log("CS:EIP %04x:%08x", Regs->cs, Regs->eip);
        Log("DS %04x ES %04x FS %04x GS %04x", Regs->ds, Regs->es, Regs->fs, Regs->gs);
+       {
+               Uint    dr0, dr1;
+               __ASM__ ("mov %%dr0, %0":"=r"(dr0):);
+               __ASM__ ("mov %%dr1, %0":"=r"(dr1):);
+               Log("DR0 %08x DR1 %08x", dr0, dr1);
+       }
        
        Panic("Page Fault at 0x%x (Accessed 0x%x)", Regs->eip, Addr);
 }
@@ -528,7 +533,7 @@ tPAddr MM_Clone(void)
        tVAddr  kStackBase = Proc_GetCurThread()->KernelStack - KERNEL_STACK_SIZE;
        void    *tmp;
        
-       LOCK( &gilTempFractal );
+       Mutex_Acquire( &glTempFractal );
        
        // Create Directory Table
        *gpTmpCR3 = MM_AllocPhys() | 3;
@@ -536,37 +541,40 @@ tPAddr MM_Clone(void)
        //LOG("Allocated Directory (%x)", *gpTmpCR3);
        memsetd( gaTmpDir, 0, 1024 );
        
-       // Copy Tables
-       for( i = 0; i < 768; i ++)
-       {
-               // 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[page] );
-               // Fill
-               for( j = 0; j < 1024; j ++, page++ )
+       if( Threads_GetPID() != 0 )
+       {       
+               // Copy Tables
+               for( i = 0; i < 768; i ++)
                {
-                       if( !(gaPageTable[page] & PF_PRESENT) ) {
-                               gaTmpTable[page] = 0;
+                       // Check if table is allocated
+                       if( !(gaPageDir[i] & PF_PRESENT) ) {
+                               gaTmpDir[i] = 0;
+                               page += 1024;
                                continue;
                        }
                        
-                       // Refrence old page
-                       MM_RefPhys( gaPageTable[page] & ~0xFFF );
-                       // Add to new table
-                       if(gaPageTable[page] & PF_WRITE) {
-                               gaTmpTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
-                               gaPageTable[page] = (gaPageTable[page] & ~PF_WRITE) | PF_COW;
-                               INVLPG( page << 12 );
+                       // Allocate new table
+                       gaTmpDir[i] = MM_AllocPhys() | (gaPageDir[i] & 7);
+                       INVLPG( &gaTmpTable[page] );
+                       // Fill
+                       for( j = 0; j < 1024; j ++, page++ )
+                       {
+                               if( !(gaPageTable[page] & PF_PRESENT) ) {
+                                       gaTmpTable[page] = 0;
+                                       continue;
+                               }
+                               
+                               // Refrence old page
+                               MM_RefPhys( gaPageTable[page] & ~0xFFF );
+                               // Add to new table
+                               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[page] = gaPageTable[page];
                        }
-                       else
-                               gaTmpTable[page] = gaPageTable[page];
                }
        }
        
@@ -636,7 +644,7 @@ tPAddr MM_Clone(void)
        }
        
        ret = *gpTmpCR3 & ~0xFFF;
-       RELEASE( &gilTempFractal );
+       Mutex_Release( &glTempFractal );
        
        //LEAVE('x', ret);
        return ret;
@@ -648,14 +656,15 @@ tPAddr MM_Clone(void)
  */
 tVAddr MM_NewKStack(void)
 {
-       tVAddr  base = KERNEL_STACKS;
+       tVAddr  base;
        Uint    i;
-       for(;base<KERNEL_STACKS_END;base+=KERNEL_STACK_SIZE)
+       for(base = KERNEL_STACKS; base < KERNEL_STACKS_END; base += KERNEL_STACK_SIZE)
        {
                if(MM_GetPhysAddr(base) != 0)   continue;
-               for(i=0;i<KERNEL_STACK_SIZE;i+=0x1000) {
+               for(i = 0; i < KERNEL_STACK_SIZE; i += 0x1000) {
                        MM_Allocate(base+i);
                }
+               Log("MM_NewKStack - Allocated %p", base + KERNEL_STACK_SIZE);
                return base+KERNEL_STACK_SIZE;
        }
        Warning("MM_NewKStack - No address space left\n");
@@ -679,6 +688,7 @@ tVAddr MM_NewWorkerStack()
        __asm__ __volatile__ ("mov %%esp, %0": "=r"(esp));
        __asm__ __volatile__ ("mov %%ebp, %0": "=r"(ebp));
        
+       // TODO: Thread safety
        // Find a free worker stack address
        for(base = giLastUsedWorker; base < NUM_WORKER_STACKS; base++)
        {
@@ -708,7 +718,7 @@ tVAddr MM_NewWorkerStack()
        //Log(" MM_NewWorkerStack: base = 0x%x", base);
        
        // Acquire the lock for the temp fractal mappings
-       LOCK(&gilTempFractal);
+       Mutex_Acquire(&glTempFractal);
        
        // Set the temp fractals to TID0's address space
        *gpTmpCR3 = ((Uint)gaInitPageDir - KERNEL_BASE) | 3;
@@ -726,13 +736,14 @@ tVAddr MM_NewWorkerStack()
        
        // Mapping Time!
        for( addr = 0; addr < WORKER_STACK_SIZE; addr += 0x1000 )
+       //for( addr = WORKER_STACK_SIZE; addr; addr -= 0x1000 )
        {
                pages[ addr >> 12 ] = MM_AllocPhys();
                gaTmpTable[ (base + addr) >> 12 ] = pages[addr>>12] | 3;
        }
        *gpTmpCR3 = 0;
        // Release the temp mapping lock
-       RELEASE(&gilTempFractal);
+       Mutex_Release(&glTempFractal);
        
        // Copy the old stack
        oldstack = (esp + KERNEL_STACK_SIZE-1) & ~(KERNEL_STACK_SIZE-1);
@@ -895,11 +906,11 @@ tVAddr MM_MapTemp(tPAddr PAddr)
        
        PAddr &= ~0xFFF;
        
-       //LOG("gilTempMappings = %i", gilTempMappings);
+       //LOG("glTempMappings = %i", glTempMappings);
        
        for(;;)
        {
-               LOCK( &gilTempMappings );
+               Mutex_Acquire( &glTempMappings );
                
                for( i = 0; i < NUM_TEMP_PAGES; i ++ )
                {
@@ -909,11 +920,11 @@ tVAddr MM_MapTemp(tPAddr PAddr)
                        gaPageTable[ (TEMP_MAP_ADDR >> 12) + i ] = PAddr | 3;
                        INVLPG( TEMP_MAP_ADDR + (i << 12) );
                        //LEAVE('p', TEMP_MAP_ADDR + (i << 12));
-                       RELEASE( &gilTempMappings );
+                       Mutex_Release( &glTempMappings );
                        return TEMP_MAP_ADDR + (i << 12);
                }
-               RELEASE( &gilTempMappings );
-               Threads_Yield();
+               Mutex_Release( &glTempMappings );
+               Threads_Yield();        // TODO: Use a sleep queue here instead
        }
 }
 
@@ -1048,8 +1059,7 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
        
        i = VAddr >> 12;
        
-       LOCK( &gilTempMappings );       // Temp and HW share a directory, so they share a lock
-       
+       Mutex_Acquire( &glTempMappings );       // Temp and HW share a directory, so they share a lock
        
        for( j = 0; j < Number; j++ )
        {
@@ -1057,7 +1067,7 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
                gaPageTable[ i + j ] = 0;
        }
        
-       RELEASE( &gilTempMappings );
+       Mutex_Release( &glTempMappings );
 }
 
 // --- EXPORTS ---