X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2F__fpclassifyl.c;h=e41781b689af7f7db420fc437cc4a72e4dd00c33;hb=c5f4b2dfea320356f69445dc1adf8f73596a3c36;hp=e4d231b579d7cd7cb961a5e3675324a016f5d6d7;hpb=fad231b9609470e4c51b29b6bcb9abd23b7e9346;p=musl

diff --git a/src/math/__fpclassifyl.c b/src/math/__fpclassifyl.c
index e4d231b5..e41781b6 100644
--- a/src/math/__fpclassifyl.c
+++ b/src/math/__fpclassifyl.c
@@ -1,30 +1,42 @@
 #include "libm.h"
 
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-
+int __fpclassifyl(long double x)
+{
+	return __fpclassify(x);
+}
 #elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384
 int __fpclassifyl(long double x)
 {
-	union ldshape u = { x };
-	int e = u.bits.exp;
-	if (!e) {
-		if (u.bits.m >> 63) return FP_NAN;
-		else if (u.bits.m) return FP_SUBNORMAL;
-		else return FP_ZERO;
+	union ldshape u = {x};
+	int e = u.i.se & 0x7fff;
+	int msb = u.i.m>>63;
+	if (!e && !msb)
+		return u.i.m ? FP_SUBNORMAL : FP_ZERO;
+	if (e == 0x7fff) {
+		/* The x86 variant of 80-bit extended precision only admits
+		 * one representation of each infinity, with the mantissa msb
+		 * necessarily set. The version with it clear is invalid/nan.
+		 * The m68k variant, however, allows either, and tooling uses
+		 * the version with it clear. */
+		if (__BYTE_ORDER == __LITTLE_ENDIAN && !msb)
+			return FP_NAN;
+		return u.i.m << 1 ? FP_NAN : FP_INFINITE;
 	}
-	if (e == 0x7fff)
-		return u.bits.m & (uint64_t)-1>>1 ? FP_NAN : FP_INFINITE;
-	return u.bits.m & (uint64_t)1<<63 ? FP_NORMAL : FP_NAN;
+	if (!msb)
+		return FP_NAN;
+	return FP_NORMAL;
 }
 #elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384
 int __fpclassifyl(long double x)
 {
-	union ldshape u = { x };
-	int e = u.bits.exp;
+	union ldshape u = {x};
+	int e = u.i.se & 0x7fff;
+	u.i.se = 0;
 	if (!e)
-		return u.bits.mlo | u.bits.mhi ? FP_SUBNORMAL : FP_ZERO;
+		return u.i2.lo | u.i2.hi ? FP_SUBNORMAL : FP_ZERO;
 	if (e == 0x7fff)
-		return u.bits.mlo | u.bits.mhi ? FP_NAN : FP_INFINITE;
+		return u.i2.lo | u.i2.hi ? FP_NAN : FP_INFINITE;
 	return FP_NORMAL;
 }
 #endif