1 files changed, 68 insertions, 48 deletions

diff --git a/src/regress/lib/libc/ieeefp/except/except.c b/src/regress/lib/libc/ieeefp/except/except.c
index 0ffdcdd468..1d11877777 100644
--- a/src/regress/lib/libc/ieeefp/except/except.c
+++ b/src/regress/lib/libc/ieeefp/except/except.c
@@ -1,21 +1,47 @@
+/*      $OpenBSD: except.c,v 1.10 2006/05/15 14:00:22 kettenis Exp $    */
+
+#include <sys/types.h>
+#include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <assert.h>
 #include <ieeefp.h>
 #include <float.h>
+#include <err.h>
 
-void sigfpe();
-volatile sig_atomic_t signal_cought;
+volatile sig_atomic_t signal_status;
 
-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;
+volatile const double one  = 1.0;
+volatile const double zero = 0.0;
+volatile const double huge = DBL_MAX;
+volatile const double tiny = DBL_MIN;
 
-main()
+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));
+        }
+        _exit(signal_status);
+}
+
+
+int
+main(int argc, char *argv[])
+{
+        struct sigaction sa;
         volatile double x;
 
+        if (argc != 2) {
+                fprintf(stderr, "usage: %s condition\n", argv[0]);
+                exit(1);
+        }
+
         /*
          * check to make sure that all exceptions are masked and 
          * that the accumulated exception status is clear.
@@ -23,65 +49,59 @@ 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_status = 1;
 
         /* trip divide by zero */
         x = one / zero;
-        assert (fpgetsticky() & FP_X_DZ);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_DZ);
         fpsetsticky(0);
 
         /* trip invalid operation */
         x = zero / zero;
-        assert (fpgetsticky() & FP_X_INV);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_INV);
         fpsetsticky(0);
 
         /* trip overflow */
         x = huge * huge;
-        assert (fpgetsticky() & FP_X_OFL);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_OFL);
         fpsetsticky(0);
 
         /* trip underflow */
         x = tiny * tiny;
-        assert (fpgetsticky() & FP_X_UFL);
-        assert (signal_cought == 0);
+        assert(fpgetsticky() & FP_X_UFL);
         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;
-
-        /* unmask and then trip invalid operation */
-        fpsetmask(FP_X_INV);
-        x = zero / zero;
-        assert (signal_cought == 1);
-        signal_cought = 0;
+        signal_status = 0;
 
-        /* unmask and then trip overflow */
-        fpsetmask(FP_X_OFL);
-        x = huge * huge;
-        assert (signal_cought == 1);
-        signal_cought = 0;
-
-        /* unmask and then trip underflow */
-        fpsetmask(FP_X_UFL);
-        x = tiny * tiny;
-        assert (signal_cought == 1);
-        signal_cought = 0;
-#endif
+        if (strcmp(argv[1], "fltdiv") == 0) {
+                /* unmask and then trip divide by zero */
+                fpsetmask(FP_X_DZ);
+                x = one / zero;
+        } else if (strcmp(argv[1], "fltinv") == 0) {
+                /* unmask and then trip invalid operation */
+                fpsetmask(FP_X_INV);
+                x = zero / zero;
+        } else if (strcmp(argv[1], "fltovf") == 0) {
+                /* unmask and then trip overflow */
+                fpsetmask(FP_X_OFL);
+                x = huge * huge;
+        } else if (strcmp(argv[1], "fltund") == 0) {
+                /* unmask and then trip underflow */
+                fpsetmask(FP_X_UFL);
+                x = tiny * tiny;
+        } else {
+                errx(1, "unrecognized condition %s", argv[1]);
+        }
 
-        exit(0);
-}
+        /*
+         * attempt to trigger the exception on machines where
+         * floating-point exceptions are deferred.
+         */
+        x = one * one;
 
-void
-sigfpe()
-{
-        signal_cought = 1;
+        errx(1, "signal wasn't caught");
 }