Changeset 850235d in mainline for uspace/app/tester/float/softfloat1.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/tester/float/softfloat1.c (modified) (9 diffs)

uspace/app/tester/float/softfloat1.c

@@ -34 +34 @@
 #include <mul.h>
 #include <div.h>
-#include <bool.h>
+#include <comparison.h>
+#include <conversion.h>
+#include <stdbool.h>
 #include "../tester.h"
 
-#define OPERANDS  6 
+#define OPERANDS  10
 #define PRECISION  10000
 
@@ -43 +45 @@
 
 typedef int32_t cmptype_t;
-typedef void (* float_op_t)(float, float, float *, float_t *);
-typedef void (* double_op_t)(double, double, double *, double_t *);
-typedef void (* template_t)(void *, unsigned, unsigned, cmptype_t *,
+
+typedef void (* uint_to_double_op_t)(unsigned int, double *, double_t *);
+typedef void (* double_to_uint_op_t)(double, unsigned int *, unsigned int *);
+typedef void (* float_binary_op_t)(float, float, float *, float_t *);
+typedef void (* double_binary_op_t)(double, double, double *, double_t *);
+typedef void (* double_cmp_op_t)(double, double, cmptype_t *, cmptype_t *);
+
+typedef void (* template_unary_t)(void *, unsigned, cmptype_t *, cmptype_t *);
+typedef void (* template_binary_t)(void *, unsigned, unsigned, cmptype_t *,
     cmptype_t *);
 
-static float fop_a[OPERANDS] =
-        {3.5, -2.1, 100.0, 50.0, -1024.0, 0.0};
-
-static float fop_b[OPERANDS] =
-        {-2.1, 100.0, 50.0, -1024.0, 3.5, 0.0};
-
-static double dop_a[OPERANDS] =
-        {3.5, -2.1, 100.0, 50.0, -1024.0, 0.0};
-
-static double dop_b[OPERANDS] =
-        {-2.1, 100.0, 50.0, -1024.0, 3.5, 0.0};
+#define NUMBERS \
+        3.5, -2.1, 100.0, 50.0, -1024.0, 0.0, 768.3156, 1080.499999, -600.0, 1.0
+
+static float fop_a[OPERANDS] = {
+        NUMBERS
+};
+
+static double dop_a[OPERANDS] = {
+        NUMBERS
+};
+
+static unsigned int uop_a[OPERANDS] = {
+        4, -100, 100, 50, 1024, 0, 1000000, -1U, 0x80000000U, 500
+};
 
 static cmptype_t cmpabs(cmptype_t a)
@@ -68 +79 @@
 }
 
