ntdll: Handle alignment fault in signal handler on i386.

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

ntdll: Handle alignment fault in signal handler on i386.
846de4ae · Alexandre Julliard · 5e2b0585 · 846de4ae
Commit 846de4ae authored Sep 12, 2019 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 9 deletions

signal_i386.c dlls/ntdll/signal_i386.c +6 -9

No files found.
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1956,15 +1956,6 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
            }
        }
        break;
-    case EXCEPTION_DATATYPE_MISALIGNMENT:
-        /* FIXME: pass through exception handler first? */
-        if (context->EFlags & 0x00040000)
-        {
-            /* Disable AC flag, return */
-            context->EFlags &= ~0x00040000;
-            goto done;
-        }
-        break;
    case EXCEPTION_BREAKPOINT:
        if (!is_wow64)
        {
@@ -2078,6 +2069,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext )
        stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr;
        break;
    case TRAP_x86_ALIGNFLT:  /* Alignment check exception */
+        /* FIXME: pass through exception handler first? */
+        if (stack->context.EFlags & 0x00040000)
+        {
+            EFL_sig(context) &= ~0x00040000;  /* disable AC flag */
+            return;
+        }
        stack->rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT;
        break;
    default: