Skip to content

W
wine-winehq
Commit c521ec04 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Make _setfp* helpers infallible.

The functions may only fail on unsupported compilers/architectures. It's not really possible to handle errors properly. Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 564ede5d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 22 deletions
dlls/msvcrt/math.c
View file @ c521ec04
...@@ -5167,7 +5167,7 @@ double CDECL modf( double x, double *iptr ) ...@@ -5167,7 +5167,7 @@ double CDECL modf( double x, double *iptr )
} }
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, static void _setfp_sse( unsigned int *cw, unsigned int cw_mask,
unsigned int *sw, unsigned int sw_mask ) unsigned int *sw, unsigned int sw_mask )
{ {
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
...@@ -5256,17 +5256,15 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, ...@@ -5256,17 +5256,15 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask,
if (fpword != old_fpword) if (fpword != old_fpword)
__asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) );
return TRUE;
#else #else
FIXME("not implemented\n"); FIXME("not implemented\n");
if (cw) *cw = 0; if (cw) *cw = 0;
if (sw) *sw = 0; if (sw) *sw = 0;
return FALSE;
#endif #endif
} }
#endif #endif
static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, static void _setfp( unsigned int *cw, unsigned int cw_mask,
unsigned int *sw, unsigned int sw_mask ) unsigned int *sw, unsigned int sw_mask )
{ {
#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)
...@@ -5376,16 +5374,15 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, ...@@ -5376,16 +5374,15 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask,
fenv.status_word = newsw; fenv.status_word = newsw;
__asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)",
"st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" );
return TRUE; return;
} }
if (oldsw != newsw) if (oldsw != newsw)
__asm__ __volatile__( "fnclex" ); __asm__ __volatile__( "fnclex" );
if (oldcw != newcw) if (oldcw != newcw)
__asm__ __volatile__( "fldcw %0" : : "m" (newcw) ); __asm__ __volatile__( "fldcw %0" : : "m" (newcw) );
return TRUE;
#elif defined(__x86_64__) #elif defined(__x86_64__)
return _setfp_sse(cw, cw_mask, sw, sw_mask); _setfp_sse(cw, cw_mask, sw, sw_mask);
#elif defined(__aarch64__) #elif defined(__aarch64__)
ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0; ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0;
unsigned int flags; unsigned int flags;
...@@ -5465,7 +5462,6 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, ...@@ -5465,7 +5462,6 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask,
__asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) );
if (old_fpcr != fpcr) if (old_fpcr != fpcr)
__asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) );
return TRUE;
#elif defined(__arm__) && !defined(__SOFTFP__) #elif defined(__arm__) && !defined(__SOFTFP__)
DWORD old_fpscr, fpscr; DWORD old_fpscr, fpscr;
unsigned int flags; unsigned int flags;
...@@ -5533,12 +5529,10 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, ...@@ -5533,12 +5529,10 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask,
if (old_fpscr != fpscr) if (old_fpscr != fpscr)
__asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) );
return TRUE;
#else #else
FIXME("not implemented\n"); FIXME("not implemented\n");
if (cw) *cw = 0; if (cw) *cw = 0;
if (sw) *sw = 0; if (sw) *sw = 0;
return FALSE;
#endif #endif
} }
...@@ -5648,8 +5642,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, ...@@ -5648,8 +5642,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask,
if (x86_cw) if (x86_cw)
{ {
*x86_cw = newval; *x86_cw = newval;
if (!_setfp(x86_cw, mask, NULL, 0)) _setfp(x86_cw, mask, NULL, 0);
return 0;
} }
if (!sse2_cw) return 1; if (!sse2_cw) return 1;
...@@ -5657,8 +5650,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, ...@@ -5657,8 +5650,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask,
if (sse2_supported) if (sse2_supported)
{ {
*sse2_cw = newval; *sse2_cw = newval;
if (!_setfp_sse(sse2_cw, mask, NULL, 0)) _setfp_sse(sse2_cw, mask, NULL, 0);
return 0;
} }
else *sse2_cw = 0; else *sse2_cw = 0;
...@@ -6053,17 +6045,12 @@ int CDECL fesetenv(const fenv_t *env) ...@@ -6053,17 +6045,12 @@ int CDECL fesetenv(const fenv_t *env)
#endif #endif
#ifdef __i386__ #ifdef __i386__
if (!_setfp(&x87_cw, mask, &x87_stat, ~0)) _setfp(&x87_cw, mask, &x87_stat, ~0);
return 1;
if (sse2_supported) if (sse2_supported)
{ _setfp_sse(&cw, mask, &stat, ~0);
if (!_setfp_sse(&cw, mask, &stat, ~0))
return 1;
}
return 0; return 0;
#else #else
if (!_setfp(&cw, mask, &stat, ~0)) _setfp(&cw, mask, &stat, ~0);
return 1;
return 0; return 0;
#endif #endif
} }
......
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