X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=aaec06ea1ae93355acd4de050cfc0bf70329700f;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=f2be750f0832e8846cc8047daf40cde690a88138;hpb=814b2d0009da73b56c6def5d70a9dd97c7b17e2e;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index f2be750f..aaec06ea 100644
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -12,6 +12,7 @@
 #define DEBUG	0
 #define SANITY	1
 #include <acess.h>
+#include <mm_virt.h>
 #include <mm_phys.h>
 #include <proc.h>
 
@@ -66,6 +67,7 @@ typedef Uint32	tTabEnt;
 #endif
 
 // === IMPORTS ===
+extern void	_UsertextEnd, _UsertextBase;
 extern Uint32	gaInitPageDir[1024];
 extern Uint32	gaInitPageTable[1024];
 extern void	Threads_SegFault(tVAddr Addr);
@@ -153,6 +155,12 @@ void MM_InstallVirtual()
 		memset( &gaPageTable[i*1024], 0, 0x1000 );
 	}
 	#endif
+	
+	// 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 );
+	}
 }
 
 /**
@@ -405,27 +413,11 @@ tPAddr MM_GetPhysAddr(tVAddr Addr)
 	return (gaPageTable[Addr >> 12] & ~0xFFF) | (Addr & 0xFFF);
 }
 
-
-/**
- * \fn int MM_IsUser(tVAddr VAddr)
- * \brief Checks if a page is user accessable
- */
-int MM_IsUser(tVAddr VAddr)
-{
-	if( !(gaPageDir[VAddr >> 22] & 1) )
-		return 0;
-	if( !(gaPageTable[VAddr >> 12] & 1) )
-		return 0;
-	if( !(gaPageTable[VAddr >> 12] & PF_USER) )
-		return 0;
-	return 1;
-}
-
 /**
- * \fn void MM_SetCR3(tPAddr CR3)
+ * \fn void MM_SetCR3(Uint CR3)
  * \brief Sets the current process space
  */
-void MM_SetCR3(tPAddr CR3)
+void MM_SetCR3(Uint CR3)
 {
 	__asm__ __volatile__ ("mov %0, %%cr3"::"r"(CR3));
 }
@@ -781,15 +773,25 @@ void MM_SetFlags(tVAddr VAddr, Uint Flags, Uint Mask)
 	// Read-Only
 	if( Mask & MM_PFLAG_RO )
 	{
-		if( Flags & MM_PFLAG_RO )	*ent &= ~PF_WRITE;
-		else 	*ent |= PF_WRITE;
+		if( Flags & MM_PFLAG_RO ) {
+			*ent &= ~PF_WRITE;
+		}
+		else {
+			gaPageDir[VAddr >> 22] |= PF_WRITE;
+			*ent |= PF_WRITE;
+		}
 	}
 	
 	// Kernel
 	if( Mask & MM_PFLAG_KERNEL )
 	{
-		if( Flags & MM_PFLAG_KERNEL )	*ent &= ~PF_USER;
-		else	*ent |= PF_USER;
+		if( Flags & MM_PFLAG_KERNEL ) {
+			*ent &= ~PF_USER;
+		}
+		else {
+			gaPageDir[VAddr >> 22] |= PF_USER;
+			*ent |= PF_USER;
+		}
 	}
 	
 	// Copy-On-Write
@@ -804,6 +806,33 @@ void MM_SetFlags(tVAddr VAddr, Uint Flags, Uint Mask)
 			*ent |= PF_WRITE;
 		}
 	}
+	
+	//Log("MM_SetFlags: *ent = 0x%08x, gaPageDir[%i] = 0x%08x",
+	//	*ent, VAddr >> 22, gaPageDir[VAddr >> 22]);
+}
+
+/**
+ * \brief Get the flags on a page
+ */
+Uint MM_GetFlags(tVAddr VAddr)
+{
+	tTabEnt	*ent;
+	Uint	ret = 0;
+	
+	// Validity Check
+	if( !(gaPageDir[VAddr >> 22] & 1) )	return 0;
+	if( !(gaPageTable[VAddr >> 12] & 1) )	return 0;
+	
+	ent = &gaPageTable[VAddr >> 12];
+	
+	// Read-Only
+	if( !(*ent & PF_WRITE) )	ret |= MM_PFLAG_RO;
+	// Kernel
+	if( !(*ent & PF_USER) )	ret |= MM_PFLAG_KERNEL;
+	// Copy-On-Write
+	if( *ent & PF_COW )	ret |= MM_PFLAG_COW;
+	
+	return ret;
 }
 
 /**
@@ -1004,17 +1033,21 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 {
 	 int	i, j;
+	
+	//Log_Debug("VirtMem", "MM_UnmapHWPages: (VAddr=0x%08x, Number=%i)", VAddr, Number);
+	
 	// Sanity Check
-	if(VAddr < HW_MAP_ADDR || VAddr-Number*0x1000 > HW_MAP_MAX)	return;
+	if(VAddr < HW_MAP_ADDR || VAddr+Number*0x1000 > HW_MAP_MAX)	return;
 	
 	i = VAddr >> 12;
 	
 	LOCK( &gilTempMappings );	// Temp and HW share a directory, so they share a lock
 	
+	
 	for( j = 0; j < Number; j++ )
 	{
-		MM_DerefPhys( gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] & ~0xFFF );
-		gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] = 0;
+		MM_DerefPhys( gaPageTable[ i + j ] & ~0xFFF );
+		gaPageTable[ i + j ] = 0;
 	}
 	
 	RELEASE( &gilTempMappings );