-static void
-float_template(void *f, unsigned i, unsigned j, cmptype_t *pic,
+static int dcmp(double a, double b)
+{
+        if (a < b)
+                return -1;
+        else if (a > b)
+                return 1;
+
+        return 0;
+}
+
+static void
+uint_to_double_template(void *f, unsigned i, cmptype_t *pic, cmptype_t *pisc)
+{
+        double c;
+        double_t sc;
+
+        uint_to_double_op_t op = (uint_to_double_op_t) f;
+        
+        op(uop_a[i], &c, &sc);
+
+        *pic = (cmptype_t) (c * PRECISION);
+        *pisc = (cmptype_t) (sc.val * PRECISION);
+}
+
+static void
+double_to_uint_template(void *f, unsigned i, cmptype_t *pic, cmptype_t *pisc)
+{
+        unsigned int c;
+        unsigned int sc;
+
+        double_to_uint_op_t op = (double_to_uint_op_t) f;
+        
+        op(dop_a[i], &c, &sc);
+
+        *pic = (cmptype_t) c;
+        *pisc = (cmptype_t) sc;
+}
+
+
+static void
+float_template_binary(void *f, unsigned i, unsigned j, cmptype_t *pic,
     cmptype_t *pisc)
 {
@@ -75 +125 @@
         float_t sc;
 
-        float_op_t op = (float_op_t) f;
-        
-        op(fop_a[i], fop_b[j], &c, &sc);
+        float_binary_op_t op = (float_binary_op_t) f;
+        
+        op(fop_a[i], fop_a[j], &c, &sc);
 
         *pic = (cmptype_t) (c * PRECISION);
@@ -84 +134 @@
 
 static void
-double_template(void *f, unsigned i, unsigned j, cmptype_t *pic,
+double_template_binary(void *f, unsigned i, unsigned j, cmptype_t *pic,
     cmptype_t *pisc)
 {
@@ -90 +140 @@
         double_t sc;
 
-        double_op_t op = (double_op_t) f;
-        
-        op(dop_a[i], dop_b[j], &c, &sc);
+        double_binary_op_t op = (double_binary_op_t) f;
+        
+        op(dop_a[i], dop_a[j], &c, &sc);
 
         *pic = (cmptype_t) (c * PRECISION);
@@ -98 +148 @@
 }
 
-static bool test_template(template_t template, void *f)
+static void
+double_compare_template(void *f, unsigned i, unsigned j, cmptype_t *pis,
+    cmptype_t *piss)
+{
+        double_cmp_op_t op = (double_cmp_op_t) f;
+        
+        op(dop_a[i], dop_a[j], pis, piss);
+}
+
+static bool test_template_unary(template_unary_t template, void *f)
+{
+        bool correct = true;
+        
+        for (unsigned int i = 0; i < OPERANDS; i++) {
+                cmptype_t ic;
+                cmptype_t isc;
+
+                template(f, i, &ic, &isc);      
+                cmptype_t diff = cmpabs(ic - isc);
+                        
+                if (diff != 0) {
+                        TPRINTF("i=%u diff=%" PRIdCMPTYPE "\n", i, diff);
+                        correct = false;
+                }
+        }
+        
+        return correct;
+}
+
+static bool test_template_binary(template_binary_t template, void *f)
 {
         bool correct = true;
@@ -121 +200 @@
 }
 
+static void uint_to_double_operator(unsigned int a, double *pc, double_t *psc)
+{
+        *pc = (double) a;
+        psc->data = uint_to_double(a);
+}
+
+static void
+double_to_uint_operator(double a, unsigned int *pc, unsigned int *psc)
+{
+        double_t sa;
+
+        sa.val = a;
+
+        *pc = (unsigned int) a;
+        *psc = double_to_uint(sa.data);
+}
+
+static void
+double_to_int_operator(double a, unsigned int *pc, unsigned int *psc)
+{
+        double_t sa;
+
+        sa.val = a;
+
+        *pc = (int) a;
+        *psc = double_to_int(sa.data);
+}
+
 static void float_add_operator(float a, float b, float *pc, float_t *psc)
 {
@@ -221 +328 @@
 }
 
+static void
+double_cmp_operator(double a, double b, cmptype_t *pis, cmptype_t *piss)
+{
+        *pis = dcmp(a, b);
+
+        double_t sa;
+        double_t sb;
+
+        sa.val = a;
+        sb.val = b;
+
+        if (is_double_lt(sa.data, sb.data))
+                *piss = -1;
+        else if (is_double_gt(sa.data, sb.data))
+                *piss = 1;
+        else if (is_double_eq(sa.data, sb.data))
+                *piss = 0;
+        else
+                *piss = 42;
+}
+
 const char *test_softfloat1(void)
 {
         const char *err = NULL;
 
-        if (!test_template(float_template, float_add_operator)) {
+        if (!test_template_binary(float_template_binary, float_add_operator)) {
                 err = "Float addition failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(float_template, float_mul_operator)) {
+        if (!test_template_binary(float_template_binary, float_mul_operator)) {
                 err = "Float multiplication failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(float_template, float_div_operator)) {
+        if (!test_template_binary(float_template_binary, float_div_operator)) {
                 err = "Float division failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_template, double_add_operator)) {
+        if (!test_template_binary(double_template_binary, double_add_operator)) {
                 err = "Double addition failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_template, double_mul_operator)) {
+        if (!test_template_binary(double_template_binary, double_mul_operator)) {
                 err = "Double multiplication failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_template, double_div_operator)) {
+        if (!test_template_binary(double_template_binary, double_div_operator)) {
                 err = "Double division failed";
                 TPRINTF("%s\n", err);
         }
+        if (!test_template_binary(double_compare_template, double_cmp_operator)) {
+                err = "Double comparison failed";
+                TPRINTF("%s\n", err);
+        }
+        if (!test_template_unary(uint_to_double_template,
+            uint_to_double_operator)) {
+                err = "Conversion from unsigned int to double failed";
+                TPRINTF("%s\n", err);
+        }
+        if (!test_template_unary(double_to_uint_template,
+            double_to_uint_operator)) {
+                err = "Conversion from double to unsigned int failed";
+                TPRINTF("%s\n", err);
+        }
+        if (!test_template_unary(double_to_uint_template,
+            double_to_int_operator)) {
+                err = "Conversion from double to signed int failed";
+                TPRINTF("%s\n", err);
+        }
         
         return err;