X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Farith.pure.lisp;h=8c47082f9941c5e689b0f8c7f0d9162d76ee560e;hb=bfa4310e41dcd011ca9d139f29be1c5757b41378;hp=2d4900fbf9fbac586b8bffb11399674158d6dd63;hpb=8f4ef01b8c9930d7dd0a56a96845a6d84ca5774d;p=sbcl.git

diff --git a/tests/arith.pure.lisp b/tests/arith.pure.lisp
index 2d4900f..8c47082 100644
--- a/tests/arith.pure.lisp
+++ b/tests/arith.pure.lisp
@@ -69,17 +69,31 @@
 
 ;;; (CEILING x 2^k) was optimized incorrectly
 (loop for divisor in '(-4 4)
-   for ceiler = (compile nil `(lambda (x)
-                                (declare (fixnum x))
-                                (declare (optimize (speed 3)))
-                                (ceiling x ,divisor)))
-   do (loop for i from -5 to 5
-         for exact-q = (/ i divisor)
-         do (multiple-value-bind (q r)
-                (funcall ceiler i)
-              (assert (= (+ (* q divisor) r) i))
-              (assert (<= exact-q q))
-              (assert (< q (1+ exact-q))))))
+      for ceiler = (compile nil `(lambda (x)
+                                   (declare (fixnum x))
+                                   (declare (optimize (speed 3)))
+                                   (ceiling x ,divisor)))
+      do (loop for i from -5 to 5
+               for exact-q = (/ i divisor)
+               do (multiple-value-bind (q r)
+                      (funcall ceiler i)
+                    (assert (= (+ (* q divisor) r) i))
+                    (assert (<= exact-q q))
+                    (assert (< q (1+ exact-q))))))
+
+;;; (TRUNCATE x 2^k) was optimized incorrectly
+(loop for divisor in '(-4 4)
+      for truncater = (compile nil `(lambda (x)
+                                      (declare (fixnum x))
+                                      (declare (optimize (speed 3)))
+                                      (truncate x ,divisor)))
+      do (loop for i from -9 to 9
+               for exact-q = (/ i divisor)
+               do (multiple-value-bind (q r)
+                      (funcall truncater i)
+                    (assert (= (+ (* q divisor) r) i))
+                    (assert (<= (abs q) (abs exact-q)))
+                    (assert (< (abs exact-q) (1+ (abs q)))))))
 
 ;;; CEILING had a corner case, spotted by Paul Dietz
 (assert (= (ceiling most-negative-fixnum (1+ most-positive-fixnum)) -1))
@@ -92,7 +106,10 @@
   (let* ((x (random most-positive-fixnum))
 	 (x2 (* x 2))
 	 (x3 (* x 3)))
-    (let ((fn (handler-bind ((sb-ext:compiler-note #'error))
+    (let ((fn (handler-bind ((sb-ext:compiler-note
+                              (lambda (c)
+                                (when (<= x3 most-positive-fixnum)
+                                  (error c)))))
 		(compile nil
 			 `(lambda (y)
 			    (declare (optimize speed) (type (integer 0 3) y))
@@ -185,3 +202,7 @@
             ((89 125 16) (ASH A (MIN 18 -706)))
             (T (DPB -3 (BYTE 30 30) -1)))))))
   (assert (= (funcall fn 1227072 -529823 -18 -792831) -2147483649)))
+
+;;; ASH of a negative bignum by a bignum count would erroneously
+;;; return 0 prior to sbcl-0.8.4.4
+(assert (= (ash (1- most-negative-fixnum) (1- most-negative-fixnum)) -1))