Skip to content

W
wine-cw
Commit 52b6bd95 authored by Dave Hawkes's avatar Dave Hawkes Committed by Alexandre Julliard
Browse files
Options

Exception handling for SIGFPE must always clear the FPU interrupt

status.
parent 4f356e86
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
dlls/ntdll/signal_i386.c
View file @ 52b6bd95
...@@ -443,6 +443,8 @@ static void inline save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) ...@@ -443,6 +443,8 @@ static void inline save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
*/ */
static void inline restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) static void inline restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
{ {
/* reset the current interrupt status */
context->FloatSave.StatusWord &= context->FloatSave.ControlWord | 0xffffff80;
#ifdef FPU_sig #ifdef FPU_sig
if (FPU_sig(sigcontext)) if (FPU_sig(sigcontext))
{ {
...@@ -452,7 +454,6 @@ static void inline restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) ...@@ -452,7 +454,6 @@ static void inline restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext )
#endif /* FPU_sig */ #endif /* FPU_sig */
#ifdef __GNUC__ #ifdef __GNUC__
/* avoid nested exceptions */ /* avoid nested exceptions */
context->FloatSave.StatusWord &= context->FloatSave.ControlWord | 0xffffff80;
__asm__ __volatile__( "frstor %0; fwait" : : "m" (context->FloatSave) ); __asm__ __volatile__( "frstor %0; fwait" : : "m" (context->FloatSave) );
#endif /* __GNUC__ */ #endif /* __GNUC__ */
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment