system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-09 04:16:08 +00:00
Code Issues Projects Releases Wiki Activity

msvcrt: Use the nextafter()/nextafterf() implementation from the bundled musl library.

Browse Source
This commit is contained in:
Alexandre Julliard 2023-04-04 16:48:53 +02:00
parent cd29cd85ab
commit 85e655445b
14 changed files with 52 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/crtdll/crtdll.spec
View File

@ -241,7 +241,7 @@
@ cdecl _mkdir(str)
@ cdecl _mktemp(str)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl _nextafter(double double) nextafter
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

4
dlls/msvcr100/msvcr100.spec
View File

@ -1215,8 +1215,8 @@
@ cdecl _mktime32(ptr)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

4
dlls/msvcr110/msvcr110.spec
View File

@ -1572,8 +1572,8 @@
@ cdecl _mktime32(ptr)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

10
dlls/msvcr120/msvcr120.spec
View File

@ -1583,8 +1583,8 @@
@ cdecl _mktime32(ptr)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)
@ -2300,9 +2300,9 @@
@ cdecl nearbyint(double)
@ cdecl nearbyintf(float)
@ cdecl nearbyintl(double) nearbyint
@ cdecl nextafter(double double) _nextafter
@ cdecl nextafterf(float float) _nextafterf
@ cdecl nextafterl(double double) _nextafter
@ cdecl nextafter(double double)
@ cdecl nextafterf(float float)
@ cdecl nextafterl(double double) nextafter
@ cdecl nexttoward(double double) MSVCRT_nexttoward
@ cdecl nexttowardf(float double) MSVCRT_nexttowardf
@ cdecl nexttowardl(double double) MSVCRT_nexttoward

2
dlls/msvcr70/msvcr70.spec
View File

@ -479,7 +479,7 @@
@ cdecl _mktemp(str)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl _nextafter(double double) nextafter
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

2
dlls/msvcr71/msvcr71.spec
View File

@ -474,7 +474,7 @@
@ cdecl _mktemp(str)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl _nextafter(double double) nextafter
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

4
dlls/msvcr80/msvcr80.spec
View File

@ -887,8 +887,8 @@
@ cdecl _mktime32(ptr)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

4
dlls/msvcr90/msvcr90.spec
View File

@ -865,8 +865,8 @@
@ cdecl _mktime32(ptr)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

89
dlls/msvcrt/math.c
View File

@ -216,49 +216,6 @@ float CDECL _chgsignf( float num )
return u.f;
}
/*********************************************************************
* _nextafterf (MSVCRT.@)
*
* Copied from musl: src/math/nextafterf.c
*/
float CDECL _nextafterf( float x, float y )
{
unsigned int ix = *(unsigned int*)&x;
unsigned int iy = *(unsigned int*)&y;
unsigned int ax, ay, e;
if (isnan(x) || isnan(y))
return x + y;
if (x == y) {
if (_fpclassf(y) & (_FPCLASS_ND | _FPCLASS_PD | _FPCLASS_NZ | _FPCLASS_PZ ))
*_errno() = ERANGE;
return y;
}
ax = ix & 0x7fffffff;
ay = iy & 0x7fffffff;
if (ax == 0) {
if (ay == 0)
return y;
ix = (iy & 0x80000000) | 1;
} else if (ax > ay || ((ix ^ iy) & 0x80000000))
ix--;
else
ix++;
e = ix & 0x7f800000;
/* raise overflow if ix is infinite and x is finite */
if (e == 0x7f800000) {
fp_barrierf(x + x);
*_errno() = ERANGE;
}
/* raise underflow if ix is subnormal or zero */
y = *(float*)&ix;
if (e == 0) {
fp_barrierf(x * x + y * y);
*_errno() = ERANGE;
}
return y;
}
#endif
/* Copied from musl: src/math/__rem_pio2_large.c */
@ -4124,7 +4081,7 @@ float CDECL nearbyintf(float x)
*/
double CDECL MSVCRT_nexttoward(double num, double next)
{
return _nextafter(num, next);
return nextafter(num, next);
}
/*********************************************************************
@ -4174,50 +4131,6 @@ float CDECL MSVCRT_nexttowardf(float x, double y)
#endif /* _MSVCR_VER>=120 */
/*********************************************************************
* _nextafter (MSVCRT.@)
*
* Copied from musl: src/math/nextafter.c
*/
double CDECL _nextafter(double x, double y)
{
ULONGLONG llx = *(ULONGLONG*)&x;
ULONGLONG lly = *(ULONGLONG*)&y;
ULONGLONG ax, ay;
int e;
if (isnan(x) || isnan(y))
return x + y;
if (llx == lly) {
if (_fpclass(y) & (_FPCLASS_ND | _FPCLASS_PD | _FPCLASS_NZ | _FPCLASS_PZ ))
*_errno() = ERANGE;
return y;
}
ax = llx & -1ULL / 2;
ay = lly & -1ULL / 2;
if (ax == 0) {
if (ay == 0)
return y;
llx = (lly & 1ULL << 63) | 1;
} else if (ax > ay || ((llx ^ lly) & 1ULL << 63))
llx--;
else
llx++;
e = llx >> 52 & 0x7ff;
/* raise overflow if llx is infinite and x is finite */
if (e == 0x7ff) {
fp_barrier(x + x);
*_errno() = ERANGE;
}
/* raise underflow if llx is subnormal or zero */
y = *(double*)&llx;
if (e == 0) {
fp_barrier(x * x + y * y);
*_errno() = ERANGE;
}
return y;
}
/*********************************************************************
* _ecvt (MSVCRT.@)
*/

4
dlls/msvcrt/msvcrt.spec
View File

@ -840,8 +840,8 @@
@ cdecl _msize(ptr)
# stub -arch=win32 _msize_debug(ptr long)
# stub -arch=win64 _msize_dbg(ptr long)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

2
dlls/msvcrtd/msvcrtd.spec
View File

@ -457,7 +457,7 @@
@ cdecl _mktemp(str)
@ cdecl _msize(ptr)
@ cdecl _msize_dbg(ptr) _msize
@ cdecl _nextafter(double double)
@ cdecl _nextafter(double double) nextafter
@ cdecl _onexit(ptr)
@ varargs _open(str long)
@ cdecl _open_osfhandle(long long)

20
dlls/ucrtbase/ucrtbase.spec
View File

@ -731,8 +731,8 @@
@ cdecl _mktime32(ptr)
@ cdecl _mktime64(ptr)
@ cdecl _msize(ptr)
@ cdecl _nextafter(double double)
@ cdecl -arch=x86_64 _nextafterf(float float)
@ cdecl _nextafter(double double) nextafter
@ cdecl -arch=x86_64 _nextafterf(float float) nextafterf
@ cdecl -arch=i386 _o__CIacos() _CIacos
@ cdecl -arch=i386 _o__CIasin() _CIasin
@ cdecl -arch=i386 _o__CIatan() _CIatan
@ -1299,8 +1299,8 @@
@ cdecl _o__mktime32(ptr) _mktime32
@ cdecl _o__mktime64(ptr) _mktime64
@ cdecl _o__msize(ptr) _msize
@ cdecl _o__nextafter(double double) _nextafter
@ cdecl -arch=x86_64 _o__nextafterf(float float) _nextafterf
@ cdecl _o__nextafter(double double) nextafter
@ cdecl -arch=x86_64 _o__nextafterf(float float) nextafterf
@ cdecl _o__open_osfhandle(long long) _open_osfhandle
@ cdecl _o__pclose(ptr) _pclose
@ cdecl _o__pipe(ptr long long) _pipe
@ -1730,9 +1730,9 @@
@ cdecl _o_nearbyint(double) nearbyint
@ cdecl _o_nearbyintf(float) nearbyintf
@ cdecl _o_nearbyintl(double) nearbyint
@ cdecl _o_nextafter(double double) _nextafter
@ cdecl _o_nextafterf(float float) _nextafterf
@ cdecl _o_nextafterl(double double) _nextafter
@ cdecl _o_nextafter(double double) nextafter
@ cdecl _o_nextafterf(float float) nextafterf
@ cdecl _o_nextafterl(double double) nextafter
@ cdecl _o_nexttoward(double double) MSVCRT_nexttoward
@ cdecl _o_nexttowardf(float double) MSVCRT_nexttowardf
@ cdecl _o_nexttowardl(double double) MSVCRT_nexttoward
@ -2438,9 +2438,9 @@
@ cdecl nearbyint(double)
@ cdecl nearbyintf(float)
@ cdecl nearbyintl(double) nearbyint
@ cdecl nextafter(double double) _nextafter
@ cdecl nextafterf(float float) _nextafterf
@ cdecl nextafterl(double double) _nextafter
@ cdecl nextafter(double double)
@ cdecl nextafterf(float float)
@ cdecl nextafterl(double double) nextafter
@ cdecl nexttoward(double double) MSVCRT_nexttoward
@ cdecl nexttowardf(float double) MSVCRT_nexttowardf
@ cdecl nexttowardl(double double) MSVCRT_nexttoward

14
libs/musl/src/math/nextafter.c
View File

@ -8,8 +8,12 @@ double __cdecl nextafter(double x, double y)
if (isnan(x) || isnan(y))
return x + y;
if (ux.i == uy.i)
if (ux.i == uy.i) {
e = ux.i >> 52 & 0x7ff;
if (!e)
errno = ERANGE;
return y;
}
ax = ux.i & -1ULL/2;
ay = uy.i & -1ULL/2;
if (ax == 0) {
@ -22,10 +26,14 @@ double __cdecl nextafter(double x, double y)
ux.i++;
e = ux.i >> 52 & 0x7ff;
/* raise overflow if ux.f is infinite and x is finite */
if (e == 0x7ff)
if (e == 0x7ff) {
FORCE_EVAL(x+x);
errno = ERANGE;
}
/* raise underflow if ux.f is subnormal or zero */
if (e == 0)
if (e == 0) {
FORCE_EVAL(x*x + ux.f*ux.f);
errno = ERANGE;
}
return ux.f;
}

14
libs/musl/src/math/nextafterf.c
View File

@ -7,8 +7,12 @@ float __cdecl nextafterf(float x, float y)
if (isnan(x) || isnan(y))
return x + y;
if (ux.i == uy.i)
if (ux.i == uy.i) {
e = ux.i & 0x7f800000;
if (!e)
errno = ERANGE;
return y;
}
ax = ux.i & 0x7fffffff;
ay = uy.i & 0x7fffffff;
if (ax == 0) {
@ -21,10 +25,14 @@ float __cdecl nextafterf(float x, float y)
ux.i++;
e = ux.i & 0x7f800000;
/* raise overflow if ux.f is infinite and x is finite */
if (e == 0x7f800000)
if (e == 0x7f800000) {
FORCE_EVAL(x+x);
errno = ERANGE;
}
/* raise underflow if ux.f is subnormal or zero */
if (e == 0)
if (e == 0) {
FORCE_EVAL(x*x + ux.f*ux.f);
errno = ERANGE;
}
return ux.f;
}