aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/quad
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2020-02-17 20:14:59 +0000
committerDimitry Andric <dim@FreeBSD.org>2020-02-17 20:14:59 +0000
commitfeb1d5507e4730fe401e6ae28a56579b814519ef (patch)
treef1e0d8ad6159775f499aed671e5f25dcbb4e3216 /lib/libc/quad
parent816dab96c16f0640a443bad6b88df547ea8367d6 (diff)
downloadsrc-feb1d5507e4730fe401e6ae28a56579b814519ef.tar.gz
src-feb1d5507e4730fe401e6ae28a56579b814519ef.zip
Add casts and L suffixes to libc quad support, to work around various
-Werror warnings from clang 10.0.0, such as: lib/libc/quad/fixdfdi.c:57:12: error: implicit conversion from 'long long' to 'double' changes value from 9223372036854775807 to 9223372036854775808 [-Werror,-Wimplicit-int-float-conversion] if (x >= QUAD_MAX) ~~ ^~~~~~~~ /usr/obj/usr/src/powerpc.powerpc/tmp/usr/include/sys/limits.h:89:19: note: expanded from macro 'QUAD_MAX' #define QUAD_MAX (__QUAD_MAX) /* max value for a quad_t */ ^~~~~~~~~~ /usr/obj/usr/src/powerpc.powerpc/tmp/usr/include/machine/_limits.h:91:20: note: expanded from macro '__QUAD_MAX' #define __QUAD_MAX __LLONG_MAX /* max value for a quad_t */ ^~~~~~~~~~~ /usr/obj/usr/src/powerpc.powerpc/tmp/usr/include/machine/_limits.h:75:21: note: expanded from macro '__LLONG_MAX' #define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ ^~~~~~~~~~~~~~~~~~~~ and many instances of: lib/libc/quad/fixunsdfdi.c:73:17: error: shift count >= width of type [-Werror,-Wshift-count-overflow] toppart = (x - ONE_HALF) / ONE; ^~~~~~~~ lib/libc/quad/fixunsdfdi.c:45:19: note: expanded from macro 'ONE_HALF' #define ONE_HALF (ONE_FOURTH * 2.0) ^~~~~~~~~~ lib/libc/quad/fixunsdfdi.c:44:23: note: expanded from macro 'ONE_FOURTH' #define ONE_FOURTH (1 << (LONG_BITS - 2)) ^ ~~~~~~~~~~~~~~~ lib/libc/quad/fixunsdfdi.c:73:29: error: shift count >= width of type [-Werror,-Wshift-count-overflow] toppart = (x - ONE_HALF) / ONE; ^~~ lib/libc/quad/fixunsdfdi.c:46:15: note: expanded from macro 'ONE' #define ONE (ONE_FOURTH * 4.0) ^~~~~~~~~~ lib/libc/quad/fixunsdfdi.c:44:23: note: expanded from macro 'ONE_FOURTH' #define ONE_FOURTH (1 << (LONG_BITS - 2)) ^ ~~~~~~~~~~~~~~~
Notes
Notes: svn path=/projects/clang1000-import/; revision=358042
Diffstat (limited to 'lib/libc/quad')
-rw-r--r--lib/libc/quad/fixdfdi.c4
-rw-r--r--lib/libc/quad/fixsfdi.c4
-rw-r--r--lib/libc/quad/fixunsdfdi.c8
-rw-r--r--lib/libc/quad/fixunssfdi.c8
-rw-r--r--lib/libc/quad/floatdidf.c2
-rw-r--r--lib/libc/quad/floatdisf.c2
-rw-r--r--lib/libc/quad/floatunsdidf.c2
-rw-r--r--lib/libc/quad/qdivrem.c2
-rw-r--r--lib/libc/quad/quad.h2
9 files changed, 17 insertions, 17 deletions
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
index 51a1246bc055..ddb3b23834c1 100644
--- a/lib/libc/quad/fixdfdi.c
+++ b/lib/libc/quad/fixdfdi.c
@@ -49,12 +49,12 @@ quad_t
__fixdfdi(double x)
{
if (x < 0)
- if (x <= QUAD_MIN)
+ if (x <= (double)QUAD_MIN)
return (QUAD_MIN);
else
return ((quad_t)-(u_quad_t)-x);
else
- if (x >= QUAD_MAX)
+ if (x >= (double)QUAD_MAX)
return (QUAD_MAX);
else
return ((quad_t)(u_quad_t)x);
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
index 2327a8f92c33..48cd5a1a6003 100644
--- a/lib/libc/quad/fixsfdi.c
+++ b/lib/libc/quad/fixsfdi.c
@@ -51,12 +51,12 @@ long long
__fixsfdi(float x)
{
if (x < 0)
- if (x <= QUAD_MIN)
+ if (x <= (float)QUAD_MIN)
return (QUAD_MIN);
else
return ((quad_t)-(u_quad_t)-x);
else
- if (x >= QUAD_MAX)
+ if (x >= (float)QUAD_MAX)
return (QUAD_MAX);
else
return ((quad_t)(u_quad_t)x);
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
index ac7afc166967..5d63d6cb6cbd 100644
--- a/lib/libc/quad/fixunsdfdi.c
+++ b/lib/libc/quad/fixunsdfdi.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include "quad.h"
-#define ONE_FOURTH (1 << (LONG_BITS - 2))
+#define ONE_FOURTH (1L << (LONG_BITS - 2))
#define ONE_HALF (ONE_FOURTH * 2.0)
#define ONE (ONE_FOURTH * 4.0)
@@ -84,11 +84,11 @@ __fixunsdfdi(double x)
x -= (double)t.uq;
if (x < 0) {
t.ul[H]--;
- x += ULONG_MAX;
+ x += (double)ULONG_MAX;
}
- if (x > ULONG_MAX) {
+ if (x > (double)ULONG_MAX) {
t.ul[H]++;
- x -= ULONG_MAX;
+ x -= (double)ULONG_MAX;
}
t.ul[L] = (u_long)x;
return (t.uq);
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
index 3ddcebc75d9c..de560dd84cb3 100644
--- a/lib/libc/quad/fixunssfdi.c
+++ b/lib/libc/quad/fixunssfdi.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include "quad.h"
-#define ONE_FOURTH (1 << (LONG_BITS - 2))
+#define ONE_FOURTH (1L << (LONG_BITS - 2))
#define ONE_HALF (ONE_FOURTH * 2.0)
#define ONE (ONE_FOURTH * 4.0)
@@ -89,11 +89,11 @@ __fixunssfdi(float f)
x -= (double)t.uq;
if (x < 0) {
t.ul[H]--;
- x += ULONG_MAX;
+ x += (double)ULONG_MAX;
}
- if (x > ULONG_MAX) {
+ if (x > (double)ULONG_MAX) {
t.ul[H]++;
- x -= ULONG_MAX;
+ x -= (double)ULONG_MAX;
}
t.ul[L] = (u_long)x;
return (t.uq);
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
index 78e368b34b2e..6c71ee1889d7 100644
--- a/lib/libc/quad/floatdidf.c
+++ b/lib/libc/quad/floatdidf.c
@@ -66,7 +66,7 @@ __floatdidf(quad_t x)
* code and does not know how to get at an exponent. Machine-
* specific code may be able to do this more efficiently.
*/
- d = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
+ d = (double)u.ul[H] * ((1L << (LONG_BITS - 2)) * 4.0);
d += u.ul[L];
return (neg ? -d : d);
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
index ea14bd34e834..411e106ec4f0 100644
--- a/lib/libc/quad/floatdisf.c
+++ b/lib/libc/quad/floatdisf.c
@@ -68,7 +68,7 @@ __floatdisf(quad_t x)
*
* Using double here may be excessive paranoia.
*/
- f = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
+ f = (double)u.ul[H] * ((1L << (LONG_BITS - 2)) * 4.0);
f += u.ul[L];
return (neg ? -f : f);
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
index bb21445757a7..b391b3a759e5 100644
--- a/lib/libc/quad/floatunsdidf.c
+++ b/lib/libc/quad/floatunsdidf.c
@@ -52,7 +52,7 @@ __floatunsdidf(u_quad_t x)
union uu u;
u.uq = x;
- d = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
+ d = (double)u.ul[H] * ((1L << (LONG_BITS - 2)) * 4.0);
d += u.ul[L];
return (d);
}
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index 2f1760c047f9..ea09e7f43f16 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include "quad.h"
-#define B (1 << HALF_BITS) /* digit base */
+#define B (1L << HALF_BITS) /* digit base */
/* Combine two `digits' to make a single two-digit number. */
#define COMBINE(a, b) (((u_long)(a) << HALF_BITS) | (b))
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index e997271ee3cb..a9f84470876e 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -91,7 +91,7 @@ union uu {
* (sizeof(long)*CHAR_BIT/2).
*/
#define HHALF(x) ((x) >> HALF_BITS)
-#define LHALF(x) ((x) & ((1 << HALF_BITS) - 1))
+#define LHALF(x) ((x) & ((1L << HALF_BITS) - 1))
#define LHUP(x) ((x) << HALF_BITS)
int __cmpdi2(quad_t a, quad_t b);