Changeset 96196 in vbox for trunk/src/VBox/Runtime/common/math

Timestamp:

Aug 14, 2022 1:03:18 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153004

Message:

IPRT/nocrt: *round[fl] fixes. bugref:10261

Location:

trunk/src/VBox/Runtime/common/math

Files:

• llround.cpp (modified) (1 diff)
• llroundf.cpp (modified) (1 diff)
• llroundl.cpp (modified) (1 diff)
• lround.cpp (modified) (1 diff)
• lroundf.cpp (modified) (1 diff)
• lroundl.cpp (modified) (1 diff)

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

@@ -42 +42 @@
         rd = RT_NOCRT(round)(rd);
         if (rd >= (double)LLONG_MIN && rd <= (double)LLONG_MAX)
-            return (long)rd;
+            return (long long)rd;
         /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
-        return rd > 0 ? LLONG_MAX : LLONG_MIN;
+        return rd > 0.0 ? LLONG_MAX : LLONG_MIN;
     }
     /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
+    if (RT_NOCRT(isinf)(rd) && rd < 0.0)
+        return LLONG_MIN;
     return LLONG_MAX;
 }

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

@@ -42 +42 @@
         r32 = RT_NOCRT(roundf)(r32);
         if (r32 >= (float)LLONG_MIN && r32 <= (float)LLONG_MAX)
-            return (long)r32;
+            return (long long)r32;
         /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
-        return r32 > 0 ? LLONG_MAX : LLONG_MIN;
+        return r32 > 0.0f ? LLONG_MAX : LLONG_MIN;
     }
     /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
+    if (RT_NOCRT(__isinff)(r32) && r32 < 0.0)
+        return LLONG_MIN;
     return LLONG_MAX;
 }

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

@@ -42 +42 @@
         lrd = RT_NOCRT(roundl)(lrd);
         if (lrd >= (long double)LLONG_MIN && lrd <= (long double)LLONG_MAX)
-            return (long)lrd;
+            return (long long)lrd;
         /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
-        return lrd > 0 ? LLONG_MAX : LLONG_MIN;
+        return lrd > 0.0L ? LLONG_MAX : LLONG_MIN;
     }
     /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
+    if (RT_NOCRT(__isinfl)(lrd) && lrd < 0.0)
+        return LLONG_MIN;
     return LLONG_MAX;
 }

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

@@ -44 +44 @@
             return (long)rd;
         /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
-        return rd > 0 ? LONG_MAX : LONG_MIN;
+        return rd > 0.0 ? LONG_MAX : LONG_MIN;
     }
     /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
+    if (RT_NOCRT(isinf)(rd) && rd < 0.0)
+        return LONG_MIN;
     return LONG_MAX;
 }

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

@@ -44 +44 @@
             return (long)r32;
         /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
-        return r32 > 0 ? LONG_MAX : LONG_MIN;
+        return r32 > 0.0f ? LONG_MAX : LONG_MIN;
     }
     /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
+    if (RT_NOCRT(__isinff)(r32) && r32 < 0.0)
+        return LONG_MIN;
     return LONG_MAX;
 }

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

@@ -44 +44 @@
             return (long)lrd;
         /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
-        return lrd > 0 ? LONG_MAX : LONG_MIN;
+        return lrd > 0.0L ? LONG_MAX : LONG_MIN;
     }
     /** @todo RT_NOCRT(feraiseexcept)(FE_INVALID); */
+    if (RT_NOCRT(__isinfl)(lrd) && lrd < 0.0)
+        return LONG_MIN;
     return LONG_MAX;
 }