0.8.5.17:

[sbcl.git] / src / compiler / sparc / float.lisp

diff --git a/src/compiler/sparc/float.lisp b/src/compiler/sparc/float.lisp
index 64b67e3..c6f3de7 100644 (file)
--- a/src/compiler/sparc/float.lisp
+++ b/src/compiler/sparc/float.lisp
@@ -118,7 +118,7 @@
 (defun move-long-reg (dst src)
   (cond
     ((member :sparc-v9 *backend-subfeatures*)
-     (inst fmovq dst src)
+     (inst fmovq dst src))
     (t
      (dotimes (i 4)
        (let ((dst (make-random-tn :kind :normal
@@ -127,7 +127,7 @@
             (src (make-random-tn :kind :normal
                                  :sc (sc-or-lose 'single-reg)
                                  :offset (+ i (tn-offset src)))))
-        (inst fmovs dst src)))))))
+        (inst fmovs dst src))))))
 
 (macrolet ((frob (vop sc format)
             `(progn
@@ -1273,7 +1273,7 @@
       ;; The desired FP mode data is in the least significant 32
       ;; bits, which is stored at the next higher word in memory.
       (loadw res nfp (+ offset 4))
-      ;; Is this nop needed? (toy@rtp.ericsson.se)
+      ;; Is this nop needed? -- rtoy
       (inst nop))))
 
 (define-vop (set-floating-point-modes)
@@ -2530,27 +2530,27 @@
   (multiple-value-bind (definitely-< definitely->=)
       (ir1-transform-<-helper x y)
     (cond (definitely-<
-             (continuation-type y))
+             (lvar-type y))
          (definitely->=
-             (continuation-type x))
+             (lvar-type x))
          (t
-          (make-canonical-union-type (list (continuation-type x)
-                                           (continuation-type y)))))))
+          (make-canonical-union-type (list (lvar-type x)
+                                           (lvar-type y)))))))
 
 (defoptimizer (min derive-type) ((x y))
   (multiple-value-bind (definitely-< definitely->=)
       (ir1-transform-<-helper x y)
     (cond (definitely-<
-             (continuation-type x))
+             (lvar-type x))
          (definitely->=
-             (continuation-type y))
+             (lvar-type y))
          (t
-          (make-canonical-union-type (list (continuation-type x)
-                                           (continuation-type y)))))))
+          (make-canonical-union-type (list (lvar-type x)
+                                           (lvar-type y)))))))
 
-(deftransform max ((x y) (number number) * :when :both)
-  (let ((x-type (continuation-type x))
-       (y-type (continuation-type y))
+(deftransform max ((x y) (number number) *)
+  (let ((x-type (lvar-type x))
+       (y-type (lvar-type y))
        (signed (specifier-type '(signed-byte #.sb!vm:n-word-bits)))
        (unsigned (specifier-type '(unsigned-byte #.sb!vm:n-word-bits)))
        (d-float (specifier-type 'double-float))
@@ -2578,9 +2578,9 @@
               (if (> ,arg1 ,arg2)
                   ,arg1 ,arg2)))))))
 
-(deftransform min ((x y) (real real) * :when :both)
-  (let ((x-type (continuation-type x))
-       (y-type (continuation-type y))
+(deftransform min ((x y) (real real) *)
+  (let ((x-type (lvar-type x))
+       (y-type (lvar-type y))
        (signed (specifier-type '(signed-byte #.sb!vm:n-word-bits)))
        (unsigned (specifier-type '(unsigned-byte #.sb!vm:n-word-bits)))
        (d-float (specifier-type 'double-float))