Kernel/x86 - Added backtrace to running program in thread dump

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

diff --git a/KernelLand/Kernel/arch/x86/mm_virt.c b/KernelLand/Kernel/arch/x86/mm_virt.c
index 13562f2..216bc1e 100644 (file)
--- a/KernelLand/Kernel/arch/x86/mm_virt.c
+++ b/KernelLand/Kernel/arch/x86/mm_virt.c
@@ -414,7 +414,7 @@ void MM_Deallocate(tVAddr VAddr)
  * \fn tPAddr MM_GetPhysAddr(tVAddr Addr)
  * \brief Checks if the passed address is accesable
  */
-tPAddr MM_GetPhysAddr(const void *Addr)
+tPAddr MM_GetPhysAddr(volatile const void *Addr)
 {
        tVAddr  addr = (tVAddr)Addr;
        if( !(gaPageDir[addr >> 22] & 1) )
@@ -1027,14 +1027,19 @@ void MM_FreeTemp(void *VAddr)
  * \fn tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
  * \brief Allocates a contigous number of pages
  */
-tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
+void *MM_MapHWPages(tPAddr PAddr, Uint Number)
 {
-        int    i, j;
+        int    j;
        
        PAddr &= ~0xFFF;
-       
+
+       if( PAddr < 1024*1024 && (1024*1024-PAddr) >= Number * PAGE_SIZE )
+       {
+               return (void*)(KERNEL_BASE + PAddr);
+       }
+
        // Scan List
-       for( i = 0; i < NUM_HW_PAGES; i ++ )
+       for( int i = 0; i < NUM_HW_PAGES; i ++ )
        {               
                // Check if addr used
                if( gaPageTable[ (HW_MAP_ADDR >> 12) + i ] & 1 )
@@ -1054,7 +1059,7 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
                                MM_RefPhys( PAddr + (j<<12) );
                                gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] = (PAddr + (j<<12)) | 3;
                        }
-                       return HW_MAP_ADDR + (i<<12);
+                       return (void*)(HW_MAP_ADDR + (i<<12));
                }
        }
        // If we don't find any, return NULL
@@ -1069,10 +1074,10 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
  * \param PhysAddr     Pointer to the location to place the physical address allocated
  * \return Virtual address allocate
  */
-tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
+void *MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 {
        tPAddr  phys;
-       tVAddr  ret;
+       void    *ret;
        
        ENTER("iPages iMaxBits pPhysAddr", Pages, MaxBits, PhysAddr);
        
@@ -1101,7 +1106,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
                        return 0;
                }
                LEAVE('x', ret);
-               return ret;
+               return (void*)ret;
        }
        
        // Slow Allocate
@@ -1125,7 +1130,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
        if( PhysAddr )
                *PhysAddr = phys;
        LEAVE('x', ret);
-       return ret;
+       return (void*)ret;
 }
 
 /**
@@ -1137,7 +1142,11 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
         int    i, j;
        
        //Log_Debug("VirtMem", "MM_UnmapHWPages: (VAddr=0x%08x, Number=%i)", VAddr, Number);
-       
+
+       //
+       if( KERNEL_BASE <= VAddr && VAddr < KERNEL_BASE + 1024*1024 )
+               return ;        
+
        // Sanity Check
        if(VAddr < HW_MAP_ADDR || VAddr+Number*0x1000 > HW_MAP_MAX)     return;