Changeset 565aaff in mainline

Timestamp:

2018-03-20T20:22:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3212921

Parents:

6d1d143

git-author:

Jakub Jermar <jakub@…> (2018-03-20 20:10:12)

git-committer:

Jakub Jermar <jakub@…> (2018-03-20 20:22:35)

Message:

Fix aeabi floating-point comparison helpers

According to the Run-time ABI for the ARM Architecture, the
floating-point helpers that compare floats or doubles, return 0 if the
test for the condition encoded in the respective helper's name fails and
1 if it succeeds.

File:

• uspace/lib/softfloat/comparison.c (modified) (9 diffs)

uspace/lib/softfloat/comparison.c

@@ -587 +587 @@
         if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) {
                 // TODO: sigNaNs
-                return -1;
+                return 0;
         }
 
@@ -606 +606 @@
         if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) {
                 // TODO: sigNaNs
-                return 1;
+                return 0;
         }
 
         if (is_float32_lt(ua.data, ub.data))
-                return -1;
+                return 1;
 
         return 0;
@@ -625 +625 @@
         if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) {
                 // TODO: sigNaNs
-                return -1;
+                return 0;
         }
 
         if (is_float32_eq(ua.data, ub.data))
-                return 0;
+                return 1;
 
         if (is_float32_gt(ua.data, ub.data))
                 return 1;
 
-        return -1;
+        return 0;
 }
 
@@ -647 +647 @@
         if ((is_float32_nan(ua.data)) || (is_float32_nan(ub.data))) {
                 // TODO: sigNaNs
-                return 1;
-        }
-
-        return is_float32_eq(ua.data, ub.data) - 1;
+                return 0;
+        }
+
+        return is_float32_eq(ua.data, ub.data);
 }
 
@@ -804 +804 @@
         if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) {
                 // TODO: sigNaNs
-                return 1;
+                return 0;
         }
 
         if (is_float64_lt(ua.data, ub.data))
-                return -1;
+                return 1;
 
         return 0;
@@ -823 +823 @@
         if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) {
                 // TODO: sigNaNs
-                return 1;
-        }
-
-        return is_float64_eq(ua.data, ub.data) - 1;
+                return 0;
+        }
+
+        return is_float64_eq(ua.data, ub.data);
 }
 
@@ -839 +839 @@
         if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) {
                 // TODO: sigNaNs
-                return -1;
+                return 0;
         }
 
@@ -858 +858 @@
         if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) {
                 // TODO: sigNaNs
-                return -1;
+                return 0;
         }
 
         if (is_float64_eq(ua.data, ub.data))
-                return 0;
+                return 1;
 
         if (is_float64_gt(ua.data, ub.data))
                 return 1;
 
-        return -1;
+        return 0;
 }
 
@@ -880 +880 @@
         if ((is_float64_nan(ua.data)) || (is_float64_nan(ub.data))) {
                 // TODO: sigNaNs
-                return 1;
+                return 0;
         }
 
         if (is_float64_eq(ua.data, ub.data))
-                return 0;
+                return 1;
 
         if (is_float64_lt(ua.data, ub.data))
-                return -1;
-
-        return 1;
+                return 1;
+
+        return 0;
 }