Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5b025c71
Commit
5b025c71
authored
May 29, 2021
by
Piotr Caban
Committed by
Alexandre Julliard
May 31, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Import expm1 implementation from musl.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d9a8be2a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
91 additions
and
22 deletions
+91
-22
configure
configure
+0
-1
configure.ac
configure.ac
+0
-1
math.c
dlls/msvcrt/math.c
+91
-3
unixlib.c
dlls/msvcrt/unixlib.c
+0
-13
unixlib.h
dlls/msvcrt/unixlib.h
+0
-1
config.h.in
include/config.h.in
+0
-3
No files found.
configure
View file @
5b025c71
...
...
@@ -19618,7 +19618,6 @@ fi
for
ac_func
in
\
exp2
\
exp2f
\
expm1
\
expm1f
\
fma
\
fmaf
\
...
...
configure.ac
View file @
5b025c71
...
...
@@ -2658,7 +2658,6 @@ fi
AC_CHECK_FUNCS(\
exp2 \
exp2f \
expm1 \
expm1f \
fma \
fmaf \
...
...
dlls/msvcrt/math.c
View file @
5b025c71
...
...
@@ -5758,12 +5758,100 @@ float CDECL exp2f(float x)
/*********************************************************************
* expm1 (MSVCR120.@)
*
* Copied from musl: src/math/expm1.c
*/
double
CDECL
expm1
(
double
x
)
{
double
ret
=
unix_funcs
->
expm1
(
x
);
if
(
isfinite
(
x
)
&&
!
isfinite
(
ret
))
*
_errno
()
=
ERANGE
;
return
ret
;
static
const
double
o_threshold
=
7.09782712893383973096e+02
,
ln2_hi
=
6.93147180369123816490e-01
,
ln2_lo
=
1.90821492927058770002e-10
,
invln2
=
1.44269504088896338700e+00
,
Q1
=
-
3.33333333333331316428e-02
,
Q2
=
1.58730158725481460165e-03
,
Q3
=
-
7.93650757867487942473e-05
,
Q4
=
4.00821782732936239552e-06
,
Q5
=
-
2.01099218183624371326e-07
;
double
y
,
hi
,
lo
,
c
,
t
,
e
,
hxs
,
hfx
,
r1
,
twopk
;
union
{
double
f
;
UINT64
i
;}
u
=
{
x
};
UINT32
hx
=
u
.
i
>>
32
&
0x7fffffff
;
int
k
,
sign
=
u
.
i
>>
63
;
/* filter out huge and non-finite argument */
if
(
hx
>=
0x4043687A
)
{
/* if |x|>=56*ln2 */
if
(
isnan
(
x
))
return
x
;
if
(
isinf
(
x
))
return
sign
?
-
1
:
x
;
if
(
sign
)
return
math_error
(
_UNDERFLOW
,
"exp"
,
x
,
0
,
-
1
);
if
(
x
>
o_threshold
)
return
math_error
(
_OVERFLOW
,
"exp"
,
x
,
0
,
x
*
0x1
p1023
);
}
/* argument reduction */
if
(
hx
>
0x3fd62e42
)
{
/* if |x| > 0.5 ln2 */
if
(
hx
<
0x3FF0A2B2
)
{
/* and |x| < 1.5 ln2 */
if
(
!
sign
)
{
hi
=
x
-
ln2_hi
;
lo
=
ln2_lo
;
k
=
1
;
}
else
{
hi
=
x
+
ln2_hi
;
lo
=
-
ln2_lo
;
k
=
-
1
;
}
}
else
{
k
=
invln2
*
x
+
(
sign
?
-
0
.
5
:
0
.
5
);
t
=
k
;
hi
=
x
-
t
*
ln2_hi
;
/* t*ln2_hi is exact here */
lo
=
t
*
ln2_lo
;
}
x
=
hi
-
lo
;
c
=
(
hi
-
x
)
-
lo
;
}
else
if
(
hx
<
0x3c900000
)
{
/* |x| < 2**-54, return x */
fp_barrier
(
x
+
0x1
p120f
);
if
(
hx
<
0x00100000
)
fp_barrier
((
float
)
x
);
return
x
;
}
else
k
=
0
;
/* x is now in primary range */
hfx
=
0
.
5
*
x
;
hxs
=
x
*
hfx
;
r1
=
1
.
0
+
hxs
*
(
Q1
+
hxs
*
(
Q2
+
hxs
*
(
Q3
+
hxs
*
(
Q4
+
hxs
*
Q5
))));
t
=
3
.
0
-
r1
*
hfx
;
e
=
hxs
*
((
r1
-
t
)
/
(
6
.
0
-
x
*
t
));
if
(
k
==
0
)
/* c is 0 */
return
x
-
(
x
*
e
-
hxs
);
e
=
x
*
(
e
-
c
)
-
c
;
e
-=
hxs
;
/* exp(x) ~ 2^k (x_reduced - e + 1) */
if
(
k
==
-
1
)
return
0
.
5
*
(
x
-
e
)
-
0
.
5
;
if
(
k
==
1
)
{
if
(
x
<
-
0
.
25
)
return
-
2
.
0
*
(
e
-
(
x
+
0
.
5
));
return
1
.
0
+
2
.
0
*
(
x
-
e
);
}
u
.
i
=
(
UINT64
)(
0x3ff
+
k
)
<<
52
;
/* 2^k */
twopk
=
u
.
f
;
if
(
k
<
0
||
k
>
56
)
{
/* suffice to return exp(x)-1 */
y
=
x
-
e
+
1
.
0
;
if
(
k
==
1024
)
y
=
y
*
2
.
0
*
0x1
p1023
;
else
y
=
y
*
twopk
;
return
y
-
1
.
0
;
}
u
.
i
=
(
UINT64
)(
0x3ff
-
k
)
<<
52
;
/* 2^-k */
if
(
k
<
20
)
y
=
(
x
-
e
+
(
1
-
u
.
f
))
*
twopk
;
else
y
=
(
x
-
(
e
+
u
.
f
)
+
1
)
*
twopk
;
return
y
;
}
/*********************************************************************
...
...
dlls/msvcrt/unixlib.c
View file @
5b025c71
...
...
@@ -99,18 +99,6 @@ static float CDECL unix_exp2f( float x )
}
/*********************************************************************
* expm1
*/
static
double
CDECL
unix_expm1
(
double
x
)
{
#ifdef HAVE_EXPM1
return
expm1
(
x
);
#else
return
exp
(
x
)
-
1
;
#endif
}
/*********************************************************************
* expm1f
*/
static
float
CDECL
unix_expm1f
(
float
x
)
...
...
@@ -374,7 +362,6 @@ static const struct unix_funcs funcs =
unix_expf
,
unix_exp2
,
unix_exp2f
,
unix_expm1
,
unix_expm1f
,
unix_fma
,
unix_fmaf
,
...
...
dlls/msvcrt/unixlib.h
View file @
5b025c71
...
...
@@ -29,7 +29,6 @@ struct unix_funcs
float
(
CDECL
*
expf
)(
float
x
);
double
(
CDECL
*
exp2
)(
double
x
);
float
(
CDECL
*
exp2f
)(
float
x
);
double
(
CDECL
*
expm1
)(
double
x
);
float
(
CDECL
*
expm1f
)(
float
x
);
double
(
CDECL
*
fma
)(
double
x
,
double
y
,
double
z
);
float
(
CDECL
*
fmaf
)(
float
x
,
float
y
,
float
z
);
...
...
include/config.h.in
View file @
5b025c71
...
...
@@ -98,9 +98,6 @@
/* Define to 1 if you have the `exp2f' function. */
#undef HAVE_EXP2F
/* Define to 1 if you have the `expm1' function. */
#undef HAVE_EXPM1
/* Define to 1 if you have the `expm1f' function. */
#undef HAVE_EXPM1F
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment