X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Farith.lisp;h=7c6b4335d17ae0df60a47132c94d0bb6de3dc298;hb=7a961398d8faa8f25725405c882245f498ff5117;hp=0be42b4e93cf52c877a081dc1070348ddc6cfbe0;hpb=b914788eab773b579664dcdc09a5278161191c47;p=sbcl.git

diff --git a/src/compiler/x86/arith.lisp b/src/compiler/x86/arith.lisp
index 0be42b4..7c6b433 100644
--- a/src/compiler/x86/arith.lisp
+++ b/src/compiler/x86/arith.lisp
@@ -62,49 +62,49 @@
 
 (define-vop (fast-fixnum-binop fast-safe-arith-op)
   (:args (x :target r :scs (any-reg)
-	    :load-if (not (and (sc-is x control-stack)
-			       (sc-is y any-reg)
-			       (sc-is r control-stack)
-			       (location= x r))))
-	 (y :scs (any-reg control-stack)))
+            :load-if (not (and (sc-is x control-stack)
+                               (sc-is y any-reg)
+                               (sc-is r control-stack)
+                               (location= x r))))
+         (y :scs (any-reg control-stack)))
   (:arg-types tagged-num tagged-num)
   (:results (r :scs (any-reg) :from (:argument 0)
-	       :load-if (not (and (sc-is x control-stack)
-				  (sc-is y any-reg)
-				  (sc-is r control-stack)
-				  (location= x r)))))
+               :load-if (not (and (sc-is x control-stack)
+                                  (sc-is y any-reg)
+                                  (sc-is r control-stack)
+                                  (location= x r)))))
   (:result-types tagged-num)
   (:note "inline fixnum arithmetic"))
 
 (define-vop (fast-unsigned-binop fast-safe-arith-op)
   (:args (x :target r :scs (unsigned-reg)
-	    :load-if (not (and (sc-is x unsigned-stack)
-			       (sc-is y unsigned-reg)
-			       (sc-is r unsigned-stack)
-			       (location= x r))))
-	 (y :scs (unsigned-reg unsigned-stack)))
+            :load-if (not (and (sc-is x unsigned-stack)
+                               (sc-is y unsigned-reg)
+                               (sc-is r unsigned-stack)
+                               (location= x r))))
+         (y :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num)
   (:results (r :scs (unsigned-reg) :from (:argument 0)
-	    :load-if (not (and (sc-is x unsigned-stack)
-			       (sc-is y unsigned-reg)
-			       (sc-is r unsigned-stack)
-			       (location= x r)))))
+            :load-if (not (and (sc-is x unsigned-stack)
+                               (sc-is y unsigned-reg)
+                               (sc-is r unsigned-stack)
+                               (location= x r)))))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic"))
 
 (define-vop (fast-signed-binop fast-safe-arith-op)
   (:args (x :target r :scs (signed-reg)
-	    :load-if (not (and (sc-is x signed-stack)
-			       (sc-is y signed-reg)
-			       (sc-is r signed-stack)
-			       (location= x r))))
-	 (y :scs (signed-reg signed-stack)))
+            :load-if (not (and (sc-is x signed-stack)
+                               (sc-is y signed-reg)
+                               (sc-is r signed-stack)
+                               (location= x r))))
+         (y :scs (signed-reg signed-stack)))
   (:arg-types signed-num signed-num)
   (:results (r :scs (signed-reg) :from (:argument 0)
-	    :load-if (not (and (sc-is x signed-stack)
-			       (sc-is y signed-reg)
-			       (sc-is r signed-stack)
-			       (location= x r)))))
+            :load-if (not (and (sc-is x signed-stack)
+                               (sc-is y signed-reg)
+                               (sc-is r signed-stack)
+                               (location= x r)))))
   (:result-types signed-num)
   (:note "inline (signed-byte 32) arithmetic"))
 
@@ -113,7 +113,7 @@
   (:info y)
   (:arg-types tagged-num (:constant (signed-byte 30)))
   (:results (r :scs (any-reg)
-	       :load-if (not (location= x r))))
+               :load-if (not (location= x r))))
   (:result-types tagged-num)
   (:note "inline fixnum arithmetic"))
 
@@ -122,7 +122,7 @@
   (:info y)
   (:arg-types unsigned-num (:constant (unsigned-byte 32)))
   (:results (r :scs (unsigned-reg)
-	       :load-if (not (location= x r))))
+               :load-if (not (location= x r))))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic"))
 
