Changeset 516e780 in mainline for uspace/lib/math/generic/__fcompare.c

Timestamp:

2018-08-31T11:55:41Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fa86fff

Parents:

7f7d642

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-08-31 11:55:41)

git-committer:

GitHub <noreply@…> (2018-08-31 11:55:41)

Message:

Strip down libmath. (#45)

libmath is mostly unused (except for trunc(), sin() and cos()), and most functions in it are either very imprecise or downright broken. Additionally, it is implemented in manner that conflicts with C standard. Instead of trying to fix all the shortcomings while maintaining unused functionality, I'm opting to simply remove most of it and only keep the parts that are currently necessary.

Later readdition of the removed functions is possible, but there needs to be a reliable way to evaluate their quality first.

File:

• uspace/lib/math/generic/__fcompare.c (moved) (moved from uspace/lib/math/generic/ceil.c ) (2 diffs)

uspace/lib/math/generic/__fcompare.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2018 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libmath
- * @{
+#include <math.h>
+#include <stdarg.h>
+
+/**
+ * Fallback symbol used when code including <math.h> is compiled with something
+ * other than GCC or Clang. The function itself must be built with GCC or Clang.
  */
-/** @file
- */
+int __fcompare(size_t sz1, size_t sz2, ...)
+{
+        va_list ap;
+        va_start(ap, sz2);
 
-#include <ceil.h>
-#include <math.h>
-#include <mathtypes.h>
+        long double val1;
+        long double val2;
 
-/** Ceiling (round towards positive infinity, 32-bit floating point)
- *
- * @param val Floating point number.
- *
- * @return Number rounded towards positive infinity.
- */
-float32_t float32_ceil(float32_t val)
-{
-        float32_u t;
-        float32_u v;
-        float32_u r;
-
-        v.val = val;
-        t.val = trunc_f32(val);
-
-        if (v.data.parts.sign == 1 || val == t.val) {
-                r = t;
-        } else {
-                r.val = t.val + 1.0;
+        switch (sz1) {
+        case 4:
+                val1 = (long double) va_arg(ap, double);
+                break;
+        case 8:
+                val1 = (long double) va_arg(ap, double);
+                break;
+        default:
+                val1 = va_arg(ap, long double);
+                break;
         }
 
-        return r.val;
+        switch (sz2) {
+        case 4:
+                val2 = (long double) va_arg(ap, double);
+                break;
+        case 8:
+                val2 = (long double) va_arg(ap, double);
+                break;
+        default:
+                val2 = va_arg(ap, long double);
+                break;
+        }
+
+        va_end(ap);
+
+        if (isgreaterequal(val1, val2)) {
+                if (isgreater(val1, val2))
+                        return __FCOMPARE_GREATER;
+                else
+                        return __FCOMPARE_EQUAL;
+        } else {
+                if (isless(val1, val2))
+                        return __FCOMPARE_LESS;
+                else
+                        return 0;
+        }
 }
 
-/** Ceiling (round towards positive infinity, 64-bit floating point)
- *
- * @param val Floating point number.
- *
- * @return Number rounded towards positive infinity.
- */
-float64_t float64_ceil(float64_t val)
-{
-        float64_u t;
-        float64_u v;
-        float64_u r;
-
-        v.val = val;
-        t.val = trunc_f64(val);
-
-        if (v.data.parts.sign == 1 || val == t.val) {
-                r = t;
-        } else {
-                r.val = t.val + 1.0;
-        }
-
-        return r.val;
-}
-
-/** @}
- */