summaryrefslogtreecommitdiffstats
path: root/lib/libm
diff options
context:
space:
mode:
authormartynas <martynas@openbsd.org>2011-07-20 21:02:51 +0000
committermartynas <martynas@openbsd.org>2011-07-20 21:02:51 +0000
commit9fc1328242ddaa1ce1b291ba3cac4e2e6ecb0c1c (patch)
tree0007a7bc5bec14114108805415a13cccd795f009 /lib/libm
parentDuring mailbox and special file checks, skip all files that can't (diff)
downloadwireguard-openbsd-9fc1328242ddaa1ce1b291ba3cac4e2e6ecb0c1c.tar.xz
wireguard-openbsd-9fc1328242ddaa1ce1b291ba3cac4e2e6ecb0c1c.zip
- Make constants const.
- Fix aliasing issue in s_frexpf.c; spotted by gcc. Many other ones were fixed in NetBSD long ago, but this one was forgotten. It looks like recently they fixed it too.
Diffstat (limited to 'lib/libm')
-rw-r--r--lib/libm/src/ld128/e_expl.c12
-rw-r--r--lib/libm/src/ld128/s_cbrtl.c2
-rw-r--r--lib/libm/src/ld80/e_expl.c12
-rw-r--r--lib/libm/src/ld80/e_logl.c6
-rw-r--r--lib/libm/src/ld80/e_powl.c8
-rw-r--r--lib/libm/src/ld80/e_tgammal.c8
-rw-r--r--lib/libm/src/ld80/s_expm1l.c6
-rw-r--r--lib/libm/src/ld80/s_log1pl.c6
-rw-r--r--lib/libm/src/s_cacosl.c4
-rw-r--r--lib/libm/src/s_casinl.c8
-rw-r--r--lib/libm/src/s_catanl.c10
-rw-r--r--lib/libm/src/s_ctanl.c14
-rw-r--r--lib/libm/src/s_frexpf.c2
-rw-r--r--lib/libm/src/s_scalbn.c2
14 files changed, 50 insertions, 50 deletions
diff --git a/lib/libm/src/ld128/e_expl.c b/lib/libm/src/ld128/e_expl.c
index 6ef65e83a04..3fe3ccd3d39 100644
--- a/lib/libm/src/ld128/e_expl.c
+++ b/lib/libm/src/ld128/e_expl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_expl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $ */
+/* $OpenBSD: e_expl.c,v 1.2 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -95,12 +95,12 @@ static long double Q[6] = {
2.000000000000000000000000000000000000150E0L
};
/* C1 + C2 = ln 2 */
-static long double C1 = -6.93145751953125E-1L;
-static long double C2 = -1.428606820309417232121458176568075500134E-6L;
+static const long double C1 = -6.93145751953125E-1L;
+static const long double C2 = -1.428606820309417232121458176568075500134E-6L;
-static long double LOG2EL = 1.442695040888963407359924681001892137426646L;
-static long double MAXLOGL = 1.1356523406294143949491931077970764891253E4L;
-static long double MINLOGL = -1.143276959615573793352782661133116431383730e4L;
+static const long double LOG2EL = 1.442695040888963407359924681001892137426646L;
+static const long double MAXLOGL = 1.1356523406294143949491931077970764891253E4L;
+static const long double MINLOGL = -1.143276959615573793352782661133116431383730e4L;
static const long double huge = 0x1p10000L;
#if 0 /* XXX Prevent gcc from erroneously constant folding this. */
static const long double twom10000 = 0x1p-10000L;
diff --git a/lib/libm/src/ld128/s_cbrtl.c b/lib/libm/src/ld128/s_cbrtl.c
index faa5d4c59f1..ad3f273e1f6 100644
--- a/lib/libm/src/ld128/s_cbrtl.c
+++ b/lib/libm/src/ld128/s_cbrtl.c
@@ -81,7 +81,7 @@ cbrtl(long double x)
break;
}
GET_LDOUBLE_MSW64(hx,x);
- expsign = (expsign & 0x8000) | (BIAS + k / 3);
+ expsign = ((hx>>48) & 0x8000) | (BIAS + k / 3);
hx = (hx&0x8000ffffffffffffLL)|((uint64_t)expsign<<48);
SET_LDOUBLE_MSW64(x,hx);
diff --git a/lib/libm/src/ld80/e_expl.c b/lib/libm/src/ld80/e_expl.c
index 119971f2df4..a5b8a5a6738 100644
--- a/lib/libm/src/ld80/e_expl.c
+++ b/lib/libm/src/ld80/e_expl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_expl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $ */
+/* $OpenBSD: e_expl.c,v 1.2 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -85,11 +85,11 @@ static long double Q[4] = {
2.2726554820815502876593E-1L,
2.0000000000000000000897E0L,
};
-static long double C1 = 6.9314575195312500000000E-1L;
-static long double C2 = 1.4286068203094172321215E-6L;
-static long double MAXLOGL = 1.1356523406294143949492E4L;
-static long double MINLOGL = -1.13994985314888605586758E4L;
-static long double LOG2EL = 1.4426950408889634073599E0L;
+static const long double C1 = 6.9314575195312500000000E-1L;
+static const long double C2 = 1.4286068203094172321215E-6L;
+static const long double MAXLOGL = 1.1356523406294143949492E4L;
+static const long double MINLOGL = -1.13994985314888605586758E4L;
+static const long double LOG2EL = 1.4426950408889634073599E0L;
extern long double __polevll(long double, void *, int);
diff --git a/lib/libm/src/ld80/e_logl.c b/lib/libm/src/ld80/e_logl.c
index d345a59aa5d..5ff92e667b3 100644
--- a/lib/libm/src/ld80/e_logl.c
+++ b/lib/libm/src/ld80/e_logl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_logl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $ */
+/* $OpenBSD: e_logl.c,v 1.2 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -106,8 +106,8 @@ static long double S[4] = {
1.9361891836232102174846E2L,
-4.2861221385716144629696E2L,
};
-static long double C1 = 6.9314575195312500000000E-1L;
-static long double C2 = 1.4286068203094172321215E-6L;
+static const long double C1 = 6.9314575195312500000000E-1L;
+static const long double C2 = 1.4286068203094172321215E-6L;
#define SQRTH 0.70710678118654752440L
diff --git a/lib/libm/src/ld80/e_powl.c b/lib/libm/src/ld80/e_powl.c
index d4770d8ff6a..d05de530531 100644
--- a/lib/libm/src/ld80/e_powl.c
+++ b/lib/libm/src/ld80/e_powl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_powl.c,v 1.2 2011/07/08 17:22:17 martynas Exp $ */
+/* $OpenBSD: e_powl.c,v 1.3 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -184,9 +184,9 @@ static long double R[] = {
#define Ha Wb
#define Hb Wb
-static long double MAXLOGL = 1.1356523406294143949492E4L;
-static long double MINLOGL = -1.13994985314888605586758E4L;
-static long double LOGE2L = 6.9314718055994530941723E-1L;
+static const long double MAXLOGL = 1.1356523406294143949492E4L;
+static const long double MINLOGL = -1.13994985314888605586758E4L;
+static const long double LOGE2L = 6.9314718055994530941723E-1L;
static volatile long double z;
static long double w, W, Wa, Wb, ya, yb, u;
static const long double huge = 0x1p10000L;
diff --git a/lib/libm/src/ld80/e_tgammal.c b/lib/libm/src/ld80/e_tgammal.c
index adc38a515e2..3d1352efe3c 100644
--- a/lib/libm/src/ld80/e_tgammal.c
+++ b/lib/libm/src/ld80/e_tgammal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_tgammal.c,v 1.1 2011/07/06 00:02:42 martynas Exp $ */
+/* $OpenBSD: e_tgammal.c,v 1.2 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -115,7 +115,7 @@ static long double Q[] = {
};
*/
#define MAXGAML 1755.455L
-/*static long double LOGPI = 1.14472988584940017414L;*/
+/*static const long double LOGPI = 1.14472988584940017414L;*/
/* Stirling's formula for the gamma function
tgamma(x) = sqrt(2 pi) x^(x-.5) exp(-x) (1 + 1/x P(1/x))
@@ -140,7 +140,7 @@ static long double STIR[9] = {
};
#define MAXSTIR 1024.0L
-static long double SQTPI = 2.50662827463100050242E0L;
+static const long double SQTPI = 2.50662827463100050242E0L;
/* 1/tgamma(x) = z P(z)
* z(x) = 1/x
@@ -179,7 +179,7 @@ static long double SN[9] = {
-1.000000000000000000000E0L,
};
-static long double PIL = 3.1415926535897932384626L;
+static const long double PIL = 3.1415926535897932384626L;
extern long double __polevll(long double, void *, int);
static long double stirf ( long double );
diff --git a/lib/libm/src/ld80/s_expm1l.c b/lib/libm/src/ld80/s_expm1l.c
index b9397494129..06b053964f4 100644
--- a/lib/libm/src/ld80/s_expm1l.c
+++ b/lib/libm/src/ld80/s_expm1l.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_expm1l.c,v 1.1 2011/07/06 00:02:42 martynas Exp $ */
+/* $OpenBSD: s_expm1l.c,v 1.2 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -59,13 +59,13 @@
#include <math.h>
-static long double MAXLOGL = 1.1356523406294143949492E4L;
+static const long double MAXLOGL = 1.1356523406294143949492E4L;
/* exp(x) - 1 = x + 0.5 x^2 + x^3 P(x)/Q(x)
-.5 ln 2 < x < .5 ln 2
Theoretical peak relative error = 3.4e-22 */
-static long double
+static const long double
P0 = -1.586135578666346600772998894928250240826E4L,
P1 = 2.642771505685952966904660652518429479531E3L,
P2 = -3.423199068835684263987132888286791620673E2L,
diff --git a/lib/libm/src/ld80/s_log1pl.c b/lib/libm/src/ld80/s_log1pl.c
index d60ea31e20b..c168dad3aca 100644
--- a/lib/libm/src/ld80/s_log1pl.c
+++ b/lib/libm/src/ld80/s_log1pl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_log1pl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $ */
+/* $OpenBSD: s_log1pl.c,v 1.2 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -103,8 +103,8 @@ static long double S[4] = {
1.9361891836232102174846E2L,
-4.2861221385716144629696E2L,
};
-static long double C1 = 6.9314575195312500000000E-1L;
-static long double C2 = 1.4286068203094172321215E-6L;
+static const long double C1 = 6.9314575195312500000000E-1L;
+static const long double C2 = 1.4286068203094172321215E-6L;
#define SQRTH 0.70710678118654752440L
extern long double __polevll(long double, void *, int);
diff --git a/lib/libm/src/s_cacosl.c b/lib/libm/src/s_cacosl.c
index 9b110337a80..e4d94596596 100644
--- a/lib/libm/src/s_cacosl.c
+++ b/lib/libm/src/s_cacosl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_cacosl.c,v 1.2 2011/07/20 19:28:33 martynas Exp $ */
+/* $OpenBSD: s_cacosl.c,v 1.3 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -50,7 +50,7 @@
#include <complex.h>
#include <math.h>
-static long double PIO2L = 1.570796326794896619231321691639751442098585L;
+static const long double PIO2L = 1.570796326794896619231321691639751442098585L;
long double complex
cacosl(long double complex z)
diff --git a/lib/libm/src/s_casinl.c b/lib/libm/src/s_casinl.c
index abfa9ce68f1..64e366b34ec 100644
--- a/lib/libm/src/s_casinl.c
+++ b/lib/libm/src/s_casinl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_casinl.c,v 1.2 2011/07/20 19:28:33 martynas Exp $ */
+/* $OpenBSD: s_casinl.c,v 1.3 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -54,12 +54,12 @@
#include <math.h>
#if LDBL_MANT_DIG == 64
-static long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;
+static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;
#elif LDBL_MANT_DIG == 113
-static long double MACHEPL = 9.629649721936179265279889712924636592690508e-35L;
+static const long double MACHEPL = 9.629649721936179265279889712924636592690508e-35L;
#endif
-static long double PIO2L = 1.570796326794896619231321691639751442098585L;
+static const long double PIO2L = 1.570796326794896619231321691639751442098585L;
long double complex
casinl(long double complex z)
diff --git a/lib/libm/src/s_catanl.c b/lib/libm/src/s_catanl.c
index eb12719bfe7..1edc444ef62 100644
--- a/lib/libm/src/s_catanl.c
+++ b/lib/libm/src/s_catanl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_catanl.c,v 1.2 2011/07/20 19:28:33 martynas Exp $ */
+/* $OpenBSD: s_catanl.c,v 1.3 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -67,10 +67,10 @@
#include <float.h>
#include <math.h>
-static long double PIL = 3.141592653589793238462643383279502884197169L;
-static long double DP1 = 3.14159265358979323829596852490908531763125L;
-static long double DP2 = 1.6667485837041756656403424829301998703007e-19L;
-static long double DP3 = 1.8830410776607851167459095484560349402753e-39L;
+static const long double PIL = 3.141592653589793238462643383279502884197169L;
+static const long double DP1 = 3.14159265358979323829596852490908531763125L;
+static const long double DP2 = 1.6667485837041756656403424829301998703007e-19L;
+static const long double DP3 = 1.8830410776607851167459095484560349402753e-39L;
static long double
redupil(long double x)
diff --git a/lib/libm/src/s_ctanl.c b/lib/libm/src/s_ctanl.c
index 3a984ebdbea..7c08ac57ad1 100644
--- a/lib/libm/src/s_ctanl.c
+++ b/lib/libm/src/s_ctanl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_ctanl.c,v 1.2 2011/07/20 19:28:33 martynas Exp $ */
+/* $OpenBSD: s_ctanl.c,v 1.3 2011/07/20 21:02:51 martynas Exp $ */
/*
* Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
@@ -61,15 +61,15 @@
#include <math.h>
#if LDBL_MANT_DIG == 64
-static long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;
+static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;
#elif LDBL_MANT_DIG == 113
-static long double MACHEPL = 9.629649721936179265279889712924636592690508e-35L;
+static const long double MACHEPL = 9.629649721936179265279889712924636592690508e-35L;
#endif
-static long double PIL = 3.141592653589793238462643383279502884197169L;
-static long double DP1 = 3.14159265358979323829596852490908531763125L;
-static long double DP2 = 1.6667485837041756656403424829301998703007e-19L;
-static long double DP3 = 1.8830410776607851167459095484560349402753e-39L;
+static const long double PIL = 3.141592653589793238462643383279502884197169L;
+static const long double DP1 = 3.14159265358979323829596852490908531763125L;
+static const long double DP2 = 1.6667485837041756656403424829301998703007e-19L;
+static const long double DP3 = 1.8830410776607851167459095484560349402753e-39L;
static long double
redupil(long double x)
diff --git a/lib/libm/src/s_frexpf.c b/lib/libm/src/s_frexpf.c
index 204b36682ea..74cf5f3d9da 100644
--- a/lib/libm/src/s_frexpf.c
+++ b/lib/libm/src/s_frexpf.c
@@ -35,6 +35,6 @@ frexpf(float x, int *eptr)
}
*eptr += (ix>>23)-126;
hx = (hx&0x807fffff)|0x3f000000;
- *(int*)&x = hx;
+ SET_FLOAT_WORD(x,hx);
return x;
}
diff --git a/lib/libm/src/s_scalbn.c b/lib/libm/src/s_scalbn.c
index da5be29c36c..f336f945971 100644
--- a/lib/libm/src/s_scalbn.c
+++ b/lib/libm/src/s_scalbn.c
@@ -26,7 +26,7 @@
double
scalbn (double x, int n)
{
- ldexp(x, n);
+ return ldexp(x, n);
}
#if LDBL_MANT_DIG == 53
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.