Skip to content

W
wine-cw
Commit dec4c99a authored by Martin Storsjo's avatar Martin Storsjo Committed by Alexandre Julliard
Browse files
Options

msvcrt: Provide the fmaf function on i386.

This is one of the new -f suffixed C99 math functions that actually are available on all architectures, even on i386. Signed-off-by: 's avatarMartin Storsjo <martin@martin.st> Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c722d819
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
View file @ dec4c99a
......@@ -242,7 +242,7 @@
@ cdecl floor(double) ucrtbase.floor
@ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf
@ cdecl fma(double double double) ucrtbase.fma
@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf
@ cdecl fmaf(float float float) ucrtbase.fmaf
@ stub fmal
@ cdecl fmax(double double) ucrtbase.fmax
@ cdecl fmaxf(float float) ucrtbase.fmaxf
......
dlls/msvcr120/msvcr120.spec
View file @ dec4c99a
......@@ -2165,7 +2165,7 @@
@ cdecl floor(double) MSVCRT_floor
@ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf
@ cdecl fma(double double double) MSVCRT_fma
@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf
@ cdecl fmaf(float float float) MSVCRT_fmaf
@ stub fmal
@ cdecl fmax(double double) MSVCR120_fmax
@ cdecl fmaxf(float float) MSVCR120_fmaxf
......
dlls/msvcr120_app/msvcr120_app.spec
View file @ dec4c99a
......@@ -1831,7 +1831,7 @@
@ cdecl floor(double) msvcr120.floor
@ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf
@ cdecl fma(double double double) msvcr120.fma
@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf
@ cdecl fmaf(float float float) msvcr120.fmaf
@ stub fmal
@ cdecl fmax(double double) msvcr120.fmax
@ cdecl fmaxf(float float) msvcr120.fmaxf
......
dlls/msvcrt/math.c
View file @ dec4c99a
......@@ -388,22 +388,6 @@ float CDECL MSVCRT_floorf( float x )
}
/*********************************************************************
* fmaf (MSVCRT.@)
*/
float CDECL MSVCRT_fmaf( float x, float y, float z )
{
#ifdef HAVE_FMAF
float w = fmaf(x, y, z);
#else
float w = x * y + z;
#endif
if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM;
else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM;
else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM;
return w;
}
/*********************************************************************
* frexpf (MSVCRT.@)
*/
float CDECL MSVCRT_frexpf( float x, int *exp )
......@@ -896,6 +880,22 @@ double CDECL MSVCRT_fma( double x, double y, double z )
}
/*********************************************************************
* fmaf (MSVCRT.@)
*/
float CDECL MSVCRT_fmaf( float x, float y, float z )
{
#ifdef HAVE_FMAF
float w = fmaf(x, y, z);
#else
float w = x * y + z;
#endif
if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM;
else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM;
else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM;
return w;
}
/*********************************************************************
* fabs (MSVCRT.@)
*/
double CDECL MSVCRT_fabs( double x )
......
dlls/ucrtbase/ucrtbase.spec
View file @ dec4c99a
......@@ -2306,7 +2306,7 @@
@ cdecl floor(double) MSVCRT_floor
@ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf
@ cdecl fma(double double double) MSVCRT_fma
@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf
@ cdecl fmaf(float float float) MSVCRT_fmaf
@ stub fmal
@ cdecl fmax(double double) MSVCR120_fmax
@ cdecl fmaxf(float float) MSVCR120_fmaxf
......
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