1.0.4.64: more stack-alignment x86/Darwin

[sbcl.git] / tests / float.pure.lisp

diff --git a/tests/float.pure.lisp b/tests/float.pure.lisp
index a907faf..7e6d5fd 100644 (file)
--- a/tests/float.pure.lisp
+++ b/tests/float.pure.lisp
@@ -157,21 +157,48 @@
                      (+ x0 x3 x4 x7) (+ x1 x2 x5 x6)
                      (+ x0 x1 x6 x7) (+ x2 x3 x4 x5)))))))
 
+
+#-x86-64
 (with-test (:name :nan-comparisons)
-  (macrolet ((test (form)
-               (let ((nform (subst (/ 0.0 0.0) 'nan form)))
-                 `(progn
-                    (assert (not (eval ',nform)))
-                    (assert (not (funcall (lambda () ,nform))))))))
-    ;; Source transforms for >= and <= used to be too eager about
-    ;; inverting the test, causing NaN issues.
-    (test (>= nan 1.0))
-    (test (>= 1.0 nan))
-    (test (>= 1.0 nan 0.0))
-    (test (>= 1.0 0.0 nan))
-    (test (>= nan 1.0 0.0))
-    (test (<= nan 1.0))
-    (test (<= 1.0 nan))
-    (test (<= 1.0 nan 2.0))
-    (test (<= 1.0 2.0 nan))
-    (test (<= nan 1.0 2.0))))
+  (sb-int:with-float-traps-masked (:invalid)
+    (macrolet ((test (form)
+                 (let ((nform (subst '(/ 0.0 0.0) 'nan form)))
+                   `(progn
+                      (assert (eval ',nform))
+                      (assert (eval `(let ((nan (/ 0.0 0.0)))
+                                       ,',form)))
+                      (assert (funcall
+                               (compile nil `(lambda () ,',nform))))
+                      (assert (funcall
+                               (compile nil `(lambda (nan) ,',form))
+                               (/ 0.0 0.0)))))))
+      (test (/= nan nan))
+      (test (/= nan nan nan))
+      (test (/= 1.0 nan 2.0 nan))
+      (test (/= nan 1.0 2.0 nan))
+      (test (not (= nan 1.0)))
+      (test (not (= nan nan)))
+      (test (not (= nan nan nan)))
+      (test (not (= 1.0 nan)))
+      (test (not (= nan 1.0)))
+      (test (not (= 1.0 1.0 nan)))
+      (test (not (= 1.0 nan 1.0)))
+      (test (not (= nan 1.0 1.0)))
+      (test (not (>= nan nan)))
+      (test (not (>= nan 1.0)))
+      (test (not (>= 1.0 nan)))
+      (test (not (>= 1.0 nan 0.0)))
+      (test (not (>= 1.0 0.0 nan)))
+      (test (not (>= nan 1.0 0.0)))
+      (test (not (<= nan nan)))
+      (test (not (<= nan 1.0)))
+      (test (not (<= 1.0 nan)))
+      (test (not (<= 1.0 nan 2.0)))
+      (test (not (<= 1.0 2.0 nan)))
+      (test (not (<= nan 1.0 2.0)))
+      (test (not (< nan nan)))
+      (test (not (< -1.0 nan)))
+      (test (not (< nan 1.0)))
+      (test (not (> nan nan)))
+      (test (not (> -1.0 nan)))
+      (test (not (> nan 1.0))))))