Changeset 96122 in vbox

Timestamp:

Aug 8, 2022 10:20:03 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: fmax, fmaxf and fmaxl. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/math/fmax.cpp (copied) (copied from trunk/src/VBox/Runtime/common/math/fmin.cpp ) (4 diffs)
• common/math/fmaxf.cpp (copied) (copied from trunk/src/VBox/Runtime/common/math/fminf.cpp ) (4 diffs)
• common/math/fmaxl.cpp (copied) (copied from trunk/src/VBox/Runtime/common/math/fminl.cpp ) (4 diffs)
• common/math/fminl.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1813 +1813 @@
         common/math/copysignf.cpp \
         common/math/copysignl.cpp \
+        common/math/fmax.cpp \
+        common/math/fmaxf.cpp \
+        common/math/fmaxl.cpp \
         common/math/fmin.cpp \
         common/math/fminf.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - fmin().
+ * IPRT - No-CRT - fmax().
  */
 
@@ -34 +34 @@
 
 
-#undef fmin
-double RT_NOCRT(fmin)(double rdLeft, double rdRight)
+#undef fmax
+double RT_NOCRT(fmax)(double rdLeft, double rdRight)
 {
     if (!isnan(rdLeft))
@@ -44 +44 @@
                the 0.0 test and signbit fun here. */
             if (rdLeft != rdRight || rdLeft != 0.0)
-                return rdLeft <= rdRight ? rdLeft : rdRight;
-            return signbit(rdLeft) >= signbit(rdRight) ? rdLeft : rdRight;
+                return rdLeft >= rdRight ? rdLeft : rdRight;
+            return signbit(rdLeft) <= signbit(rdRight) ? rdLeft : rdRight;
         }
         return rdLeft;
@@ -51 +51 @@
     return rdRight;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(fmin);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(fmax);
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - fminf().
+ * IPRT - No-CRT - fmaxf().
  */
 
@@ -34 +34 @@
 
 
-#undef fminf
-float RT_NOCRT(fminf)(float r32Left, float r32Right)
+#undef fmaxf
+float RT_NOCRT(fmaxf)(float r32Left, float r32Right)
 {
     if (!isnan(r32Left))
@@ -44 +44 @@
                the 0.0 test and signbit fun here. */
             if (r32Left != r32Right || r32Left != 0.0)
-                return r32Left <= r32Right ? r32Left : r32Right;
-            return signbit(r32Left) >= signbit(r32Right) ? r32Left : r32Right;
+                return r32Left >= r32Right ? r32Left : r32Right;
+            return signbit(r32Left) <= signbit(r32Right) ? r32Left : r32Right;
         }
         return r32Left;
@@ -51 +51 @@
     return r32Right;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(fminf);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(fmaxf);
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - fminl().
+ * IPRT - No-CRT - fmaxl().
  */
 
@@ -32 +32 @@
 #include "internal/nocrt.h"
 #include <iprt/nocrt/math.h>
-#include <iprt/nocrt/limits.h>
 
 
-#undef fminl
-long double RT_NOCRT(fminl)(long double  lrdLeft, long double lrdRight)
+#undef fmaxl
+long double RT_NOCRT(fmaxl)(long double  lrdLeft, long double lrdRight)
 {
     if (!isnan(lrdLeft))
@@ -45 +44 @@
                the 0.0 test and signbit fun here. */
             if (lrdLeft != lrdRight || lrdLeft != 0.0)
-                return lrdLeft <= lrdRight ? lrdLeft : lrdRight;
-            return signbit(lrdLeft) >= signbit(lrdRight) ? lrdLeft : lrdRight;
+                return lrdLeft >= lrdRight ? lrdLeft : lrdRight;
+            return signbit(lrdLeft) <= signbit(lrdRight) ? lrdLeft : lrdRight;
         }
         return lrdLeft;
@@ -52 +51 @@
     return lrdRight;
 }
-RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(fminl);
+RT_ALIAS_AND_EXPORT_NOCRT_SYMBOL(fmaxl);
 

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

@@ -32 +32 @@
 #include "internal/nocrt.h"
 #include <iprt/nocrt/math.h>
-#include <iprt/nocrt/limits.h>