Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some of the damage r17811 did to the GDB stub

Browse source 
svn path=/trunk/; revision=17871
This commit is contained in:
Gé van Geldorp 2005-09-15 22:07:35 +00:00
parent 43bdfc834c
commit 30aad7b52a
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/ntoskrnl/kd/wrappers/gdbstub.c
View file

@ -1068,7 +1068,7 @@ GspSetHwBreakpoint(ULONG BreakpointNumber,
} }
static BOOL gdb_attached_yet = TRUE; static BOOL gdb_attached_yet = FALSE;
/* /*
* This function does all command procesing for interfacing to gdb. * This function does all command procesing for interfacing to gdb.
*/ */
@ -1102,7 +1102,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
{ {
GspAccessLocation = NULL; GspAccessLocation = NULL;
GspMemoryError = TRUE; GspMemoryError = TRUE;
TrapFrame->Eip += 3; Context->Eip += 3;
} }
else else
{ {
@ -1321,8 +1321,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
#error Unknown compiler for inline assembler #error Unknown compiler for inline assembler
#endif #endif
KeContextToTrapFrame(Context, NULL, TrapFrame, KernelMode); return kdContinue;
return ((SigVal == 5) ? (kdContinue) : (kdHandleException));
break; break;
} }
@ -1399,7 +1398,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
ASSERT(0); ASSERT(0);
} }
return kdDoNotHandleException; return kdContinue;
} }

2
reactos/ntoskrnl/ke/i386/exp.c
View file

@ -1242,7 +1242,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
&Context, &Context,
TrapFrame, TrapFrame,
TRUE, TRUE,
FALSE); TRUE);
/* Exit if we're continuing */ /* Exit if we're continuing */
if (Action == kdContinue) goto Handled; if (Action == kdContinue) goto Handled;