Changeset 96197 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Aug 14, 2022 1:04:34 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/math.h: Define our own set of classification flags so we can test fpclassify[dfl] in IPRT_NOCRT_WITHOUT_MATH_CONSTANTS mode. bugref:10261

Location:

trunk/src/VBox/Runtime/common/math

Files:

• __fpclassifyd.cpp (modified) (1 diff)
• __fpclassifyf.cpp (modified) (1 diff)
• __fpclassifyl.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/math/__fpclassifyd.cpp

@@ -43 +43 @@
     u.rd = rd;
     if (RTFLOAT64U_IS_ZERO(&u))
-        return FP_ZERO;
+        return RT_NOCRT_FP_ZERO;
     if (RTFLOAT64U_IS_NORMAL(&u))
-        return FP_NORMAL;
+        return RT_NOCRT_FP_NORMAL;
     if (RTFLOAT64U_IS_NAN(&u))
-        return FP_NAN;
+        return RT_NOCRT_FP_NAN;
     if (RTFLOAT64U_IS_INF(&u))
-        return FP_INFINITE;
+        return RT_NOCRT_FP_INFINITE;
     Assert(RTFLOAT64U_IS_SUBNORMAL(&u));
-    return FP_SUBNORMAL;
+    return RT_NOCRT_FP_SUBNORMAL;
 }
 RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL_WITHOUT_UNDERSCORE(__fpclassifyd);

trunk/src/VBox/Runtime/common/math/__fpclassifyf.cpp

@@ -43 +43 @@
     u.r = r32;
     if (RTFLOAT32U_IS_ZERO(&u))
-        return FP_ZERO;
+        return RT_NOCRT_FP_ZERO;
     if (RTFLOAT32U_IS_NORMAL(&u))
-        return FP_NORMAL;
+        return RT_NOCRT_FP_NORMAL;
     if (RTFLOAT32U_IS_NAN(&u))
-        return FP_NAN;
+        return RT_NOCRT_FP_NAN;
     if (RTFLOAT32U_IS_INF(&u))
-        return FP_INFINITE;
+        return RT_NOCRT_FP_INFINITE;
     Assert(RTFLOAT32U_IS_SUBNORMAL(&u));
-    return FP_SUBNORMAL;
+    return RT_NOCRT_FP_SUBNORMAL;
 }
 RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL_WITHOUT_UNDERSCORE(__fpclassifyf);

trunk/src/VBox/Runtime/common/math/__fpclassifyl.cpp

@@ -39 +39 @@
 int RT_NOCRT(__fpclassifyl)(long double lrd)
 {
-#ifdef RT_COMPILER_WITH_80BIT_LONG_DOUBLE
-    AssertCompile(sizeof(lrd) == sizeof(uint64_t));
+#ifdef RT_COMPILER_WITH_128BIT_LONG_DOUBLE
+    RTFLOAT128U u;
+    u.rd = lrd;
+    if (RTFLOAT128U_IS_ZERO(&u))
+        return RT_NOCRT_FP_ZERO;
+    if (RTFLOAT128U_IS_NORMAL(&u))
+        return RT_NOCRT_FP_NORMAL;
+    if (RTFLOAT128U_IS_NAN(&u))
+        return RT_NOCRT_FP_NAN;
+    if (RTFLOAT128U_IS_INF(&u))
+        return RT_NOCRT_FP_INFINITE;
+    Assert(RTFLOAT128U_IS_SUBNORMAL(&u));
+    return RT_NOCRT_FP_SUBNORMAL;
+
+#elif defined(RT_COMPILER_WITH_80BIT_LONG_DOUBLE)
     RTFLOAT80U2 u;
     u.lrd = lrd;
     if (RTFLOAT80U_IS_ZERO(&u))
-        return FP_ZERO;
+        return RT_NOCRT_FP_ZERO;
     if (RTFLOAT80U_IS_NORMAL(&u))
-        return FP_NORMAL;
+        return RT_NOCRT_FP_NORMAL;
     if (RTFLOAT80U_IS_NAN(&u))
-        return FP_NAN;
+        return RT_NOCRT_FP_NAN;
     if (RTFLOAT80U_IS_INF(&u))
-        return FP_INFINITE;
+        return RT_NOCRT_FP_INFINITE;
     if (RTFLOAT80U_IS_DENORMAL_OR_PSEUDO_DENORMAL(&u))
-        return FP_SUBNORMAL;
+        return RT_NOCRT_FP_SUBNORMAL;
 
     /* Following i387 invalid operand rules here.  Adjust as needed for
        other architectures. */
     Assert(RTFLOAT80U_IS_387_INVALID(&u));
-    return FP_NAN;
+    return RT_NOCRT_FP_NAN;
 
 #else
@@ -64 +77 @@
     u.rd = lrd;
     if (RTFLOAT64U_IS_ZERO(&u))
-        return FP_ZERO;
+        return RT_NOCRT_FP_ZERO;
     if (RTFLOAT64U_IS_NORMAL(&u))
-        return FP_NORMAL;
+        return RT_NOCRT_FP_NORMAL;
     if (RTFLOAT64U_IS_NAN(&u))
-        return FP_NAN;
+        return RT_NOCRT_FP_NAN;
     if (RTFLOAT64U_IS_INF(&u))
-        return FP_INFINITE;
+        return RT_NOCRT_FP_INFINITE;
     Assert(RTFLOAT64U_IS_SUBNORMAL(&u));
-    return FP_SUBNORMAL;
+    return RT_NOCRT_FP_SUBNORMAL;
 #endif
 }