@@ -131,61 +131,61 @@
   (:info y)
   (:arg-types signed-num (:constant (signed-byte 32)))
   (:results (r :scs (signed-reg)
-	       :load-if (not (location= x r))))
+               :load-if (not (location= x r))))
   (:result-types signed-num)
   (:note "inline (signed-byte 32) arithmetic"))
 
 (macrolet ((define-binop (translate untagged-penalty op)
-	     `(progn
-		(define-vop (,(symbolicate "FAST-" translate "/FIXNUM=>FIXNUM")
-			     fast-fixnum-binop)
-		  (:translate ,translate)
-		  (:generator 2
-			      (move r x)
-			      (inst ,op r y)))
-		(define-vop (,(symbolicate 'fast- translate '-c/fixnum=>fixnum)
-			     fast-fixnum-binop-c)
-		  (:translate ,translate)
-		  (:generator 1
-		  (move r x)
-		  (inst ,op r (fixnumize y))))
-		(define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
-			     fast-signed-binop)
-		  (:translate ,translate)
-		  (:generator ,(1+ untagged-penalty)
-		  (move r x)
-		  (inst ,op r y)))
-		(define-vop (,(symbolicate 'fast- translate '-c/signed=>signed)
-			     fast-signed-binop-c)
-		  (:translate ,translate)
-		  (:generator ,untagged-penalty
-		  (move r x)
-		  (inst ,op r y)))
-		(define-vop (,(symbolicate "FAST-"
-					   translate
-					   "/UNSIGNED=>UNSIGNED")
-		fast-unsigned-binop)
-		  (:translate ,translate)
-		  (:generator ,(1+ untagged-penalty)
-		  (move r x)
-		  (inst ,op r y)))
-		(define-vop (,(symbolicate 'fast-
-					   translate
-					   '-c/unsigned=>unsigned)
-			     fast-unsigned-binop-c)
-		  (:translate ,translate)
-		  (:generator ,untagged-penalty
-		  (move r x)
-		  ,(if (eq translate 'logand)
-		       ;; for the -C/UNSIGNED=>UNSIGNED VOP, this case
-		       ;; is optimized away as an identity somewhere
-		       ;; along the lines.  However, this VOP is used in
-		       ;; -C/SIGNED=>UNSIGNED, below, when the
-		       ;; higher-level lisp code can't optimize away the
-		       ;; non-trivial identity.
-		       `(unless (= y #.(1- (ash 1 n-word-bits)))
-			  (inst ,op r y))
-		       `(inst ,op r y)))))))
+             `(progn
+                (define-vop (,(symbolicate "FAST-" translate "/FIXNUM=>FIXNUM")
+                             fast-fixnum-binop)
+                  (:translate ,translate)
+                  (:generator 2
+                              (move r x)
+                              (inst ,op r y)))
+                (define-vop (,(symbolicate 'fast- translate '-c/fixnum=>fixnum)
+                             fast-fixnum-binop-c)
+                  (:translate ,translate)
+                  (:generator 1
+                  (move r x)
+                  (inst ,op r (fixnumize y))))
+                (define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
+                             fast-signed-binop)
+                  (:translate ,translate)
+                  (:generator ,(1+ untagged-penalty)
+                  (move r x)
+                  (inst ,op r y)))
+                (define-vop (,(symbolicate 'fast- translate '-c/signed=>signed)
+                             fast-signed-binop-c)
+                  (:translate ,translate)
+                  (:generator ,untagged-penalty
+                  (move r x)
+                  (inst ,op r y)))
+                (define-vop (,(symbolicate "FAST-"
+                                           translate
+                                           "/UNSIGNED=>UNSIGNED")
+                fast-unsigned-binop)
+                  (:translate ,translate)
+                  (:generator ,(1+ untagged-penalty)
+                  (move r x)
+                  (inst ,op r y)))
+                (define-vop (,(symbolicate 'fast-
+                                           translate
+                                           '-c/unsigned=>unsigned)
+                             fast-unsigned-binop-c)
+                  (:translate ,translate)
+                  (:generator ,untagged-penalty
+                  (move r x)
+                  ,(if (eq translate 'logand)
+                       ;; for the -C/UNSIGNED=>UNSIGNED VOP, this case
+                       ;; is optimized away as an identity somewhere
+                       ;; along the lines.  However, this VOP is used in
+                       ;; -C/SIGNED=>UNSIGNED, below, when the
+                       ;; higher-level lisp code can't optimize away the
+                       ;; non-trivial identity.
+                       `(unless (= y #.(1- (ash 1 n-word-bits)))
+                          (inst ,op r y))
+                       `(inst ,op r y)))))))
   (define-binop - 4 sub)
   (define-binop logand 2 and)
   (define-binop logior 2 or)
@@ -196,26 +196,26 @@
 (define-vop (fast-+/fixnum=>fixnum fast-safe-arith-op)
   (:translate +)
   (:args (x :scs (any-reg) :target r
-	    :load-if (not (and (sc-is x control-stack)
-			       (sc-is y any-reg)
-			       (sc-is r control-stack)
-			       (location= x r))))
-	 (y :scs (any-reg control-stack)))
+            :load-if (not (and (sc-is x control-stack)
+                               (sc-is y any-reg)
+                               (sc-is r control-stack)
+                               (location= x r))))
+         (y :scs (any-reg control-stack)))
   (:arg-types tagged-num tagged-num)
   (:results (r :scs (any-reg) :from (:argument 0)
-	       :load-if (not (and (sc-is x control-stack)
-				  (sc-is y any-reg)
-				  (sc-is r control-stack)
-				  (location= x r)))))
+               :load-if (not (and (sc-is x control-stack)
+                                  (sc-is y any-reg)
+                                  (sc-is r control-stack)
+                                  (location= x r)))))
   (:result-types tagged-num)
   (:note "inline fixnum arithmetic")
   (:generator 2
     (cond ((and (sc-is x any-reg) (sc-is y any-reg) (sc-is r any-reg)
-		(not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :index y :scale 1)))
-	  (t
-	   (move r x)
-	   (inst add r y)))))
+                (not (location= x r)))
+           (inst lea r (make-ea :dword :base x :index y :scale 1)))
+          (t
+           (move r x)
+           (inst add r y)))))
 
 (define-vop (fast-+-c/fixnum=>fixnum fast-safe-arith-op)
   (:translate +)
@@ -223,64 +223,64 @@
   (:info y)
   (:arg-types tagged-num (:constant (signed-byte 30)))
   (:results (r :scs (any-reg)
-	       :load-if (not (location= x r))))
+               :load-if (not (location= x r))))
   (:result-types tagged-num)
   (:note "inline fixnum arithmetic")
   (:generator 1
     (cond ((and (sc-is x any-reg) (sc-is r any-reg) (not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :disp (fixnumize y))))
-	  (t
-	   (move r x)
-	   (inst add r (fixnumize y))))))
+           (inst lea r (make-ea :dword :base x :disp (fixnumize y))))
+          (t
+           (move r x)
+           (inst add r (fixnumize y))))))
 
 (define-vop (fast-+/signed=>signed fast-safe-arith-op)
   (:translate +)
   (:args (x :scs (signed-reg) :target r
-	    :load-if (not (and (sc-is x signed-stack)
-			       (sc-is y signed-reg)
-			       (sc-is r signed-stack)
-			       (location= x r))))
-	 (y :scs (signed-reg signed-stack)))
+            :load-if (not (and (sc-is x signed-stack)
+                               (sc-is y signed-reg)
+                               (sc-is r signed-stack)
+                               (location= x r))))
+         (y :scs (signed-reg signed-stack)))
   (:arg-types signed-num signed-num)
   (:results (r :scs (signed-reg) :from (:argument 0)
-	       :load-if (not (and (sc-is x signed-stack)
-				  (sc-is y signed-reg)
-				  (location= x r)))))
+               :load-if (not (and (sc-is x signed-stack)
+                                  (sc-is y signed-reg)
+                                  (location= x r)))))
   (:result-types signed-num)
   (:note "inline (signed-byte 32) arithmetic")
   (:generator 5
     (cond ((and (sc-is x signed-reg) (sc-is y signed-reg) (sc-is r signed-reg)
-		(not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :index y :scale 1)))
-	  (t
-	   (move r x)
-	   (inst add r y)))))
+                (not (location= x r)))
+           (inst lea r (make-ea :dword :base x :index y :scale 1)))
+          (t
+           (move r x)
+           (inst add r y)))))
 
 ;;;; Special logand cases: (logand signed unsigned) => unsigned
 
 (define-vop (fast-logand/signed-unsigned=>unsigned
-	     fast-logand/unsigned=>unsigned)
+             fast-logand/unsigned=>unsigned)
   (:args (x :target r :scs (signed-reg)
-	    :load-if (not (and (sc-is x signed-stack)
-			       (sc-is y unsigned-reg)
-			       (sc-is r unsigned-stack)
-			       (location= x r))))
-	 (y :scs (unsigned-reg unsigned-stack)))
+            :load-if (not (and (sc-is x signed-stack)
+                               (sc-is y unsigned-reg)
+                               (sc-is r unsigned-stack)
+                               (location= x r))))
+         (y :scs (unsigned-reg unsigned-stack)))
   (:arg-types signed-num unsigned-num))
 
 (define-vop (fast-logand-c/signed-unsigned=>unsigned
-	     fast-logand-c/unsigned=>unsigned)
+             fast-logand-c/unsigned=>unsigned)
   (:args (x :target r :scs (signed-reg signed-stack)))
   (:arg-types signed-num (:constant (unsigned-byte 32))))
 
 (define-vop (fast-logand/unsigned-signed=>unsigned
-	     fast-logand/unsigned=>unsigned)
+             fast-logand/unsigned=>unsigned)
   (:args (x :target r :scs (unsigned-reg)
-	    :load-if (not (and (sc-is x unsigned-stack)
-			       (sc-is y signed-reg)
-			       (sc-is r unsigned-stack)
-			       (location= x r))))
-	 (y :scs (signed-reg signed-stack)))
+            :load-if (not (and (sc-is x unsigned-stack)
+                               (sc-is y signed-reg)
+                               (sc-is r unsigned-stack)
+                               (location= x r))))
+         (y :scs (signed-reg signed-stack)))
   (:arg-types unsigned-num signed-num))
 
 
@@ -290,42 +290,42 @@
   (:info y)
   (:arg-types signed-num (:constant (signed-byte 32)))
   (:results (r :scs (signed-reg)
-	       :load-if (not (location= x r))))
+               :load-if (not (location= x r))))
   (:result-types signed-num)
   (:note "inline (signed-byte 32) arithmetic")
   (:generator 4
     (cond ((and (sc-is x signed-reg) (sc-is r signed-reg)
-		(not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :disp y)))
-	  (t
-	   (move r x)
-	   (if (= y 1)
-	       (inst inc r)
-	     (inst add r y))))))
+                (not (location= x r)))
+           (inst lea r (make-ea :dword :base x :disp y)))
+          (t
+           (move r x)
+           (if (= y 1)
+               (inst inc r)
+             (inst add r y))))))
 
 (define-vop (fast-+/unsigned=>unsigned fast-safe-arith-op)
   (:translate +)
   (:args (x :scs (unsigned-reg) :target r
-	    :load-if (not (and (sc-is x unsigned-stack)
-			       (sc-is y unsigned-reg)
-			       (sc-is r unsigned-stack)
-			       (location= x r))))
-	 (y :scs (unsigned-reg unsigned-stack)))
+            :load-if (not (and (sc-is x unsigned-stack)
+                               (sc-is y unsigned-reg)
+                               (sc-is r unsigned-stack)
+                               (location= x r))))
+         (y :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num)
   (:results (r :scs (unsigned-reg) :from (:argument 0)
-	       :load-if (not (and (sc-is x unsigned-stack)
-				  (sc-is y unsigned-reg)
-				  (sc-is r unsigned-stack)
-				  (location= x r)))))
+               :load-if (not (and (sc-is x unsigned-stack)
+                                  (sc-is y unsigned-reg)
+                                  (sc-is r unsigned-stack)
+                                  (location= x r)))))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic")
   (:generator 5
     (cond ((and (sc-is x unsigned-reg) (sc-is y unsigned-reg)
-		(sc-is r unsigned-reg) (not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :index y :scale 1)))
-	  (t
-	   (move r x)
-	   (inst add r y)))))
+                (sc-is r unsigned-reg) (not (location= x r)))
+           (inst lea r (make-ea :dword :base x :index y :scale 1)))
+          (t
+           (move r x)
+           (inst add r y)))))
 
 (define-vop (fast-+-c/unsigned=>unsigned fast-safe-arith-op)
   (:translate +)
@@ -333,18 +333,18 @@
   (:info y)
   (:arg-types unsigned-num (:constant (unsigned-byte 32)))
   (:results (r :scs (unsigned-reg)
-	       :load-if (not (location= x r))))
+               :load-if (not (location= x r))))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic")
   (:generator 4
     (cond ((and (sc-is x unsigned-reg) (sc-is r unsigned-reg)
-		(not (location= x r)))
-	   (inst lea r (make-ea :dword :base x :disp y)))
-	  (t
-	   (move r x)
-	   (if (= y 1)
-	       (inst inc r)
-	     (inst add r y))))))
+                (not (location= x r)))
+           (inst lea r (make-ea :dword :base x :disp y)))
+          (t
+           (move r x)
+           (if (= y 1)
+               (inst inc r)
+             (inst add r y))))))
 
 ;;;; multiplication and division
 
@@ -352,7 +352,7 @@
   (:translate *)
   ;; We need different loading characteristics.
   (:args (x :scs (any-reg) :target r)
-	 (y :scs (any-reg control-stack)))
+         (y :scs (any-reg control-stack)))
   (:arg-types tagged-num tagged-num)
   (:results (r :scs (any-reg) :from (:argument 0)))
   (:result-types tagged-num)
