Author: tkreuzer Date: Sat Nov 16 15:25:44 2013 New Revision: 61009
URL: http://svn.reactos.org/svn/reactos?rev=61009&view=rev Log: [NTOSKRNL] Don't use KiTrapReturnNoSegmentsRet8, when single stepping is active. Fixes debugging with WinDbg
Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c
Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.c... ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Nov 16 15:25:44 2013 @@ -129,6 +129,9 @@ /* Check for edited frame */ if (KiIsFrameEdited(TrapFrame)) KiEditedTrapReturn(TrapFrame);
+ /* Check if we have single stepping enabled */ + if (TrapFrame->EFlags & EFLAGS_TF) KiTrapReturnNoSegments(TrapFrame); + /* Exit the trap to kernel mode */ KiTrapReturnNoSegmentsRet8(TrapFrame); } @@ -190,6 +193,9 @@
/* Check for edited frame */ if (KiIsFrameEdited(TrapFrame)) KiEditedTrapReturn(TrapFrame); + + /* Check if we have single stepping enabled */ + if (TrapFrame->EFlags & EFLAGS_TF) KiTrapReturnNoSegments(TrapFrame);
/* Exit the trap to kernel mode */ KiTrapReturnNoSegmentsRet8(TrapFrame);