X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=f3cd7bb7086ba99130f746b20ee740d9a2dc6f97;hb=7a6a1cbc62289d64d604fb2cb204d21659c4905e;hp=958b9f15890cb1db30362f00707b791d5d7088b1;hpb=7514bb8053931759b99f77d3f9ad70446b0625ac;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index 958b9f15..f3cd7bb7 100644
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -9,7 +9,7 @@
  * 0xFE - Unused
  * 0xFF - System Calls / Kernel's User Code
  */
-#define DEBUG	1
+#define DEBUG	0
 #define SANITY	1
 #include <acess.h>
 #include <mm_phys.h>
@@ -66,6 +66,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 +154,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 );
+	}
 }
 
 /**
@@ -208,12 +215,14 @@ void MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs)
 			(ErrorCode&1?"bad/locked":"non-present"),
 			(ErrorCode&16?" (Instruction Fetch)":"")
 			);
-		Warning("User Pagefault: Instruction at %p accessed %p", Regs->eip, Addr);
+		Warning("User Pagefault: Instruction at %04x:%08x accessed %p", Regs->cs, Regs->eip, Addr);
 		__asm__ __volatile__ ("sti");	// Restart IRQs
 		Threads_SegFault(Addr);
 		return ;
 	}
 	
+	Debug_KernelPanic();
+	
 	// -- Check Error Code --
 	if(ErrorCode & 8)
 		Warning("Reserved Bits Trashed!");
@@ -779,15 +788,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
@@ -802,6 +821,9 @@ 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]);
 }
 
 /**
@@ -895,10 +917,10 @@ void MM_FreeTemp(tVAddr VAddr)
 }
 
 /**
- * \fn tVAddr MM_MapHWPage(tPAddr PAddr, Uint Number)
+ * \fn tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
  * \brief Allocates a contigous number of pages
  */
-tVAddr MM_MapHWPage(tPAddr PAddr, Uint Number)
+tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
 {
 	 int	i, j;
 	
@@ -962,7 +984,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 	{
 		phys = MM_AllocPhys();
 		*PhysAddr = phys;
-		ret = MM_MapHWPage(phys, 1);
+		ret = MM_MapHWPages(phys, 1);
 		if(ret == 0) {
 			MM_DerefPhys(phys);
 			LEAVE('i', 0);
@@ -981,7 +1003,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 	}
 	
 	// Allocated successfully, now map
-	ret = MM_MapHWPage(phys, Pages);
+	ret = MM_MapHWPages(phys, Pages);
 	if( ret == 0 ) {
 		// If it didn't map, free then return 0
 		for(;Pages--;phys+=0x1000)
@@ -996,10 +1018,10 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 }
 
 /**
- * \fn void MM_UnmapHWPage(tVAddr VAddr, Uint Number)
+ * \fn void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
  * \brief Unmap a hardware page
  */
-void MM_UnmapHWPage(tVAddr VAddr, Uint Number)
+void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 {
 	 int	i, j;
 	// Sanity Check
@@ -1011,7 +1033,7 @@ void MM_UnmapHWPage(tVAddr VAddr, Uint Number)
 	
 	for( j = 0; j < Number; j++ )
 	{
-		MM_DerefPhys( gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] );
+		MM_DerefPhys( gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] & ~0xFFF );
 		gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] = 0;
 	}
 	
@@ -1022,6 +1044,6 @@ void MM_UnmapHWPage(tVAddr VAddr, Uint Number)
 EXPORT(MM_GetPhysAddr);
 EXPORT(MM_Map);
 //EXPORT(MM_Unmap);
-EXPORT(MM_MapHWPage);
+EXPORT(MM_MapHWPages);
 EXPORT(MM_AllocDMA);
-EXPORT(MM_UnmapHWPage);
+EXPORT(MM_UnmapHWPages);