@@ -378,7 +378,7 @@
   (:translate *)
   ;; We need different loading characteristics.
   (:args (x :scs (signed-reg) :target r)
-	 (y :scs (signed-reg signed-stack)))
+         (y :scs (signed-reg signed-stack)))
   (:arg-types signed-num signed-num)
   (:results (r :scs (signed-reg) :from (:argument 0)))
   (:result-types signed-num)
@@ -402,14 +402,14 @@
 (define-vop (fast-*/unsigned=>unsigned fast-safe-arith-op)
   (:translate *)
   (:args (x :scs (unsigned-reg) :target eax)
-	 (y :scs (unsigned-reg unsigned-stack)))
+         (y :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num)
-  (:temporary (:sc unsigned-reg :offset eax-offset :target result
-		   :from (:argument 0) :to :result) eax)
+  (:temporary (:sc unsigned-reg :offset eax-offset :target r
+                   :from (:argument 0) :to :result) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset
-		   :from :eval :to :result) edx)
+                   :from :eval :to :result) edx)
   (:ignore edx)
-  (:results (result :scs (unsigned-reg)))
+  (:results (r :scs (unsigned-reg)))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic")
   (:vop-var vop)
@@ -417,20 +417,20 @@
   (:generator 6
     (move eax x)
     (inst mul eax y)
-    (move result eax)))
+    (move r eax)))
 
 
 (define-vop (fast-truncate/fixnum=>fixnum fast-safe-arith-op)
   (:translate truncate)
   (:args (x :scs (any-reg) :target eax)
-	 (y :scs (any-reg control-stack)))
+         (y :scs (any-reg control-stack)))
   (:arg-types tagged-num tagged-num)
   (:temporary (:sc signed-reg :offset eax-offset :target quo
-		   :from (:argument 0) :to (:result 0)) eax)
+                   :from (:argument 0) :to (:result 0)) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :target rem
-		   :from (:argument 0) :to (:result 1)) edx)
+                   :from (:argument 0) :to (:result 1)) edx)
   (:results (quo :scs (any-reg))
-	    (rem :scs (any-reg)))
+            (rem :scs (any-reg)))
   (:result-types tagged-num tagged-num)
   (:note "inline fixnum arithmetic")
   (:vop-var vop)
@@ -438,15 +438,15 @@
   (:generator 31
     (let ((zero (generate-error-code vop division-by-zero-error x y)))
       (if (sc-is y any-reg)
-	  (inst test y y)  ; smaller instruction
-	  (inst cmp y 0))
+          (inst test y y)  ; smaller instruction
+          (inst cmp y 0))
       (inst jmp :eq zero))
     (move eax x)
     (inst cdq)
     (inst idiv eax y)
     (if (location= quo eax)
-	(inst shl eax 2)
-	(inst lea quo (make-ea :dword :index eax :scale 4)))
+        (inst shl eax 2)
+        (inst lea quo (make-ea :dword :index eax :scale 4)))
     (move rem edx)))
 
 (define-vop (fast-truncate-c/fixnum=>fixnum fast-safe-arith-op)
@@ -455,12 +455,12 @@
   (:info y)
   (:arg-types tagged-num (:constant (signed-byte 30)))
   (:temporary (:sc signed-reg :offset eax-offset :target quo
-		   :from :argument :to (:result 0)) eax)
+                   :from :argument :to (:result 0)) eax)
   (:temporary (:sc any-reg :offset edx-offset :target rem
-		   :from :eval :to (:result 1)) edx)
+                   :from :eval :to (:result 1)) edx)
   (:temporary (:sc any-reg :from :eval :to :result) y-arg)
   (:results (quo :scs (any-reg))
-	    (rem :scs (any-reg)))
+            (rem :scs (any-reg)))
   (:result-types tagged-num tagged-num)
   (:note "inline fixnum arithmetic")
   (:vop-var vop)
@@ -471,21 +471,21 @@
     (inst mov y-arg (fixnumize y))
     (inst idiv eax y-arg)
     (if (location= quo eax)
-	(inst shl eax 2)
-	(inst lea quo (make-ea :dword :index eax :scale 4)))
+        (inst shl eax 2)
+        (inst lea quo (make-ea :dword :index eax :scale 4)))
     (move rem edx)))
 
 (define-vop (fast-truncate/unsigned=>unsigned fast-safe-arith-op)
   (:translate truncate)
   (:args (x :scs (unsigned-reg) :target eax)
-	 (y :scs (unsigned-reg signed-stack)))
+         (y :scs (unsigned-reg signed-stack)))
   (:arg-types unsigned-num unsigned-num)
   (:temporary (:sc unsigned-reg :offset eax-offset :target quo
-		   :from (:argument 0) :to (:result 0)) eax)
+                   :from (:argument 0) :to (:result 0)) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :target rem
-		   :from (:argument 0) :to (:result 1)) edx)
+                   :from (:argument 0) :to (:result 1)) edx)
   (:results (quo :scs (unsigned-reg))
-	    (rem :scs (unsigned-reg)))
+            (rem :scs (unsigned-reg)))
   (:result-types unsigned-num unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic")
   (:vop-var vop)
@@ -493,8 +493,8 @@
   (:generator 33
     (let ((zero (generate-error-code vop division-by-zero-error x y)))
       (if (sc-is y unsigned-reg)
-	  (inst test y y)  ; smaller instruction
-	  (inst cmp y 0))
+          (inst test y y)  ; smaller instruction
+          (inst cmp y 0))
       (inst jmp :eq zero))
     (move eax x)
     (inst xor edx edx)
@@ -508,12 +508,12 @@
   (:info y)
   (:arg-types unsigned-num (:constant (unsigned-byte 32)))
   (:temporary (:sc unsigned-reg :offset eax-offset :target quo
-		   :from :argument :to (:result 0)) eax)
+                   :from :argument :to (:result 0)) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :target rem
-		   :from :eval :to (:result 1)) edx)
+                   :from :eval :to (:result 1)) edx)
   (:temporary (:sc unsigned-reg :from :eval :to :result) y-arg)
   (:results (quo :scs (unsigned-reg))
-	    (rem :scs (unsigned-reg)))
+            (rem :scs (unsigned-reg)))
   (:result-types unsigned-num unsigned-num)
   (:note "inline (unsigned-byte 32) arithmetic")
   (:vop-var vop)
@@ -529,14 +529,14 @@
 (define-vop (fast-truncate/signed=>signed fast-safe-arith-op)
   (:translate truncate)
   (:args (x :scs (signed-reg) :target eax)
-	 (y :scs (signed-reg signed-stack)))
+         (y :scs (signed-reg signed-stack)))
   (:arg-types signed-num signed-num)
   (:temporary (:sc signed-reg :offset eax-offset :target quo
-		   :from (:argument 0) :to (:result 0)) eax)
+                   :from (:argument 0) :to (:result 0)) eax)
   (:temporary (:sc signed-reg :offset edx-offset :target rem
-		   :from (:argument 0) :to (:result 1)) edx)
+                   :from (:argument 0) :to (:result 1)) edx)
   (:results (quo :scs (signed-reg))
-	    (rem :scs (signed-reg)))
+            (rem :scs (signed-reg)))
   (:result-types signed-num signed-num)
   (:note "inline (signed-byte 32) arithmetic")
   (:vop-var vop)
@@ -544,8 +544,8 @@
   (:generator 33
     (let ((zero (generate-error-code vop division-by-zero-error x y)))
       (if (sc-is y signed-reg)
-	  (inst test y y)  ; smaller instruction
-	  (inst cmp y 0))
+          (inst test y y)  ; smaller instruction
+          (inst cmp y 0))
       (inst jmp :eq zero))
     (move eax x)
     (inst cdq)
@@ -559,12 +559,12 @@
   (:info y)
   (:arg-types signed-num (:constant (signed-byte 32)))
   (:temporary (:sc signed-reg :offset eax-offset :target quo
-		   :from :argument :to (:result 0)) eax)
+                   :from :argument :to (:result 0)) eax)
   (:temporary (:sc signed-reg :offset edx-offset :target rem
-		   :from :eval :to (:result 1)) edx)
+                   :from :eval :to (:result 1)) edx)
   (:temporary (:sc signed-reg :from :eval :to :result) y-arg)
   (:results (quo :scs (signed-reg))
-	    (rem :scs (signed-reg)))
+            (rem :scs (signed-reg)))
   (:result-types signed-num signed-num)
   (:note "inline (signed-byte 32) arithmetic")
   (:vop-var vop)
