Changeset c739102 in mainline for uspace/app

Timestamp:

2012-11-21T23:26:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f2c80a

Parents:

bebf97d (diff), 1f7753a (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:

Mainline changes.

Location:

uspace/app

Files:

• bdsh/config.h (modified) (1 diff)
• ext2info/Makefile (deleted)
• ext2info/ext2info.c (deleted)
• tester/Makefile (modified) (3 diffs)
• tester/ext2/ext2_1.c (deleted)
• tester/ext2/ext2_1.def (deleted)
• tester/float/softfloat1.c (modified) (6 diffs)
• tester/print/print5.def (modified) (1 diff)
• tester/print/print6.c (added)
• tester/print/print6.def (added)
• tester/tester.c (modified) (2 diffs)
• tester/tester.h (modified) (2 diffs)

uspace/app/bdsh/config.h

@@ -55 +55 @@
 #define PACKAGE_STRING "The brain dead shell"
 #define PACKAGE_TARNAME "bdsh"
-#define PACKAGE_VERSION "0.0.1"
-
-
-
+#define PACKAGE_VERSION "0.1.0"

uspace/app/tester/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
 BINARY = tester
 
@@ -42 +42 @@
         print/print4.c \
         print/print5.c \
+        print/print6.c \
         console/console1.c \
         stdio/stdio1.c \
@@ -62 +63 @@
         mm/mapping1.c \
         hw/misc/virtchar1.c \
-        hw/serial/serial1.c \
-        ext2/ext2_1.c
+        hw/serial/serial1.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tester/float/softfloat1.c

@@ -34 +34 @@
 #include <mul.h>
 #include <div.h>
+#include <comparison.h>
 #include <bool.h>
 #include "../tester.h"
@@ -45 +46 @@
 typedef void (* float_op_t)(float, float, float *, float_t *);
 typedef void (* double_op_t)(double, double, double *, double_t *);
+typedef void (* double_cmp_op_t)(double, double, cmptype_t *, cmptype_t *);
 typedef void (* template_t)(void *, unsigned, unsigned, cmptype_t *,
     cmptype_t *);
@@ -66 +68 @@
         
         return -a;
+}
+
+static int dcmp(double a, double b)
+{
+        if (a < b)
+                return -1;
+        else if (a > b)
+                return 1;
+
+        return 0;
 }
 
@@ -96 +108 @@
         *pic = (cmptype_t) (c * PRECISION);
         *pisc = (cmptype_t) (sc.val * PRECISION);
+}
+
+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_b[j], pis, piss);
 }
 
@@ -221 +242 @@
 }
 
+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)
 {
@@ -249 +291 @@
                 TPRINTF("%s\n", err);
         }
+        if (!test_template(double_compare_template, double_cmp_operator)) {
+                err = "Double comparison failed";
+                TPRINTF("%s\n", err);
+        }
         
         return err;

uspace/app/tester/print/print5.def

@@ -1 +1 @@
 {
-        "print1",
-        "String printf test",
-        &test_print1,
+        "print5",
+        "Char printf test",
+        &test_print5,
         true
 },

uspace/app/tester/tester.c

@@ -53 +53 @@
 #include "print/print4.def"
 #include "print/print5.def"
+#include "print/print6.def"
 #include "console/console1.def"
 #include "stdio/stdio1.def"
@@ -73 +74 @@
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
-#include "ext2/ext2_1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -85 +85 @@
 extern const char *test_print4(void);
 extern const char *test_print5(void);
+extern const char *test_print6(void);
 extern const char *test_console1(void);
 extern const char *test_stdio1(void);
@@ -105 +106 @@
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);
-extern const char *test_ext2_1(void);
 extern const char *test_devman1(void);
 extern const char *test_devman2(void);