9 files changed, 180 insertions, 61 deletions

diff --git a/src/regress/lib/libc/ieeefp/Makefile b/src/regress/lib/libc/ieeefp/Makefile
index 4e2e517b03..89ff51a2e7 100644
--- a/src/regress/lib/libc/ieeefp/Makefile
+++ b/src/regress/lib/libc/ieeefp/Makefile
@@ -1,12 +1,7 @@
-#       $NetBSD: Makefile,v 1.4 1995/10/03 21:59:36 phil Exp $
+#       $OpenBSD: Makefile,v 1.6 2004/01/15 18:53:23 miod Exp $
+#       $NetBSD: Makefile,v 1.5 1996/04/09 16:54:18 phil Exp $
 
-.if ${MACHINE} == "pc532"
-SUBDIR+= round
-.else
-SUBDIR+= except round
-.endif
-
-regress: _SUBDIRUSE
+SUBDIR+= except inf infinity round
 
 install:
 
diff --git a/src/regress/lib/libc/ieeefp/except/Makefile b/src/regress/lib/libc/ieeefp/except/Makefile
index 91f24f15f6..ff620e016b 100644
--- a/src/regress/lib/libc/ieeefp/except/Makefile
+++ b/src/regress/lib/libc/ieeefp/except/Makefile
@@ -1,12 +1,5 @@
-#       $NetBSD: Makefile,v 1.1 1995/04/26 00:27:25 jtc Exp $
+#       $OpenBSD: Makefile,v 1.4 2002/02/18 11:22:26 art Exp $
 
-PROG=   except
-SRCS=   except.c
-NOMAN=
+PROG=except
 
-install:
-
-regress: ${PROG}
-        ./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/except/except.c b/src/regress/lib/libc/ieeefp/except/except.c
index 0ffdcdd468..4e8c17d427 100644
--- a/src/regress/lib/libc/ieeefp/except/except.c
+++ b/src/regress/lib/libc/ieeefp/except/except.c
@@ -1,19 +1,37 @@
+/*      $OpenBSD: except.c,v 1.6 2004/04/02 03:06:12 mickey Exp $       */
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <assert.h>
 #include <ieeefp.h>
 #include <float.h>
 
-void sigfpe();
-volatile sig_atomic_t signal_cought;
+volatile sig_atomic_t signal_caught;
+
+volatile const double one  = 1.0;
+volatile const double zero = 0.0;
+volatile const double huge = DBL_MAX;
+volatile const double tiny = DBL_MIN;
+
+void
+sigfpe(int sig, siginfo_t *si, void *v)
+{
+        char buf[132];
+
+        if (si) {
+                snprintf(buf, sizeof(buf), "sigfpe: addr=%p, code=%d\n",
+                    si->si_addr, si->si_code);
+                write(1, buf, strlen(buf));
+        }
+        signal_caught = 1;
+}
 
-static volatile const double one  = 1.0;
-static volatile const double zero = 0.0;
-static volatile const double huge = DBL_MAX;
-static volatile const double tiny = DBL_MIN;
 
-main()
+int
+main(int argc, char *argv[])
 {
+        struct sigaction sa;
         volatile double x;
 
         /*
@@ -23,65 +41,60 @@ main()
         assert(fpgetmask() == 0);
         assert(fpgetsticky() == 0);
 
-        /* set up signal handler */
-        signal (SIGFPE, sigfpe);
-        signal_cought = 0;
+        memset(&sa, 0, sizeof(sa));
+        sa.sa_sigaction = sigfpe;
+        sa.sa_flags = SA_SIGINFO;
+        sigaction(SIGFPE, &sa, NULL);
+        signal_caught = 0;
 
         /* trip divide by zero */
         x = one / zero;
-        assert (fpgetsticky() & FP_X_DZ);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_DZ);
+        assert(signal_caught == 0);
         fpsetsticky(0);
 
         /* trip invalid operation */
         x = zero / zero;
-        assert (fpgetsticky() & FP_X_INV);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_INV);
+        assert(signal_caught == 0);
         fpsetsticky(0);
 
         /* trip overflow */
         x = huge * huge;
-        assert (fpgetsticky() & FP_X_OFL);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_OFL);
+        assert(signal_caught == 0);
         fpsetsticky(0);
 
         /* trip underflow */
         x = tiny * tiny;
-        assert (fpgetsticky() & FP_X_UFL);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_UFL);
+        assert(signal_caught == 0);
         fpsetsticky(0);
 
-#if 0
         /* unmask and then trip divide by zero */
         fpsetmask(FP_X_DZ);
         x = one / zero;
-        assert (signal_cought == 1);
-        signal_cought = 0;
+        assert(signal_caught == 1);
+        signal_caught = 0;
 
         /* unmask and then trip invalid operation */
         fpsetmask(FP_X_INV);
         x = zero / zero;
-        assert (signal_cought == 1);
-        signal_cought = 0;
+        assert(signal_caught == 1);
+        signal_caught = 0;
 
         /* unmask and then trip overflow */
         fpsetmask(FP_X_OFL);
         x = huge * huge;
-        assert (signal_cought == 1);
-        signal_cought = 0;
+        assert(signal_caught == 1);
+        signal_caught = 0;
 
         /* unmask and then trip underflow */
         fpsetmask(FP_X_UFL);
         x = tiny * tiny;
-        assert (signal_cought == 1);
-        signal_cought = 0;
-#endif
+        assert (signal_caught == 1);
+        signal_caught = 0;
 
         exit(0);
 }
 
-void
-sigfpe()
-{
-        signal_cought = 1;
-}
diff --git a/src/regress/lib/libc/ieeefp/inf/Makefile b/src/regress/lib/libc/ieeefp/inf/Makefile
new file mode 100644
index 0000000000..b9a50e0ce6
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/inf/Makefile
@@ -0,0 +1,9 @@
+#       $OpenBSD: Makefile,v 1.1 2002/02/16 17:22:16 pvalchev Exp $
+
+PROG=   inf
+SRCS=   inf.c
+
+LDADD+= -lm
+DPADD+= ${LIBM}
+
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/inf/inf.c b/src/regress/lib/libc/ieeefp/inf/inf.c
new file mode 100644
index 0000000000..a1956145a6
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/inf/inf.c
@@ -0,0 +1,16 @@
+/*      $OpenBSD: inf.c,v 1.3 2003/07/31 21:48:03 deraadt Exp $ */
+
+/*
+ * Peter Valchev <pvalchev@openbsd.org> Public Domain, 2002.
+ */
+
+#include <math.h>
+
+int
+main(int argc, char *argv[])
+{
+        if (isinf(HUGE_VAL))
+                return 0;
+
+        return 1;
+}
diff --git a/src/regress/lib/libc/ieeefp/infinity/Makefile b/src/regress/lib/libc/ieeefp/infinity/Makefile
new file mode 100644
index 0000000000..ac102d8a63
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/infinity/Makefile
@@ -0,0 +1,22 @@
+#       $OpenBSD: Makefile,v 1.2 2004/01/16 19:34:37 miod Exp $
+
+PROG=   infinity
+
+DPADD+= ${LIBM}
+LDADD+= -lm
+
+REGRESS_TARGETS+= add mult neg pumpkin
+
+add: ${PROG}
+        ./${PROG} -a
+
+mult: ${PROG}
+        ./${PROG} -m
+
+neg: ${PROG}
+        ./${PROG} -n
+
+pumpkin: ${PROG}
+        ./${PROG} -p
+
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/infinity/infinity.c b/src/regress/lib/libc/ieeefp/infinity/infinity.c
new file mode 100644
index 0000000000..3b1b71ec90
--- /dev/null
+++ b/src/regress/lib/libc/ieeefp/infinity/infinity.c
@@ -0,0 +1,77 @@
+/*      $OpenBSD: infinity.c,v 1.2 2004/01/16 19:34:37 miod Exp $       */
+/*
+ * Written by Miodrag Vallat, 2004 - Public Domain
+ * Inspired from Perl's t/op/arith test #134
+ */
+
+#include <math.h>
+#include <signal.h>
+#include <unistd.h>
+
+void
+sigfpe(int signum)
+{
+        /* looks like we don't handle fp overflow correctly... */
+        _exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+        int opt;
+        double d, two;
+        int i;
+        char method = 'a';
+
+        while ((opt = getopt(argc, argv, "amnp")) != -1)
+                method = (char)opt;
+
+        signal(SIGFPE, sigfpe);
+
+        switch (method) {
+        case 'a':
+                /* try to produce +Inf through addition */
+                d = 1.0;
+                for (i = 2000; i != 0; i--) {
+                        d = d + d;
+                }
+                /* result should be _positive_ infinity */
+                if (!isinf(d) || copysign(1.0, d) < 0.0)
+                        return (1);
+                break;
+        case 'm':
+                /* try to produce +Inf through multiplication */
+                d = 1.0;
+                two = 2.0;
+                for (i = 2000; i != 0; i--) {
+                        d = d * two;
+                }
+                /* result should be _positive_ infinity */
+                if (!isinf(d) || copysign(1.0, d) < 0.0)
+                        return (1);
+                break;
+        case 'n':
+                /* try to produce -Inf through subtraction */
+                d = -1.0;
+                for (i = 2000; i != 0; i--) {
+                        d = d + d;
+                }
+                /* result should be _negative_ infinity */
+                if (!isinf(d) || copysign(1.0, d) > 0.0)
+                        return (1);
+                break;
+        case 'p':
+                /* try to produce -Inf through multiplication */
+                d = -1.0;
+                two = 2.0;
+                for (i = 2000; i != 0; i--) {
+                        d = d * two;
+                }
+                /* result should be _negative_ infinity */
+                if (!isinf(d) || copysign(1.0, d) > 0.0)
+                        return (1);
+                break;
+        }
+
+        return (0);
+}
diff --git a/src/regress/lib/libc/ieeefp/round/Makefile b/src/regress/lib/libc/ieeefp/round/Makefile
index 571133436c..9ea6dd8c39 100644
--- a/src/regress/lib/libc/ieeefp/round/Makefile
+++ b/src/regress/lib/libc/ieeefp/round/Makefile
@@ -1,12 +1,5 @@
-#       $NetBSD: Makefile,v 1.1 1995/04/26 00:27:27 jtc Exp $
+#       $OpenBSD: Makefile,v 1.4 2002/02/18 11:25:34 art Exp $
 
 PROG=   round
-SRCS=   round.c
-NOMAN=
 
-install:
-
-regress: ${PROG}
-        ./${PROG}
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/round/round.c b/src/regress/lib/libc/ieeefp/round/round.c
index b9fcd9771e..807941ea56 100644
--- a/src/regress/lib/libc/ieeefp/round/round.c
+++ b/src/regress/lib/libc/ieeefp/round/round.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: round.c,v 1.3 2003/07/31 21:48:03 deraadt Exp $       */
 /*      $NetBSD: round.c,v 1.1 1995/04/26 00:27:28 jtc Exp $    */
 
 /*
@@ -11,7 +12,7 @@
 #include <float.h>
 
 int
-main()
+main(int argc, char *argv[])
 {
         /*
          * This test would be better if it actually performed some