@@ -584,51 +584,51 @@
   (:translate ash)
   (:policy :fast-safe)
   (:args (number :scs (any-reg) :target result
-		 :load-if (not (and (sc-is number any-reg control-stack)
-				    (sc-is result any-reg control-stack)
-				    (location= number result)))))
+                 :load-if (not (and (sc-is number any-reg control-stack)
+                                    (sc-is result any-reg control-stack)
+                                    (location= number result)))))
   (:info amount)
   (:arg-types tagged-num (:constant integer))
   (:results (result :scs (any-reg)
-		    :load-if (not (and (sc-is number control-stack)
-				       (sc-is result control-stack)
-				       (location= number result)))))
+                    :load-if (not (and (sc-is number control-stack)
+                                       (sc-is result control-stack)
+                                       (location= number result)))))
   (:result-types tagged-num)
   (:note "inline ASH")
   (:generator 2
     (cond ((and (= amount 1) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 2)))
-	  ((and (= amount 2) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 4)))
-	  ((and (= amount 3) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 8)))
-	  (t
-	   (move result number)
-	   (cond ((plusp amount)
-		  ;; We don't have to worry about overflow because of the
-		  ;; result type restriction.
-		  (inst shl result amount))
-		 (t
-		  ;; If the amount is greater than 31, only shift by 31. We
-		  ;; have to do this because the shift instructions only look
-		  ;; at the low five bits of the result.
-		  (inst sar result (min 31 (- amount)))
-		  ;; Fixnum correction.
-		  (inst and result #xfffffffc)))))))
+           (inst lea result (make-ea :dword :index number :scale 2)))
+          ((and (= amount 2) (not (location= number result)))
+           (inst lea result (make-ea :dword :index number :scale 4)))
+          ((and (= amount 3) (not (location= number result)))
+           (inst lea result (make-ea :dword :index number :scale 8)))
+          (t
+           (move result number)
+           (cond ((plusp amount)
+                  ;; We don't have to worry about overflow because of the
+                  ;; result type restriction.
+                  (inst shl result amount))
+                 (t
+                  ;; If the amount is greater than 31, only shift by 31. We
+                  ;; have to do this because the shift instructions only look
+                  ;; at the low five bits of the result.
+                  (inst sar result (min 31 (- amount)))
+                  ;; Fixnum correction.
+                  (inst and result #xfffffffc)))))))
 
 (define-vop (fast-ash-left/fixnum=>fixnum)
   (:translate ash)
   (:args (number :scs (any-reg) :target result
-		 :load-if (not (and (sc-is number control-stack)
-				    (sc-is result control-stack)
-				    (location= number result))))
-	 (amount :scs (unsigned-reg) :target ecx))
+                 :load-if (not (and (sc-is number control-stack)
+                                    (sc-is result control-stack)
+                                    (location= number result))))
+         (amount :scs (unsigned-reg) :target ecx))
   (:arg-types tagged-num positive-fixnum)
   (:temporary (:sc unsigned-reg :offset ecx-offset :from (:argument 1)) ecx)
   (:results (result :scs (any-reg) :from (:argument 0)
-		    :load-if (not (and (sc-is number control-stack)
-				       (sc-is result control-stack)
-				       (location= number result)))))
+                    :load-if (not (and (sc-is number control-stack)
+                                       (sc-is result control-stack)
+                                       (location= number result)))))
   (:result-types tagged-num)
   (:policy :fast-safe)
   (:note "inline ASH")
@@ -642,76 +642,76 @@
   (:translate ash)
   (:policy :fast-safe)
   (:args (number :scs (signed-reg) :target result
-		 :load-if (not (and (sc-is number signed-stack)
-				    (sc-is result signed-stack)
-				    (location= number result)))))
+                 :load-if (not (and (sc-is number signed-stack)
+                                    (sc-is result signed-stack)
+                                    (location= number result)))))
   (:info amount)
   (:arg-types signed-num (:constant integer))
   (:results (result :scs (signed-reg)
-		    :load-if (not (and (sc-is number signed-stack)
-				       (sc-is result signed-stack)
-				       (location= number result)))))
+                    :load-if (not (and (sc-is number signed-stack)
+                                       (sc-is result signed-stack)
+                                       (location= number result)))))
   (:result-types signed-num)
   (:note "inline ASH")
   (:generator 3
     (cond ((and (= amount 1) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 2)))
-	  ((and (= amount 2) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 4)))
-	  ((and (= amount 3) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 8)))
-	  (t
-	   (move result number)
-	   (cond ((plusp amount) (inst shl result amount))
-		 (t (inst sar result (min 31 (- amount)))))))))
+           (inst lea result (make-ea :dword :index number :scale 2)))
+          ((and (= amount 2) (not (location= number result)))
+           (inst lea result (make-ea :dword :index number :scale 4)))
+          ((and (= amount 3) (not (location= number result)))
+           (inst lea result (make-ea :dword :index number :scale 8)))
+          (t
+           (move result number)
+           (cond ((plusp amount) (inst shl result amount))
+                 (t (inst sar result (min 31 (- amount)))))))))
 
 (define-vop (fast-ash-c/unsigned=>unsigned)
   (:translate ash)
   (:policy :fast-safe)
   (:args (number :scs (unsigned-reg) :target result
-		 :load-if (not (and (sc-is number unsigned-stack)
-				    (sc-is result unsigned-stack)
-				    (location= number result)))))
+                 :load-if (not (and (sc-is number unsigned-stack)
+                                    (sc-is result unsigned-stack)
+                                    (location= number result)))))
   (:info amount)
   (:arg-types unsigned-num (:constant integer))
   (:results (result :scs (unsigned-reg)
-		    :load-if (not (and (sc-is number unsigned-stack)
-				       (sc-is result unsigned-stack)
-				       (location= number result)))))
+                    :load-if (not (and (sc-is number unsigned-stack)
+                                       (sc-is result unsigned-stack)
+                                       (location= number result)))))
   (:result-types unsigned-num)
   (:note "inline ASH")
   (:generator 3
     (cond ((and (= amount 1) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 2)))
-	  ((and (= amount 2) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 4)))
-	  ((and (= amount 3) (not (location= number result)))
-	   (inst lea result (make-ea :dword :index number :scale 8)))
-	  (t
-	   (move result number)
-	   (cond ((< -32 amount 32)
+           (inst lea result (make-ea :dword :index number :scale 2)))
+          ((and (= amount 2) (not (location= number result)))
+           (inst lea result (make-ea :dword :index number :scale 4)))
+          ((and (= amount 3) (not (location= number result)))
+           (inst lea result (make-ea :dword :index number :scale 8)))
+          (t
+           (move result number)
+           (cond ((< -32 amount 32)
                   ;; this code is used both in ASH and ASH-MOD32, so
                   ;; be careful
                   (if (plusp amount)
                       (inst shl result amount)
                       (inst shr result (- amount))))
-		 (t (if (sc-is result unsigned-reg)
+                 (t (if (sc-is result unsigned-reg)
                         (inst xor result result)
                         (inst mov result 0))))))))
 
 (define-vop (fast-ash-left/signed=>signed)
   (:translate ash)
   (:args (number :scs (signed-reg) :target result
-		 :load-if (not (and (sc-is number signed-stack)
-				    (sc-is result signed-stack)
-				    (location= number result))))
-	 (amount :scs (unsigned-reg) :target ecx))
+                 :load-if (not (and (sc-is number signed-stack)
+                                    (sc-is result signed-stack)
+                                    (location= number result))))
+         (amount :scs (unsigned-reg) :target ecx))
   (:arg-types signed-num positive-fixnum)
   (:temporary (:sc unsigned-reg :offset ecx-offset :from (:argument 1)) ecx)
   (:results (result :scs (signed-reg) :from (:argument 0)
-		    :load-if (not (and (sc-is number signed-stack)
-				       (sc-is result signed-stack)
-				       (location= number result)))))
+                    :load-if (not (and (sc-is number signed-stack)
+                                       (sc-is result signed-stack)
+                                       (location= number result)))))
   (:result-types signed-num)
   (:policy :fast-safe)
   (:note "inline ASH")
@@ -723,16 +723,16 @@
 (define-vop (fast-ash-left/unsigned=>unsigned)
   (:translate ash)
   (:args (number :scs (unsigned-reg) :target result
-		 :load-if (not (and (sc-is number unsigned-stack)
-				    (sc-is result unsigned-stack)
-				    (location= number result))))
-	 (amount :scs (unsigned-reg) :target ecx))
+                 :load-if (not (and (sc-is number unsigned-stack)
+                                    (sc-is result unsigned-stack)
+                                    (location= number result))))
+         (amount :scs (unsigned-reg) :target ecx))
   (:arg-types unsigned-num positive-fixnum)
   (:temporary (:sc unsigned-reg :offset ecx-offset :from (:argument 1)) ecx)
   (:results (result :scs (unsigned-reg) :from (:argument 0)
-		    :load-if (not (and (sc-is number unsigned-stack)
-				       (sc-is result unsigned-stack)
-				       (location= number result)))))
+                    :load-if (not (and (sc-is number unsigned-stack)
+                                       (sc-is result unsigned-stack)
+                                       (location= number result)))))
   (:result-types unsigned-num)
   (:policy :fast-safe)
   (:note "inline ASH")
@@ -745,7 +745,7 @@
   (:translate ash)
   (:policy :fast-safe)
   (:args (number :scs (signed-reg) :target result)
-	 (amount :scs (signed-reg) :target ecx))
+         (amount :scs (signed-reg) :target ecx))
   (:arg-types signed-num signed-num)
   (:results (result :scs (signed-reg) :from (:argument 0)))
   (:result-types signed-num)
@@ -774,7 +774,7 @@
   (:translate ash)
   (:policy :fast-safe)
   (:args (number :scs (unsigned-reg) :target result)
-	 (amount :scs (signed-reg) :target ecx))
+         (amount :scs (signed-reg) :target ecx))
   (:arg-types unsigned-num signed-num)
   (:results (result :scs (unsigned-reg) :from (:argument 0)))
   (:result-types unsigned-num)
