marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure changes to the debug registers while inside a SIGTRAP 

exception are taken into account (based on a patch by Alex Pasadyn).
oldstable
Alexandre Julliard 2003-03-24 19:31:10 +00:00
parent d6841ee98d
commit a993df861c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/ntdll/signal_i386.c
View File

@ -836,6 +836,7 @@ static void do_segv( CONTEXT *context, int trap_code, void *cr2, int err_code )
static void do_trap( CONTEXT *context, int trap_code )
{
EXCEPTION_RECORD rec;
DWORD dr0, dr1, dr2, dr3, dr6, dr7;
rec.ExceptionFlags = EXCEPTION_CONTINUABLE;
rec.ExceptionRecord = NULL;
@ -845,18 +846,15 @@ static void do_trap( CONTEXT *context, int trap_code )
switch(trap_code)
{
case T_TRCTRAP: /* Single-step exception */
rec.ExceptionCode = EXCEPTION_SINGLE_STEP;
if (context->EFlags & 0x100)
{
rec.ExceptionCode = EXCEPTION_SINGLE_STEP;
context->EFlags &= ~0x100; /* clear single-step flag */
}
else
else /* hardware breakpoint, fetch the debug registers */
{
/* likely we get this because of a kill(SIGTRAP) on ourself,
* so send a bp exception instead of a single step exception
*/
TRACE("Spurious single step trap => breakpoint simulation\n");
rec.ExceptionCode = EXCEPTION_BREAKPOINT;
context->ContextFlags = CONTEXT_DEBUG_REGISTERS;
GetThreadContext(GetCurrentThread(), context);
}
break;
case T_BPTFLT: /* Breakpoint exception */
@ -866,7 +864,22 @@ static void do_trap( CONTEXT *context, int trap_code )
rec.ExceptionCode = EXCEPTION_BREAKPOINT;
break;
}
dr0 = context->Dr0;
dr1 = context->Dr1;
dr2 = context->Dr2;
dr3 = context->Dr3;
dr6 = context->Dr6;
dr7 = context->Dr7;
EXC_RtlRaiseException( &rec, context );
if (dr0 != context->Dr0 || dr1 != context->Dr1 || dr2 != context->Dr2 ||
dr3 != context->Dr3 || dr6 != context->Dr6 || dr7 != context->Dr7)
{
/* the debug registers have changed, set the new values */
context->ContextFlags = CONTEXT_DEBUG_REGISTERS;
SetThreadContext(GetCurrentThread(), context);
}
}