X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=c930947dedfbf2444dea6d25cedd93c32bde3e3f;hb=abecaa9215f064b5b5631852fd809b63f1379c93;hp=2b7d191b303c862ff945cba87a6ccc4f71c26754;hpb=71127582530c214c99852fda37f7e5296774a26f;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index 2b7d191b..c930947d 100644
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -41,6 +41,7 @@
 extern Uint32	gaInitPageDir[1024];
 extern Uint32	gaInitPageTable[1024];
 extern void	Threads_SegFault(Uint Addr);
+extern void	Error_Backtrace(Uint eip, Uint ebp);
 
 // === PROTOTYPES ===
 void	MM_PreinitVirtual();
@@ -127,7 +128,8 @@ void MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs)
 	
 	// If it was a user, tell the thread handler
 	if(ErrorCode & 4) {
-		Warning("User Pagefault: Instruction at %p accessed %p\n", Regs->eip, Addr);
+		Warning("User Pagefault: Instruction at %p accessed %p", Regs->eip, Addr);
+		__asm__ __volatile__ ("sti");	// Restart IRQs
 		Threads_SegFault(Addr);
 		return ;
 	}
@@ -145,12 +147,14 @@ void MM_PageFault(Uint Addr, Uint ErrorCode, tRegs *Regs)
 			);
 	}
 	
+	Log("Code at %p accessed %p", Regs->eip, Addr);
+	// Print Stack Backtrace
+	Error_Backtrace(Regs->eip, Regs->ebp);
+	
 	Log("gaPageDir[0x%x] = 0x%x", Addr>>22, gaPageDir[Addr>>22]);
 	if( gaPageDir[Addr>>22] & PF_PRESENT )
 		Log("gaPageTable[0x%x] = 0x%x", Addr>>12, gaPageTable[Addr>>12]);
 	
-	Log("Code at %p accessed %p\n", Regs->eip, Addr);
-	
 	MM_DumpTables(0, -1);	
 	
 	Panic("Page Fault at 0x%x\n", Regs->eip);