@@ -808,23 +808,23 @@
 
 (defoptimizer (%lea derive-type) ((base index scale disp))
   (when (and (constant-lvar-p scale)
-	     (constant-lvar-p disp))
+             (constant-lvar-p disp))
     (let ((scale (lvar-value scale))
-	  (disp (lvar-value disp))
-	  (base-type (lvar-type base))
-	  (index-type (lvar-type index)))
+          (disp (lvar-value disp))
+          (base-type (lvar-type base))
+          (index-type (lvar-type index)))
       (when (and (numeric-type-p base-type)
-		 (numeric-type-p index-type))
-	(let ((base-lo (numeric-type-low base-type))
-	      (base-hi (numeric-type-high base-type))
-	      (index-lo (numeric-type-low index-type))
-	      (index-hi (numeric-type-high index-type)))
-	  (make-numeric-type :class 'integer
-			     :complexp :real
-			     :low (when (and base-lo index-lo)
-				    (+ base-lo (* index-lo scale) disp))
-			     :high (when (and base-hi index-hi)
-				     (+ base-hi (* index-hi scale) disp))))))))
+                 (numeric-type-p index-type))
+        (let ((base-lo (numeric-type-low base-type))
+              (base-hi (numeric-type-high base-type))
+              (index-lo (numeric-type-low index-type))
+              (index-hi (numeric-type-high index-type)))
+          (make-numeric-type :class 'integer
+                             :complexp :real
+                             :low (when (and base-lo index-lo)
+                                    (+ base-lo (* index-lo scale) disp))
+                             :high (when (and base-hi index-hi)
+                                     (+ base-hi (* index-hi scale) disp))))))))
 
 (defun %lea (base index scale disp)
   (+ base (* index scale) disp))
@@ -835,46 +835,46 @@
   (:translate %lea)
   (:policy :fast-safe)
   (:args (base :scs (unsigned-reg))
-	 (index :scs (unsigned-reg)))
+         (index :scs (unsigned-reg)))
   (:info scale disp)
   (:arg-types unsigned-num unsigned-num
-	      (:constant (member 1 2 4 8))
-	      (:constant (signed-byte 32)))
+              (:constant (member 1 2 4 8))
+              (:constant (signed-byte 32)))
   (:results (r :scs (unsigned-reg)))
   (:result-types unsigned-num)
   (:generator 5
     (inst lea r (make-ea :dword :base base :index index
-			 :scale scale :disp disp))))
+                         :scale scale :disp disp))))
 
 (define-vop (%lea/signed=>signed)
   (:translate %lea)
   (:policy :fast-safe)
   (:args (base :scs (signed-reg))
-	 (index :scs (signed-reg)))
+         (index :scs (signed-reg)))
   (:info scale disp)
   (:arg-types signed-num signed-num
-	      (:constant (member 1 2 4 8))
-	      (:constant (signed-byte 32)))
+              (:constant (member 1 2 4 8))
+              (:constant (signed-byte 32)))
   (:results (r :scs (signed-reg)))
   (:result-types signed-num)
   (:generator 4
     (inst lea r (make-ea :dword :base base :index index
-			 :scale scale :disp disp))))
+                         :scale scale :disp disp))))
 
 (define-vop (%lea/fixnum=>fixnum)
   (:translate %lea)
   (:policy :fast-safe)
   (:args (base :scs (any-reg))
-	 (index :scs (any-reg)))
+         (index :scs (any-reg)))
   (:info scale disp)
   (:arg-types tagged-num tagged-num
-	      (:constant (member 1 2 4 8))
-	      (:constant (signed-byte 32)))
+              (:constant (member 1 2 4 8))
+              (:constant (signed-byte 32)))
   (:results (r :scs (any-reg)))
   (:result-types tagged-num)
   (:generator 3
     (inst lea r (make-ea :dword :base base :index index
-			 :scale scale :disp disp))))
+                         :scale scale :disp disp))))
 
 ;;; FIXME: before making knowledge of this too public, it needs to be
 ;;; fixed so that it's actually _faster_ than the non-CMOV version; at
@@ -884,7 +884,7 @@
   (:translate ash)
   (:policy :fast-safe)
   (:args (number :scs (unsigned-reg) :target result)
-	 (amount :scs (signed-reg) :target ecx))
+         (amount :scs (signed-reg) :target ecx))
   (:arg-types unsigned-num signed-num)
   (:results (result :scs (unsigned-reg) :from (:argument 0)))
   (:result-types unsigned-num)
@@ -903,7 +903,7 @@
     (inst cmp ecx 31)
     (inst cmov :nbe result zero)
     (inst jmp done)
-    
+
     POSITIVE
     ;; The result-type ensures us that this shift will not overflow.
     (inst shl result :cl)
@@ -1002,9 +1002,9 @@
 
 (define-vop (fast-conditional/fixnum fast-conditional)
   (:args (x :scs (any-reg)
-	    :load-if (not (and (sc-is x control-stack)
-			       (sc-is y any-reg))))
-	 (y :scs (any-reg control-stack)))
+            :load-if (not (and (sc-is x control-stack)
+                               (sc-is y any-reg))))
+         (y :scs (any-reg control-stack)))
   (:arg-types tagged-num tagged-num)
   (:note "inline fixnum comparison"))
 
@@ -1015,9 +1015,9 @@
 
 (define-vop (fast-conditional/signed fast-conditional)
   (:args (x :scs (signed-reg)
-	    :load-if (not (and (sc-is x signed-stack)
-			       (sc-is y signed-reg))))
-	 (y :scs (signed-reg signed-stack)))
+            :load-if (not (and (sc-is x signed-stack)
+                               (sc-is y signed-reg))))
+         (y :scs (signed-reg signed-stack)))
   (:arg-types signed-num signed-num)
   (:note "inline (signed-byte 32) comparison"))
 
@@ -1028,9 +1028,9 @@
 
 (define-vop (fast-conditional/unsigned fast-conditional)
   (:args (x :scs (unsigned-reg)
-	    :load-if (not (and (sc-is x unsigned-stack)
-			       (sc-is y unsigned-reg))))
-	 (y :scs (unsigned-reg unsigned-stack)))
+            :load-if (not (and (sc-is x unsigned-stack)
+                               (sc-is y unsigned-reg))))
+         (y :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num)
   (:note "inline (unsigned-byte 32) comparison"))
 
@@ -1041,33 +1041,33 @@
 
 
 (macrolet ((define-conditional-vop (tran cond unsigned not-cond not-unsigned)
-	     `(progn
-		,@(mapcar
-		   (lambda (suffix cost signed)
-		     `(define-vop (;; FIXME: These could be done more
-				   ;; cleanly with SYMBOLICATE.
-				   ,(intern (format nil "~:@(FAST-IF-~A~A~)"
-						    tran suffix))
-				   ,(intern
-				     (format nil "~:@(FAST-CONDITIONAL~A~)"
-					     suffix)))
-			(:translate ,tran)
-			(:generator ,cost
-				    (inst cmp x
-					  ,(if (eq suffix '-c/fixnum)
-					       '(fixnumize y)
-					       'y))
-				    (inst jmp (if not-p
-						  ,(if signed
-						       not-cond
-						       not-unsigned)
-						  ,(if signed
-						       cond
-						       unsigned))
-					  target))))
-		   '(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
-		   '(4 3 6 5 6 5)
-		   '(t t t t nil nil)))))
+             `(progn
+                ,@(mapcar
+                   (lambda (suffix cost signed)
+                     `(define-vop (;; FIXME: These could be done more
+                                   ;; cleanly with SYMBOLICATE.
+                                   ,(intern (format nil "~:@(FAST-IF-~A~A~)"
+                                                    tran suffix))
+                                   ,(intern
+                                     (format nil "~:@(FAST-CONDITIONAL~A~)"
+                                             suffix)))
+                        (:translate ,tran)
+                        (:generator ,cost
+                                    (inst cmp x
+                                          ,(if (eq suffix '-c/fixnum)
+                                               '(fixnumize y)
+                                               'y))
+                                    (inst jmp (if not-p
+                                                  ,(if signed
+                                                       not-cond
+                                                       not-unsigned)
+                                                  ,(if signed
+                                                       cond
+                                                       unsigned))
+                                          target))))
+                   '(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
+                   '(4 3 6 5 6 5)
+                   '(t t t t nil nil)))))
 
   (define-conditional-vop < :l :b :ge :ae)
   (define-conditional-vop > :g :a :le :be))
@@ -1082,9 +1082,9 @@
   (:translate eql)
   (:generator 5
     (cond ((and (sc-is x signed-reg) (zerop y))
-	   (inst test x x))  ; smaller instruction
-	  (t
-	   (inst cmp x y)))
+           (inst test x x))  ; smaller instruction
+          (t
+           (inst cmp x y)))
     (inst jmp (if not-p :ne :e) target)))
 
 (define-vop (fast-if-eql/unsigned fast-conditional/unsigned)
@@ -1097,9 +1097,9 @@
   (:translate eql)
   (:generator 5
     (cond ((and (sc-is x unsigned-reg) (zerop y))
-	   (inst test x x))  ; smaller instruction
-	  (t
-	   (inst cmp x y)))
+           (inst test x x))  ; smaller instruction
+          (t
+           (inst cmp x y)))
     (inst jmp (if not-p :ne :e) target)))
 
 ;;; EQL/FIXNUM is funny because the first arg can be of any type, not just a
@@ -1113,9 +1113,9 @@
 
 (define-vop (fast-eql/fixnum fast-conditional)
   (:args (x :scs (any-reg)
-	    :load-if (not (and (sc-is x control-stack)
-			       (sc-is y any-reg))))
-	 (y :scs (any-reg control-stack)))
+            :load-if (not (and (sc-is x control-stack)
+                               (sc-is y any-reg))))
+         (y :scs (any-reg control-stack)))
   (:arg-types tagged-num tagged-num)
   (:note "inline fixnum comparison")
   (:translate eql)
