X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=db89cc14facb922d2add9f6e2ead535d01920590;hb=eb934b266052965b9c480d11d6866a994f30731b;hp=6976c6577db0eed8f6d63290d8f8ff28ffb156a1;hpb=049de1f2533477716a12a708c097b199eaa8fb6c;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index 6976c657..db89cc14 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>
@@ -208,12 +208,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!");