X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ffloat.pure.lisp;h=64f601e38ba421cca5555fffcbe642c588332230;hb=a18b41402363b662ec59ddaa100f1e417e76aef3;hp=60b3a361c2fe0a92a381cd2a6f16d4abd88e2305;hpb=60e2497894748d137b6b3ef3e50f34627c15dffb;p=sbcl.git

diff --git a/tests/float.pure.lisp b/tests/float.pure.lisp
index 60b3a36..64f601e 100644
--- a/tests/float.pure.lisp
+++ b/tests/float.pure.lisp
@@ -93,7 +93,7 @@
 (assert (= 0.0d0 (scale-float 1.0d0 (1- most-negative-fixnum))))
 
 (with-test (:name (:scale-float-overflow :bug-372)
-            :fails-on :darwin) ;; bug 372
+            :fails-on '(and :darwin :ppc)) ;; bug 372
   (progn
     (assert (raises-error? (scale-float 1.0 most-positive-fixnum)
                            floating-point-overflow))
@@ -125,7 +125,31 @@
 (funcall (compile nil '(lambda () (tan (tan (round 0))))))
 
 (with-test (:name (:addition-overflow :bug-372)
-            :fails-on '(or (and :ppc :openbsd) :darwin (and :x86 :netbsd)))
+            :fails-on '(or (and :ppc :openbsd)
+                           (and :ppc :darwin)
+                           (and :x86 :netbsd)))
+  (assert (typep (nth-value
+                  1
+                  (ignore-errors
+                    (sb-sys:without-interrupts
+                     (sb-int:set-floating-point-modes :current-exceptions nil
+                                                      :accrued-exceptions nil)
+                     (loop repeat 2 summing most-positive-double-float)
+                     (sleep 2))))
+                 'floating-point-overflow)))
+
+;; This is the same test as above.  Even if the above copy passes,
+;; this copy will fail if SIGFPE handling ends up clearing the FPU
+;; control word, which can happen if the kernel clears the FPU control
+;; (a reasonable thing for it to do) and the runtime fails to
+;; compensate for this (see RESTORE_FP_CONTROL_WORD in interrupt.c).
+;; Note that this only works when running float.pure.lisp alone, as
+;; the preceeding "pure" test files aren't as free of side effects as
+;; we might like.
+(with-test (:name (:addition-overflow :bug-372 :take-2)
+            :fails-on '(or (and :ppc :openbsd)
+                           (and :ppc :darwin)
+                           (and :x86 :netbsd)))
   (assert (typep (nth-value
                   1
                   (ignore-errors
@@ -295,6 +319,12 @@
 (macrolet ((with-pinned-floats ((count type &rest names) &body body)
              "Force COUNT float values to be kept live (and hopefully in registers),
               fill a temporary register with noise, and execute BODY."
+             ;; KLUDGE: SB-VM is locked, and non-x86oids don't have
+             ;; SB-VM::TOUCH-OBJECT.  Don't even READ this body on
+             ;; other platforms.
+             #-(or x86 x86-64)
+             (declare (ignore count type names body))
+             #+(or x86 x86-64)
              (let ((dummy (loop repeat count
                                 collect (or (pop names)
                                             (gensym "TEMP")))))