@@ -1124,9 +1124,9 @@
     (inst jmp (if not-p :ne :e) target)))
 (define-vop (generic-eql/fixnum fast-eql/fixnum)
   (:args (x :scs (any-reg descriptor-reg)
-	    :load-if (not (and (sc-is x control-stack)
-			       (sc-is y any-reg))))
-	 (y :scs (any-reg control-stack)))
+            :load-if (not (and (sc-is x control-stack)
+                               (sc-is y any-reg))))
+         (y :scs (any-reg control-stack)))
   (:arg-types * tagged-num)
   (:variant-cost 7))
 
@@ -1137,9 +1137,9 @@
   (:translate eql)
   (:generator 2
     (cond ((and (sc-is x any-reg) (zerop y))
-	   (inst test x x))  ; smaller instruction
-	  (t
-	   (inst cmp x (fixnumize y))))
+           (inst test x x))  ; smaller instruction
+          (t
+           (inst cmp x (fixnumize y))))
     (inst jmp (if not-p :ne :e) target)))
 (define-vop (generic-eql-c/fixnum fast-eql-c/fixnum)
   (:args (x :scs (any-reg descriptor-reg control-stack)))
@@ -1151,8 +1151,8 @@
 (define-vop (merge-bits)
   (:translate merge-bits)
   (:args (shift :scs (signed-reg unsigned-reg) :target ecx)
-	 (prev :scs (unsigned-reg) :target result)
-	 (next :scs (unsigned-reg)))
+         (prev :scs (unsigned-reg) :target result)
+         (next :scs (unsigned-reg)))
   (:arg-types tagged-num unsigned-num unsigned-num)
   (:temporary (:sc signed-reg :offset ecx-offset :from (:argument 0)) ecx)
   (:results (result :scs (unsigned-reg) :from (:argument 1)))
@@ -1167,7 +1167,7 @@
 (define-vop (shift-towards-someplace)
   (:policy :fast-safe)
   (:args (num :scs (unsigned-reg) :target r)
-	 (amount :scs (signed-reg) :target ecx))
+         (amount :scs (signed-reg) :target ecx))
   (:arg-types unsigned-num tagged-num)
   (:temporary (:sc signed-reg :offset ecx-offset :from (:argument 1)) ecx)
   (:results (r :scs (unsigned-reg) :from (:argument 0)))
@@ -1190,6 +1190,46 @@
     (inst shl r :cl)))
 
 ;;;; Modular functions
