ntdll/tests: Run exception tests under the debugger on all platforms.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll/tests: Run exception tests under the debugger on all platforms.
13abe9e2 · Alexandre Julliard · 4f3534fa · 13abe9e2 · 13abe9e2 · 13abe9e2
Commit 13abe9e2 authored Aug 11, 2020 by Alexandre Julliard
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

exception.c dlls/ntdll/tests/exception.c +0 -0

signal_arm.c dlls/ntdll/unix/signal_arm.c +1 -0

signal_arm64.c dlls/ntdll/unix/signal_arm64.c +1 -3

No files found.
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -552,6 +552,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec )

    rec->ExceptionAddress = (void *)PC_sig(sigcontext);
    save_context( &context, sigcontext );
+    if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc += 4;

    status = send_debug_event( rec, &context, TRUE );
    if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)

--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -554,6 +554,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec )
    rec->ExceptionAddress = (void *)PC_sig(sigcontext);
    save_context( &context, sigcontext );
    save_fpu( &context, sigcontext );
+    if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc += 4;

    status = send_debug_event( rec, &context, TRUE );
    if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED)
@@ -562,9 +563,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec )
        return;
    }

-    /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */
-    if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc += 4;
-
    stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec );
    stack->rec = *rec;
    stack->context = context;