AcessNative - Fixing Fixing Fixing

[tpg/acess2.git] / Kernel / arch / x86 / errors.c

diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c
index 1e0278b..dcedcd5 100644 (file)
--- 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 ;