+(defmacro define-mod-binop ((name prototype) function)
+  `(define-vop (,name ,prototype)
+       (:args (x :target r :scs (unsigned-reg signed-reg)
+                 :load-if (not (and (or (sc-is x unsigned-stack)
+                                        (sc-is x signed-stack))
+                                    (or (sc-is y unsigned-reg)
+                                        (sc-is y signed-reg))
+                                    (or (sc-is r unsigned-stack)
+                                        (sc-is r signed-stack))
+                                    (location= x r))))
+              (y :scs (unsigned-reg signed-reg unsigned-stack signed-stack)))
+     (:arg-types untagged-num untagged-num)
+     (:results (r :scs (unsigned-reg signed-reg) :from (:argument 0)
+                  :load-if (not (and (or (sc-is x unsigned-stack)
+                                         (sc-is x signed-stack))
+                                     (or (sc-is y unsigned-reg)
+                                         (sc-is y unsigned-reg))
+                                     (or (sc-is r unsigned-stack)
+                                         (sc-is r unsigned-stack))
+                                     (location= x r)))))
+     (:result-types unsigned-num)
+     (:translate ,function)))
+(defmacro define-mod-binop-c ((name prototype) function)
+  `(define-vop (,name ,prototype)
+       (:args (x :target r :scs (unsigned-reg signed-reg)
+                 :load-if (not (and (or (sc-is x unsigned-stack)
+                                        (sc-is x signed-stack))
+                                    (or (sc-is r unsigned-stack)
+                                        (sc-is r signed-stack))
+                                    (location= x r)))))
+     (:info y)
+     (:arg-types untagged-num (:constant (or (unsigned-byte 32) (signed-byte 32))))
+     (:results (r :scs (unsigned-reg signed-reg) :from (:argument 0)
+                  :load-if (not (and (or (sc-is x unsigned-stack)
+                                         (sc-is x signed-stack))
+                                     (or (sc-is r unsigned-stack)
+                                         (sc-is r unsigned-stack))
+                                     (location= x r)))))
+     (:result-types unsigned-num)
+     (:translate ,function)))
 
 (macrolet ((def (name -c-p)
              (let ((fun32 (intern (format nil "~S-MOD32" name)))
@@ -1197,9 +1237,9 @@
                    (vopcu (intern (format nil "FAST-~S-C/UNSIGNED=>UNSIGNED" name)))
                    (vopf (intern (format nil "FAST-~S/FIXNUM=>FIXNUM" name)))
                    (vopcf (intern (format nil "FAST-~S-C/FIXNUM=>FIXNUM" name)))
-                   (vop32u (intern (format nil "FAST-~S-MOD32/UNSIGNED=>UNSIGNED" name)))
+                   (vop32u (intern (format nil "FAST-~S-MOD32/WORD=>UNSIGNED" name)))
                    (vop32f (intern (format nil "FAST-~S-MOD32/FIXNUM=>FIXNUM" name)))
-                   (vop32cu (intern (format nil "FAST-~S-MOD32-C/UNSIGNED=>UNSIGNED" name)))
+                   (vop32cu (intern (format nil "FAST-~S-MOD32-C/WORD=>UNSIGNED" name)))
                    (vop32cf (intern (format nil "FAST-~S-MOD32-C/FIXNUM=>FIXNUM" name)))
                    (sfun30 (intern (format nil "~S-SMOD30" name)))
                    (svop30f (intern (format nil "FAST-~S-SMOD30/FIXNUM=>FIXNUM" name)))
@@ -1207,11 +1247,11 @@
                `(progn
                   (define-modular-fun ,fun32 (x y) ,name :unsigned 32)
                   (define-modular-fun ,sfun30 (x y) ,name :signed 30)
-                  (define-vop (,vop32u ,vopu) (:translate ,fun32))
+                  (define-mod-binop (,vop32u ,vopu) ,fun32)
                   (define-vop (,vop32f ,vopf) (:translate ,fun32))
                   (define-vop (,svop30f ,vopf) (:translate ,sfun30))
                   ,@(when -c-p
-                      `((define-vop (,vop32cu ,vopcu) (:translate ,fun32))
+                      `((define-mod-binop-c (,vop32cu ,vopcu) ,fun32)
                         (define-vop (,svop30cf ,vopcf) (:translate ,sfun30))))))))
   (def + t)
   (def - t)
@@ -1226,7 +1266,7 @@
 (define-vop (fast-ash-left-mod32/unsigned=>unsigned
              fast-ash-left/unsigned=>unsigned))
 (deftransform ash-left-mod32 ((integer count)
-			      ((unsigned-byte 32) (unsigned-byte 5)))
+                              ((unsigned-byte 32) (unsigned-byte 5)))
   (when (sb!c::constant-lvar-p count)
     (sb!c::give-up-ir1-transform))
   '(%primitive fast-ash-left-mod32/unsigned=>unsigned integer count))
@@ -1254,15 +1294,15 @@
 
 (define-modular-fun-optimizer %lea ((base index scale disp) :unsigned :width width)
   (when (and (<= width 32)
-	     (constant-lvar-p scale)
-	     (constant-lvar-p disp))
+             (constant-lvar-p scale)
+             (constant-lvar-p disp))
     (cut-to-width base :unsigned width)
     (cut-to-width index :unsigned width)
     'sb!vm::%lea-mod32))
 (define-modular-fun-optimizer %lea ((base index scale disp) :signed :width width)
   (when (and (<= width 30)
-	     (constant-lvar-p scale)
-	     (constant-lvar-p disp))
+             (constant-lvar-p scale)
+             (constant-lvar-p disp))
     (cut-to-width base :signed width)
     (cut-to-width index :signed width)
     'sb!vm::%lea-smod30))
@@ -1291,25 +1331,30 @@
 (in-package "SB!VM")
 
 (define-vop (%lea-mod32/unsigned=>unsigned
-	     %lea/unsigned=>unsigned)
+             %lea/unsigned=>unsigned)
   (:translate %lea-mod32))
 (define-vop (%lea-smod30/fixnum=>fixnum
-	     %lea/fixnum=>fixnum)
+             %lea/fixnum=>fixnum)
   (:translate %lea-smod30))
 
 ;;; logical operations
 (define-modular-fun lognot-mod32 (x) lognot :unsigned 32)
-(define-vop (lognot-mod32/unsigned=>unsigned)
+(define-vop (lognot-mod32/word=>unsigned)
   (:translate lognot-mod32)
-  (:args (x :scs (unsigned-reg unsigned-stack) :target r
-	    :load-if (not (and (sc-is x unsigned-stack)
-			       (sc-is r unsigned-stack)
-			       (location= x r)))))
+  (:args (x :scs (unsigned-reg signed-reg unsigned-stack signed-stack) :target r
+            :load-if (not (and (or (sc-is x unsigned-stack)
+                                   (sc-is x signed-stack))
+                               (or (sc-is r unsigned-stack)
+                                   (sc-is r signed-stack))
+                               (location= x r)))))
   (:arg-types unsigned-num)
   (:results (r :scs (unsigned-reg)
-	       :load-if (not (and (sc-is x unsigned-stack)
-				  (sc-is r unsigned-stack)
-				  (location= x r)))))
+               :load-if (not (and (or (sc-is x unsigned-stack)
+                                      (sc-is x signed-stack))
+                                  (or (sc-is r unsigned-stack)
+                                      (sc-is r signed-stack))
+                                  (sc-is r unsigned-stack)
+                                  (location= x r)))))
   (:result-types unsigned-num)
   (:policy :fast-safe)
   (:generator 1
@@ -1317,12 +1362,12 @@
     (inst not r)))
 
 (define-modular-fun logxor-mod32 (x y) logxor :unsigned 32)
-(define-vop (fast-logxor-mod32/unsigned=>unsigned
-             fast-logxor/unsigned=>unsigned)
-  (:translate logxor-mod32))
-(define-vop (fast-logxor-mod32-c/unsigned=>unsigned
-             fast-logxor-c/unsigned=>unsigned)
-  (:translate logxor-mod32))
+(define-mod-binop (fast-logxor-mod32/word=>unsigned
+                   fast-logxor/unsigned=>unsigned)
+    logxor-mod32)
+(define-mod-binop-c (fast-logxor-mod32-c/word=>unsigned
+                     fast-logxor-c/unsigned=>unsigned)
+    logxor-mod32)
 (define-vop (fast-logxor-mod32/fixnum=>fixnum
              fast-logxor/fixnum=>fixnum)
   (:translate logxor-mod32))
@@ -1376,19 +1421,19 @@
 
 
 ;;; For add and sub with carry the sc of carry argument is any-reg so
-;;; the it may be passed as a fixnum or word and thus may be 0, 1, or
+;;; that it may be passed as a fixnum or word and thus may be 0, 1, or
 ;;; 4. This is easy to deal with and may save a fixnum-word
 ;;; conversion.
 (define-vop (add-w/carry)
   (:translate sb!bignum:%add-with-carry)
   (:policy :fast-safe)
   (:args (a :scs (unsigned-reg) :target result)
-	 (b :scs (unsigned-reg unsigned-stack) :to :eval)
-	 (c :scs (any-reg) :target temp))
+         (b :scs (unsigned-reg unsigned-stack) :to :eval)
+         (c :scs (any-reg) :target temp))
   (:arg-types unsigned-num unsigned-num positive-fixnum)
   (:temporary (:sc any-reg :from (:argument 2) :to :eval) temp)
   (:results (result :scs (unsigned-reg) :from (:argument 0))
-	    (carry :scs (unsigned-reg)))
+            (carry :scs (unsigned-reg)))
   (:result-types unsigned-num positive-fixnum)
   (:generator 4
     (move result a)
@@ -1398,40 +1443,39 @@
     (inst mov carry 0)
     (inst adc carry carry)))
 
-;;; Note: the borrow is the oppostite of the x86 convention - 1 for no
-;;; borrow and 0 for a borrow.
+;;; Note: the borrow is 1 for no borrow and 0 for a borrow, the opposite
+;;; of the x86 convention.
 (define-vop (sub-w/borrow)
   (:translate sb!bignum:%subtract-with-borrow)
   (:policy :fast-safe)
   (:args (a :scs (unsigned-reg) :to :eval :target result)
-	 (b :scs (unsigned-reg unsigned-stack) :to :result)
-	 (c :scs (any-reg control-stack)))
+         (b :scs (unsigned-reg unsigned-stack) :to :result)
+         (c :scs (any-reg control-stack)))
   (:arg-types unsigned-num unsigned-num positive-fixnum)
   (:results (result :scs (unsigned-reg) :from :eval)
-	    (borrow :scs (unsigned-reg)))
+            (borrow :scs (unsigned-reg)))
   (:result-types unsigned-num positive-fixnum)
   (:generator 5
     (inst cmp c 1) ; Set the carry flag to 1 if c=0 else to 0
     (move result a)
     (inst sbb result b)
-    (inst mov borrow 0)
-    (inst adc borrow borrow)
-    (inst xor borrow 1)))
+    (inst mov borrow 1)
+    (inst sbb borrow 0)))
 
 
 (define-vop (bignum-mult-and-add-3-arg)
   (:translate sb!bignum:%multiply-and-add)
   (:policy :fast-safe)
   (:args (x :scs (unsigned-reg) :target eax)
-	 (y :scs (unsigned-reg unsigned-stack))
-	 (carry-in :scs (unsigned-reg unsigned-stack)))
+         (y :scs (unsigned-reg unsigned-stack))
+         (carry-in :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num unsigned-num)
   (:temporary (:sc unsigned-reg :offset eax-offset :from (:argument 0)
-		   :to (:result 1) :target lo) eax)
+                   :to (:result 1) :target lo) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :from (:argument 1)
-		   :to (:result 0) :target hi) edx)
+                   :to (:result 0) :target hi) edx)
   (:results (hi :scs (unsigned-reg))
-	    (lo :scs (unsigned-reg)))
+            (lo :scs (unsigned-reg)))
   (:result-types unsigned-num unsigned-num)
   (:generator 20
     (move eax x)
@@ -1445,16 +1489,16 @@
   (:translate sb!bignum:%multiply-and-add)
   (:policy :fast-safe)
   (:args (x :scs (unsigned-reg) :target eax)
-	 (y :scs (unsigned-reg unsigned-stack))
-	 (prev :scs (unsigned-reg unsigned-stack))
-	 (carry-in :scs (unsigned-reg unsigned-stack)))
+         (y :scs (unsigned-reg unsigned-stack))
+         (prev :scs (unsigned-reg unsigned-stack))
+         (carry-in :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num unsigned-num unsigned-num)
   (:temporary (:sc unsigned-reg :offset eax-offset :from (:argument 0)
-		   :to (:result 1) :target lo) eax)
+                   :to (:result 1) :target lo) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :from (:argument 1)
-		   :to (:result 0) :target hi) edx)
+                   :to (:result 0) :target hi) edx)
   (:results (hi :scs (unsigned-reg))
-	    (lo :scs (unsigned-reg)))
+            (lo :scs (unsigned-reg)))
   (:result-types unsigned-num unsigned-num)
   (:generator 20
     (move eax x)
@@ -1471,14 +1515,14 @@
   (:translate sb!bignum:%multiply)
   (:policy :fast-safe)
   (:args (x :scs (unsigned-reg) :target eax)
-	 (y :scs (unsigned-reg unsigned-stack)))
+         (y :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num)
   (:temporary (:sc unsigned-reg :offset eax-offset :from (:argument 0)
-		   :to (:result 1) :target lo) eax)
+                   :to (:result 1) :target lo) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :from (:argument 1)
-		   :to (:result 0) :target hi) edx)
+                   :to (:result 0) :target hi) edx)
   (:results (hi :scs (unsigned-reg))
-	    (lo :scs (unsigned-reg)))
+            (lo :scs (unsigned-reg)))
   (:result-types unsigned-num unsigned-num)
   (:generator 20
     (move eax x)
@@ -1486,7 +1530,7 @@
     (move hi edx)
     (move lo eax)))
 
-(define-vop (bignum-lognot lognot-mod32/unsigned=>unsigned)
+(define-vop (bignum-lognot lognot-mod32/word=>unsigned)
   (:translate sb!bignum:%lognot))
 
 (define-vop (fixnum-to-digit)
@@ -1495,9 +1539,9 @@
   (:args (fixnum :scs (any-reg control-stack) :target digit))
   (:arg-types tagged-num)
   (:results (digit :scs (unsigned-reg)
-		   :load-if (not (and (sc-is fixnum control-stack)
-				      (sc-is digit unsigned-stack)
-				      (location= fixnum digit)))))
+                   :load-if (not (and (sc-is fixnum control-stack)
+                                      (sc-is digit unsigned-stack)
+                                      (location= fixnum digit)))))
   (:result-types unsigned-num)
   (:generator 1
     (move digit fixnum)
@@ -1507,15 +1551,15 @@
   (:translate sb!bignum:%floor)
   (:policy :fast-safe)
   (:args (div-high :scs (unsigned-reg) :target edx)
-	 (div-low :scs (unsigned-reg) :target eax)
-	 (divisor :scs (unsigned-reg unsigned-stack)))
+         (div-low :scs (unsigned-reg) :target eax)
+         (divisor :scs (unsigned-reg unsigned-stack)))
   (:arg-types unsigned-num unsigned-num unsigned-num)
   (:temporary (:sc unsigned-reg :offset eax-offset :from (:argument 1)
-		   :to (:result 0) :target quo) eax)
+                   :to (:result 0) :target quo) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :from (:argument 0)
-		   :to (:result 1) :target rem) edx)
+                   :to (:result 1) :target rem) edx)
   (:results (quo :scs (unsigned-reg))
-	    (rem :scs (unsigned-reg)))
+            (rem :scs (unsigned-reg)))
   (:result-types unsigned-num unsigned-num)
   (:generator 300
     (move edx div-high)
@@ -1530,9 +1574,9 @@
   (:args (digit :scs (unsigned-reg unsigned-stack) :target res))
   (:arg-types unsigned-num)
   (:results (res :scs (any-reg signed-reg)
-		 :load-if (not (and (sc-is digit unsigned-stack)
-				    (sc-is res control-stack signed-stack)
-				    (location= digit res)))))
+                 :load-if (not (and (sc-is digit unsigned-stack)
+                                    (sc-is res control-stack signed-stack)
+                                    (location= digit res)))))
   (:result-types signed-num)
   (:generator 1
     (move res digit)
@@ -1543,12 +1587,12 @@
   (:translate sb!bignum:%ashr)
   (:policy :fast-safe)
   (:args (digit :scs (unsigned-reg unsigned-stack) :target result)
-	 (count :scs (unsigned-reg) :target ecx))
+         (count :scs (unsigned-reg) :target ecx))
   (:arg-types unsigned-num positive-fixnum)
   (:temporary (:sc unsigned-reg :offset ecx-offset :from (:argument 1)) ecx)
   (:results (result :scs (unsigned-reg) :from (:argument 0)
-		    :load-if (not (and (sc-is result unsigned-stack)
-				       (location= digit result)))))
+                    :load-if (not (and (sc-is result unsigned-stack)
+                                       (location= digit result)))))
   (:result-types unsigned-num)
   (:generator 1
     (move result digit)
@@ -1602,41 +1646,41 @@
   (:arg-types simple-array-unsigned-byte-32)
   (:temporary (:sc unsigned-reg :from (:eval 0) :to :result) k)
   (:temporary (:sc unsigned-reg :offset eax-offset
-		   :from (:eval 0) :to :result) tmp)
+                   :from (:eval 0) :to :result) tmp)
   (:results (y :scs (unsigned-reg) :from (:eval 0)))
   (:result-types unsigned-num)
   (:generator 50
     (inst mov k (make-ea :dword :base state
-			 :disp (- (* (+ 2 vector-data-offset)
-				     n-word-bytes)
-				  other-pointer-lowtag)))
+                         :disp (- (* (+ 2 vector-data-offset)
+                                     n-word-bytes)
+                                  other-pointer-lowtag)))
     (inst cmp k 624)
     (inst jmp :ne no-update)
-    (inst mov tmp state)	; The state is passed in EAX.
+    (inst mov tmp state)        ; The state is passed in EAX.
     (inst call (make-fixup 'random-mt19937-update :assembly-routine))
     ;; Restore k, and set to 0.
     (inst xor k k)
     NO-UPDATE
     ;; y = ptgfsr[k++];
     (inst mov y (make-ea :dword :base state :index k :scale 4
-			 :disp (- (* (+ 3 vector-data-offset)
-				     n-word-bytes)
-				  other-pointer-lowtag)))
+                         :disp (- (* (+ 3 vector-data-offset)
+                                     n-word-bytes)
+                                  other-pointer-lowtag)))
     ;; y ^= (y >> 11);
     (inst shr y 11)
     (inst xor y (make-ea :dword :base state :index k :scale 4
-			 :disp (- (* (+ 3 vector-data-offset)
-				     n-word-bytes)
-				  other-pointer-lowtag)))
+                         :disp (- (* (+ 3 vector-data-offset)
+                                     n-word-bytes)
+                                  other-pointer-lowtag)))
     ;; y ^= (y << 7) & #x9d2c5680
     (inst mov tmp y)
     (inst inc k)
     (inst shl tmp 7)
     (inst mov (make-ea :dword :base state
-		       :disp (- (* (+ 2 vector-data-offset)
-				   n-word-bytes)
-				other-pointer-lowtag))
-	  k)
+                       :disp (- (* (+ 2 vector-data-offset)
+                                   n-word-bytes)
+                                other-pointer-lowtag))
+          k)
     (inst and tmp #x9d2c5680)
     (inst xor y tmp)
     ;; y ^= (y << 15) & #xefc60000
@@ -1680,8 +1724,8 @@
                            ,arg
                            ,(ash 1 r0) 0))))
     (t (let ((r0 (aref condensed 0)))
-	 (setf (aref condensed 0) 0)
-	 (mask-result class width
+         (setf (aref condensed 0) 0)
+         (mask-result class width
                       `(ash ,(decompose-multiplication class width
                               arg (ash num (- r0)) n-bits condensed)
                             ,r0))))))
@@ -1694,41 +1738,41 @@
      (mask-result class width `(ash ,arg ,(1- (integer-length num)))))
     ((let ((max 0) (end 0))
        (loop for i from 2 to (length condensed)
-	     for j = (reduce #'+ (subseq condensed 0 i))
-	     when (and (> (- (* 2 i) 3 j) max)
-		       (< (+ (ash 1 (1+ j))
-			     (ash (ldb (byte (- 32 (1+ j)) (1+ j)) num)
-				  (1+ j)))
-			  (ash 1 32)))
-	       do (setq max (- (* 2 i) 3 j)
-			end i))
+             for j = (reduce #'+ (subseq condensed 0 i))
+             when (and (> (- (* 2 i) 3 j) max)
+                       (< (+ (ash 1 (1+ j))
+                             (ash (ldb (byte (- 32 (1+ j)) (1+ j)) num)
+                                  (1+ j)))
+                          (ash 1 32)))
+               do (setq max (- (* 2 i) 3 j)
+                        end i))
        (when (> max 0)
-	 (let ((j (reduce #'+ (subseq condensed 0 end))))
-	   (let ((n2 (+ (ash 1 (1+ j))
-			(ash (ldb (byte (- 32 (1+ j)) (1+ j)) num) (1+ j))))
-		 (n1 (1+ (ldb (byte (1+ j) 0) (lognot num)))))
-	   (mask-result class width
+         (let ((j (reduce #'+ (subseq condensed 0 end))))
+           (let ((n2 (+ (ash 1 (1+ j))
+                        (ash (ldb (byte (- 32 (1+ j)) (1+ j)) num) (1+ j))))
+                 (n1 (1+ (ldb (byte (1+ j) 0) (lognot num)))))
+           (mask-result class width
                         `(- ,(optimize-multiply class width arg n2)
                             ,(optimize-multiply  class width arg n1))))))))
     ((dolist (i '(9 5 3))
        (when (integerp (/ num i))
-	 (when (< (logcount (/ num i)) (logcount num))
-	   (let ((x (gensym)))
-	     (return `(let ((,x ,(optimize-multiply class width arg (/ num i))))
-		       ,(mask-result class width
+         (when (< (logcount (/ num i)) (logcount num))
+           (let ((x (gensym)))
+             (return `(let ((,x ,(optimize-multiply class width arg (/ num i))))
+                       ,(mask-result class width
                                      `(%lea ,x ,x (1- ,i) 0)))))))))
     (t (basic-decompose-multiplication class width arg num n-bits condensed))))
 
 (defun optimize-multiply (class width arg x)
   (let* ((n-bits (logcount x))
-	 (condensed (make-array n-bits)))
+         (condensed (make-array n-bits)))
     (let ((count 0) (bit 0))
       (dotimes (i 32)
-	(cond ((logbitp i x)
-	       (setf (aref condensed bit) count)
-	       (setf count 1)
-	       (incf bit))
-	      (t (incf count)))))
+        (cond ((logbitp i x)
+               (setf (aref condensed bit) count)
+               (setf count 1)
+               (incf bit))
+              (t (incf count)))))
     (decompose-multiplication class width arg x n-bits condensed)))
 
 (defun *-transformer (class width y)
@@ -1748,8 +1792,8 @@
     (t (optimize-multiply class width 'x y))))
 
 (deftransform * ((x y)
-		 ((unsigned-byte 32) (constant-arg (unsigned-byte 32)))
-		 (unsigned-byte 32))
+                 ((unsigned-byte 32) (constant-arg (unsigned-byte 32)))
+                 (unsigned-byte 32))
   "recode as leas, shifts and adds"
   (let ((y (lvar-value y)))
     (*-transformer :unsigned 32 y)))
@@ -1761,8 +1805,8 @@
     (*-transformer :unsigned 32 y)))
 
 (deftransform * ((x y)
-		 ((signed-byte 30) (constant-arg (unsigned-byte 32)))
-		 (signed-byte 30))
+                 ((signed-byte 30) (constant-arg (unsigned-byte 32)))
+                 (signed-byte 30))
   "recode as leas, shifts and adds"
   (let ((y (lvar-value y)))
     (*-transformer :signed 30 y)))