X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ferrors.c;h=dcedcd5c92a1e9732f3fafc4d954cb6ea41a53c0;hb=717454930aa0e255517c68c837927deac49bd78e;hp=1e0278b6ab9f691211e0bf959c40828beffa7e30;hpb=2d83a99f3202f0e4688b58405f67604a24420861;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 1e0278b6..dcedcd5c 100644
--- a/Kernel/arch/x86/errors.c
+++ b/Kernel/arch/x86/errors.c
@@ -60,9 +60,22 @@ void ErrorHandler(tRegs *Regs)
 	
 	__asm__ __volatile__ ("cli");
 	
+	// Debug exception (used for single-stepping)
+	if(Regs->int_num == 1)
+	{
+		static Uint32	lastEIP = 0;
+		tThread	*thread = Proc_GetCurThread();
+		if( Regs->eip == lastEIP )
+			return;
+		Log("%p(%i %s) IP=%08x", thread, thread->TID, thread->ThreadName, Regs->eip);
+		lastEIP = Regs->eip;
+		return ;
+	}
+	
 	// Page Fault
 	if(Regs->int_num == 14)
 	{
+		__asm__ __volatile__ ("sti");	// Should be OK, TODO: Test
 		__asm__ __volatile__ ("mov %%cr2, %0":"=r"(cr));
 		MM_PageFault( cr, Regs->err_code, Regs );
 		return ;