summaryrefslogtreecommitdiffstatshomepage
path: root/lib/libm/math.c
diff options
context:
space:
mode:
authorstijn <stijn@ignitron.net>2020-03-31 14:48:08 +0200
committerDamien George <damien.p.george@gmail.com>2020-04-18 22:42:24 +1000
commitbcf01d1686a8fa6d257daea25ce0d7df6e4ad839 (patch)
tree2513c71e685ead21c6ca44a0432500ca75c424f8 /lib/libm/math.c
parentdc4d119d3d96799bf848c6488b2ac49b933ab7cb (diff)
downloadmicropython-bcf01d1686a8fa6d257daea25ce0d7df6e4ad839.tar.gz
micropython-bcf01d1686a8fa6d257daea25ce0d7df6e4ad839.zip
all: Fix implicit conversion from double to float.
These are found when building with -Wfloat-conversion.
Diffstat (limited to 'lib/libm/math.c')
-rw-r--r--lib/libm/math.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/lib/libm/math.c b/lib/libm/math.c
index c23b9f8d36..2c52edd1be 100644
--- a/lib/libm/math.c
+++ b/lib/libm/math.c
@@ -53,7 +53,7 @@ float copysignf(float x, float y) {
}
#endif
-static const float _M_LN10 = 2.30258509299404; // 0x40135d8e
+static const float _M_LN10 = 2.30258509299404f; // 0x40135d8e
float log10f(float x) { return logf(x) / (float)_M_LN10; }
float tanhf(float x) {
@@ -139,34 +139,34 @@ float scalbnf(float x, int n)
*/
static const float
-bp[] = {1.0, 1.5,},
-dp_h[] = { 0.0, 5.84960938e-01,}, /* 0x3f15c000 */
-dp_l[] = { 0.0, 1.56322085e-06,}, /* 0x35d1cfdc */
-two24 = 16777216.0, /* 0x4b800000 */
-huge = 1.0e30,
-tiny = 1.0e-30,
+bp[] = {1.0f, 1.5f,},
+dp_h[] = { 0.0f, 5.84960938e-01f,}, /* 0x3f15c000 */
+dp_l[] = { 0.0f, 1.56322085e-06f,}, /* 0x35d1cfdc */
+two24 = 16777216.0f, /* 0x4b800000 */
+huge = 1.0e30f,
+tiny = 1.0e-30f,
/* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
-L1 = 6.0000002384e-01, /* 0x3f19999a */
-L2 = 4.2857143283e-01, /* 0x3edb6db7 */
-L3 = 3.3333334327e-01, /* 0x3eaaaaab */
-L4 = 2.7272811532e-01, /* 0x3e8ba305 */
-L5 = 2.3066075146e-01, /* 0x3e6c3255 */
-L6 = 2.0697501302e-01, /* 0x3e53f142 */
-P1 = 1.6666667163e-01, /* 0x3e2aaaab */
-P2 = -2.7777778450e-03, /* 0xbb360b61 */
-P3 = 6.6137559770e-05, /* 0x388ab355 */
-P4 = -1.6533901999e-06, /* 0xb5ddea0e */
-P5 = 4.1381369442e-08, /* 0x3331bb4c */
-lg2 = 6.9314718246e-01, /* 0x3f317218 */
-lg2_h = 6.93145752e-01, /* 0x3f317200 */
-lg2_l = 1.42860654e-06, /* 0x35bfbe8c */
-ovt = 4.2995665694e-08, /* -(128-log2(ovfl+.5ulp)) */
-cp = 9.6179670095e-01, /* 0x3f76384f =2/(3ln2) */
-cp_h = 9.6191406250e-01, /* 0x3f764000 =12b cp */
-cp_l = -1.1736857402e-04, /* 0xb8f623c6 =tail of cp_h */
-ivln2 = 1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */
-ivln2_h = 1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/
-ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/
+L1 = 6.0000002384e-01f, /* 0x3f19999a */
+L2 = 4.2857143283e-01f, /* 0x3edb6db7 */
+L3 = 3.3333334327e-01f, /* 0x3eaaaaab */
+L4 = 2.7272811532e-01f, /* 0x3e8ba305 */
+L5 = 2.3066075146e-01f, /* 0x3e6c3255 */
+L6 = 2.0697501302e-01f, /* 0x3e53f142 */
+P1 = 1.6666667163e-01f, /* 0x3e2aaaab */
+P2 = -2.7777778450e-03f, /* 0xbb360b61 */
+P3 = 6.6137559770e-05f, /* 0x388ab355 */
+P4 = -1.6533901999e-06f, /* 0xb5ddea0e */
+P5 = 4.1381369442e-08f, /* 0x3331bb4c */
+lg2 = 6.9314718246e-01f, /* 0x3f317218 */
+lg2_h = 6.93145752e-01f, /* 0x3f317200 */
+lg2_l = 1.42860654e-06f, /* 0x35bfbe8c */
+ovt = 4.2995665694e-08f, /* -(128-log2(ovfl+.5ulp)) */
+cp = 9.6179670095e-01f, /* 0x3f76384f =2/(3ln2) */
+cp_h = 9.6191406250e-01f, /* 0x3f764000 =12b cp */
+cp_l = -1.1736857402e-04f, /* 0xb8f623c6 =tail of cp_h */
+ivln2 = 1.4426950216e+00f, /* 0x3fb8aa3b =1/ln2 */
+ivln2_h = 1.4426879883e+00f, /* 0x3fb8aa00 =16b 1/ln2*/
+ivln2_l = 7.0526075433e-06f; /* 0x36eca570 =1/ln2 tail*/
float powf(float x, float y)
{
@@ -403,7 +403,7 @@ float powf(float x, float y)
*/
static const float
-half[2] = {0.5,-0.5},
+half[2] = {0.5f,-0.5f},
ln2hi = 6.9314575195e-1f, /* 0x3f317200 */
ln2lo = 1.4286067653e-6f, /* 0x35bfbe8e */
invln2 = 1.4426950216e+0f, /* 0x3fb8aa3b */
@@ -489,17 +489,17 @@ float expf(float x)
*/
static const float
-o_threshold = 8.8721679688e+01, /* 0x42b17180 */
-ln2_hi = 6.9313812256e-01, /* 0x3f317180 */
-ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */
+o_threshold = 8.8721679688e+01f, /* 0x42b17180 */
+ln2_hi = 6.9313812256e-01f, /* 0x3f317180 */
+ln2_lo = 9.0580006145e-06f, /* 0x3717f7d1 */
//invln2 = 1.4426950216e+00, /* 0x3fb8aa3b */
/*
* Domain [-0.34568, 0.34568], range ~[-6.694e-10, 6.696e-10]:
* |6 / x * (1 + 2 * (1 / (exp(x) - 1) - 1 / x)) - q(x)| < 2**-30.04
* Scaled coefficients: Qn_here = 2**n * Qn_for_q (see s_expm1.c):
*/
-Q1 = -3.3333212137e-2, /* -0x888868.0p-28 */
-Q2 = 1.5807170421e-3; /* 0xcf3010.0p-33 */
+Q1 = -3.3333212137e-2f, /* -0x888868.0p-28 */
+Q2 = 1.5807170421e-3f; /* 0xcf3010.0p-33 */
float expm1f(float x)
{