X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farith.lisp;h=cfe4ad4e5c3167716776159567cadbfa7c96de32;hb=7deecae2d959173eda6a153d490c752c32050a9e;hp=c02e9d7316574e353d2beb99e5187f717c98c1d5;hpb=1907ad030ca773162bcd9ff90fdc485a035591f4;p=sbcl.git

diff --git a/src/compiler/x86-64/arith.lisp b/src/compiler/x86-64/arith.lisp
index c02e9d7..cfe4ad4 100644
--- a/src/compiler/x86-64/arith.lisp
+++ b/src/compiler/x86-64/arith.lisp
@@ -109,31 +109,38 @@
   (:note "inline (signed-byte 64) arithmetic"))
 
 (define-vop (fast-fixnum-binop-c fast-safe-arith-op)
-  (:args (x :target r :scs (any-reg control-stack)))
+  (:args (x :target r :scs (any-reg)
+            :load-if (or (not (typep y '(signed-byte 29)))
+                         (not (sc-is x any-reg control-stack)))))
   (:info y)
-  (:arg-types tagged-num (:constant (signed-byte 29)))
+  (:arg-types tagged-num (:constant fixnum))
   (:results (r :scs (any-reg)
-               :load-if (not (location= x r))))
+               :load-if (or (not (location= x r))
+                            (not (typep y '(signed-byte 29))))))
   (:result-types tagged-num)
   (:note "inline fixnum arithmetic"))
 
-;; 31 not 64 because it's hard work loading 64 bit constants, and since
-;; sign-extension of immediates causes problems with 32.
 (define-vop (fast-unsigned-binop-c fast-safe-arith-op)
-  (:args (x :target r :scs (unsigned-reg unsigned-stack)))
+  (:args (x :target r :scs (unsigned-reg)
+            :load-if (or (not (typep y '(unsigned-byte 31)))
+                         (not (sc-is x unsigned-reg unsigned-stack)))))
   (:info y)
-  (:arg-types unsigned-num (:constant (unsigned-byte 31)))
+  (:arg-types unsigned-num (:constant (unsigned-byte 64)))
   (:results (r :scs (unsigned-reg)
-               :load-if (not (location= x r))))
+               :load-if (or (not (location= x r))
+                            (not (typep y '(unsigned-byte 31))))))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 64) arithmetic"))
 
 (define-vop (fast-signed-binop-c fast-safe-arith-op)
-  (:args (x :target r :scs (signed-reg signed-stack)))
+  (:args (x :target r :scs (signed-reg)
+            :load-if (or (not (typep y '(signed-byte 32)))
+                         (not (sc-is x signed-reg signed-stack)))))
   (:info y)
-  (:arg-types signed-num (:constant (signed-byte 32)))
+  (:arg-types signed-num (:constant (signed-byte 64)))
   (:results (r :scs (signed-reg)
-               :load-if (not (location= x r))))
+               :load-if (or (not (location= x r))
+                            (not (typep y '(signed-byte 32))))))
   (:result-types signed-num)
   (:note "inline (signed-byte 64) arithmetic"))
 
@@ -150,7 +157,9 @@
                   (:translate ,translate)
                   (:generator 1
                   (move r x)
-                  (inst ,op r (fixnumize y))))
+                  (inst ,op r (if (typep y '(signed-byte 29))
+                                  (fixnumize y)
+                                  (register-inline-constant :qword (fixnumize y))))))
                 (define-vop (,(symbolicate "FAST-" translate "/SIGNED=>SIGNED")
                              fast-signed-binop)
                   (:translate ,translate)
@@ -162,7 +171,9 @@
                   (:translate ,translate)
                   (:generator ,untagged-penalty
                   (move r x)
-                  (inst ,op r y)))
+                  (inst ,op r (if (typep y '(signed-byte 32))
+                                  y
+                                  (register-inline-constant :qword y)))))
                 (define-vop (,(symbolicate "FAST-"
                                            translate
                                            "/UNSIGNED=>UNSIGNED")
@@ -178,7 +189,9 @@
                   (:translate ,translate)
                   (:generator ,untagged-penalty
                   (move r x)
-                  (inst ,op r y))))))
+                  (inst ,op r (if (typep y '(unsigned-byte 31))
+                                  y
+                                  (register-inline-constant :qword y))))))))
 
   ;;(define-binop + 4 add)
   (define-binop - 4 sub)
@@ -214,19 +227,26 @@
 
 (define-vop (fast-+-c/fixnum=>fixnum fast-safe-arith-op)
   (:translate +)
-  (:args (x :target r :scs (any-reg control-stack)))
+  (:args (x :target r :scs (any-reg)
+            :load-if (or (not (typep y '(signed-byte 29)))
+                         (not (sc-is x any-reg control-stack)))))
   (:info y)
-  (:arg-types tagged-num (:constant (signed-byte 29)))
+  (:arg-types tagged-num (:constant fixnum))
   (:results (r :scs (any-reg)
-               :load-if (not (location= x r))))
+               :load-if (or (not (location= x r))
+                            (not (typep y '(signed-byte 29))))))
   (: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)))
+    (cond ((and (sc-is x any-reg) (sc-is r any-reg) (not (location= x r))
+                (typep y '(signed-byte 29)))
            (inst lea r (make-ea :qword :base x :disp (fixnumize y))))
+          ((typep y '(signed-byte 29))
+           (move r x)
+           (inst add r (fixnumize y)))
           (t
            (move r x)
-           (inst add r (fixnumize y))))))
+           (inst add r (register-inline-constant :qword (fixnumize y)))))))
 
 (define-vop (fast-+/signed=>signed fast-safe-arith-op)
   (:translate +)
@@ -266,8 +286,10 @@
 
 (define-vop (fast-logand-c/signed-unsigned=>unsigned
              fast-logand-c/unsigned=>unsigned)
-  (:args (x :target r :scs (signed-reg signed-stack)))
-  (:arg-types signed-num (:constant (unsigned-byte 31))))
+  (:args (x :target r :scs (signed-reg)
+            :load-if (or (not (typep y '(unsigned-byte 31)))
+                         (not (sc-is r signed-reg signed-stack)))))
+  (:arg-types signed-num (:constant (unsigned-byte 64))))
 
 (define-vop (fast-logand/unsigned-signed=>unsigned
              fast-logand/unsigned=>unsigned)
@@ -282,22 +304,29 @@
 
 (define-vop (fast-+-c/signed=>signed fast-safe-arith-op)
   (:translate +)
-  (:args (x :target r :scs (signed-reg signed-stack)))
+  (:args (x :target r :scs (signed-reg)
+            :load-if (or (not (typep y '(signed-byte 32)))
+                         (not (sc-is r signed-reg signed-stack)))))
   (:info y)
-  (:arg-types signed-num (:constant (signed-byte 32)))
+  (:arg-types signed-num (:constant (signed-byte 64)))
   (:results (r :scs (signed-reg)
-               :load-if (not (location= x r))))
+               :load-if (or (not (location= x r))
+                            (not (typep y '(signed-byte 32))))))
   (:result-types signed-num)
   (:note "inline (signed-byte 64) arithmetic")
   (:generator 4
     (cond ((and (sc-is x signed-reg) (sc-is r signed-reg)
-                (not (location= x r)))
+                (not (location= x r))
+                (typep y '(signed-byte 32)))
            (inst lea r (make-ea :qword :base x :disp y)))
           (t
            (move r x)
-           (if (= y 1)
-               (inst inc r)
-             (inst add r y))))))
+           (cond ((= y 1)
+                  (inst inc r))
+                 ((typep y '(signed-byte 32))
+                  (inst add r y))
+                 (t
+                  (inst add r (register-inline-constant :qword y))))))))
 
 (define-vop (fast-+/unsigned=>unsigned fast-safe-arith-op)
   (:translate +)
@@ -325,22 +354,29 @@
 
 (define-vop (fast-+-c/unsigned=>unsigned fast-safe-arith-op)
   (:translate +)
-  (:args (x :target r :scs (unsigned-reg unsigned-stack)))
+  (:args (x :target r :scs (unsigned-reg)
+            :load-if (or (not (typep y '(unsigned-byte 31)))
+                         (not (sc-is x unsigned-reg unsigned-stack)))))
   (:info y)
-  (:arg-types unsigned-num (:constant (unsigned-byte 31)))
+  (:arg-types unsigned-num (:constant (unsigned-byte 64)))
   (:results (r :scs (unsigned-reg)
-               :load-if (not (location= x r))))
+               :load-if (or (not (location= x r))
+                            (not (typep y '(unsigned-byte 31))))))
   (:result-types unsigned-num)
   (:note "inline (unsigned-byte 64) arithmetic")
   (:generator 4
     (cond ((and (sc-is x unsigned-reg) (sc-is r unsigned-reg)
-                (not (location= x r)))
+                (not (location= x r))
+                (typep y '(unsigned-byte 31)))
            (inst lea r (make-ea :qword :base x :disp y)))
           (t
            (move r x)
-           (if (= y 1)
-               (inst inc r)
-             (inst add r y))))))
+           (cond ((= y 1)
+                  (inst inc r))
+                 ((typep y '(unsigned-byte 31))
+                  (inst add r y))
+                 (t
+                  (inst add r (register-inline-constant :qword y))))))))
 
 ;;;; multiplication and division
 
@@ -361,14 +397,20 @@
 (define-vop (fast-*-c/fixnum=>fixnum fast-safe-arith-op)
   (:translate *)
   ;; We need different loading characteristics.
-  (:args (x :scs (any-reg control-stack)))
+  (:args (x :scs (any-reg)
+            :load-if (or (not (typep y '(signed-byte 32)))
+                         (not (sc-is x any-reg control-stack)))))
   (:info y)
-  (:arg-types tagged-num (:constant (signed-byte 29)))
+  (:arg-types tagged-num (:constant fixnum))
   (:results (r :scs (any-reg)))
   (:result-types tagged-num)
   (:note "inline fixnum arithmetic")
   (:generator 3
-    (inst imul r x y)))
+    (cond ((typep y '(signed-byte 32))
+           (inst imul r x y))
+          (t
+           (move r x)
+           (inst imul r (register-inline-constant :qword y))))))
 
 (define-vop (fast-*/signed=>signed fast-safe-arith-op)
   (:translate *)
@@ -386,14 +428,20 @@
 (define-vop (fast-*-c/signed=>signed fast-safe-arith-op)
   (:translate *)
   ;; We need different loading characteristics.
-  (:args (x :scs (signed-reg signed-stack)))
+  (:args (x :scs (signed-reg)
+            :load-if (or (not (typep y '(signed-byte 32)))
+                         (not (sc-is x signed-reg signed-stack)))))
   (:info y)
-  (:arg-types signed-num (:constant (signed-byte 32)))
+  (:arg-types signed-num (:constant (signed-byte 64)))
   (:results (r :scs (signed-reg)))
   (:result-types signed-num)
   (:note "inline (signed-byte 64) arithmetic")
   (:generator 4
-    (inst imul r x y)))
+    (cond ((typep y '(signed-byte 32))
+           (inst imul r x y))
+          (t
+           (move r x)
+           (inst imul r (register-inline-constant :qword y))))))
 
 (define-vop (fast-*/unsigned=>unsigned fast-safe-arith-op)
   (:translate *)
@@ -415,6 +463,26 @@
     (inst mul eax y)
     (move r eax)))
 
+(define-vop (fast-*-c/unsigned=>unsigned fast-safe-arith-op)
+  (:translate *)
+  (:args (x :scs (unsigned-reg) :target eax))
+  (:info y)
+  (:arg-types unsigned-num (:constant (unsigned-byte 64)))
+  (: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)
+  (:ignore edx)
+  (:results (r :scs (unsigned-reg)))
+  (:result-types unsigned-num)
+  (:note "inline (unsigned-byte 64) arithmetic")
+  (:vop-var vop)
+  (:save-p :compute-only)
+  (:generator 6
+    (move eax x)
+    (inst mul eax (register-inline-constant :qword y))
+    (move r eax)))
+
 
 (define-vop (fast-truncate/fixnum=>fixnum fast-safe-arith-op)
   (:translate truncate)
@@ -432,7 +500,7 @@
   (:vop-var vop)
   (:save-p :compute-only)
   (:generator 31
-    (let ((zero (generate-error-code vop division-by-zero-error x y)))
+    (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))
@@ -441,15 +509,16 @@
     (inst cqo)
     (inst idiv eax y)
     (if (location= quo eax)
-        (inst shl eax 3)
-        (inst lea quo (make-ea :qword :index eax :scale 8)))
+        (inst shl eax n-fixnum-tag-bits)
+        (inst lea quo (make-ea :qword :index eax
+                               :scale (ash 1 n-fixnum-tag-bits))))
     (move rem edx)))
 
 (define-vop (fast-truncate-c/fixnum=>fixnum fast-safe-arith-op)
   (:translate truncate)
   (:args (x :scs (any-reg) :target eax))
   (:info y)
-  (:arg-types tagged-num (:constant (signed-byte 29)))
+  (:arg-types tagged-num (:constant fixnum))
   (:temporary (:sc signed-reg :offset eax-offset :target quo
                    :from :argument :to (:result 0)) eax)
   (:temporary (:sc any-reg :offset edx-offset :target rem
@@ -464,11 +533,14 @@
   (:generator 30
     (move eax x)
     (inst cqo)
-    (inst mov y-arg (fixnumize y))
+    (if (typep y '(signed-byte 29))
+        (inst mov y-arg (fixnumize y))
+        (setf y-arg (register-inline-constant :qword (fixnumize y))))
     (inst idiv eax y-arg)
     (if (location= quo eax)
-        (inst shl eax 3)
-        (inst lea quo (make-ea :qword :index eax :scale 8)))
+        (inst shl eax n-fixnum-tag-bits)
+        (inst lea quo (make-ea :qword :index eax
+                               :scale (ash 1 n-fixnum-tag-bits))))
     (move rem edx)))
 
 (define-vop (fast-truncate/unsigned=>unsigned fast-safe-arith-op)
@@ -487,7 +559,7 @@
   (:vop-var vop)
   (:save-p :compute-only)
   (:generator 33
-    (let ((zero (generate-error-code vop division-by-zero-error x y)))
+    (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))
@@ -502,7 +574,7 @@
   (:translate truncate)
   (:args (x :scs (unsigned-reg) :target eax))
   (:info y)
-  (:arg-types unsigned-num (:constant (unsigned-byte 31)))
+  (:arg-types unsigned-num (:constant (unsigned-byte 64)))
   (:temporary (:sc unsigned-reg :offset eax-offset :target quo
                    :from :argument :to (:result 0)) eax)
   (:temporary (:sc unsigned-reg :offset edx-offset :target rem
@@ -517,7 +589,9 @@
   (:generator 32
     (move eax x)
     (inst xor edx edx)
-    (inst mov y-arg y)
+    (if (typep y '(unsigned-byte 31))
+        (inst mov y-arg y)
+        (setf y-arg (register-inline-constant :qword y)))
     (inst div eax y-arg)
     (move quo eax)
     (move rem edx)))
@@ -538,7 +612,7 @@
   (:vop-var vop)
   (:save-p :compute-only)
   (:generator 33
-    (let ((zero (generate-error-code vop division-by-zero-error x y)))
+    (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))
@@ -553,7 +627,7 @@
   (:translate truncate)
   (:args (x :scs (signed-reg) :target eax))
   (:info y)
-  (:arg-types signed-num (:constant (signed-byte 32)))
+  (:arg-types signed-num (:constant (signed-byte 64)))
   (:temporary (:sc signed-reg :offset eax-offset :target quo
                    :from :argument :to (:result 0)) eax)
   (:temporary (:sc signed-reg :offset edx-offset :target rem
@@ -568,7 +642,9 @@
   (:generator 32
     (move eax x)
     (inst cqo)
-    (inst mov y-arg y)
+    (if (typep y '(signed-byte 32))
+        (inst mov y-arg y)
+        (setf y-arg (register-inline-constant :qword y)))
     (inst idiv eax y-arg)
     (move quo eax)
     (move rem edx)))
@@ -919,7 +995,9 @@
   (:result-types unsigned-num)
   (:generator 28
     (move res arg)
-    (inst cmp res 0)
+    (if (sc-is res unsigned-reg)
+        (inst test res res)
+        (inst cmp res 0))
     (inst jmp :ge POS)
     (inst not res)
     POS
@@ -1006,8 +1084,8 @@
 ;;;; binary conditional VOPs
 
 (define-vop (fast-conditional)
-  (:conditional)
-  (:info target not-p)
+  (:conditional :e)
+  (:info)
   (:effects)
   (:affected)
   (:policy :fast-safe))
@@ -1024,9 +1102,11 @@
   (:note "inline fixnum comparison"))
 
 (define-vop (fast-conditional-c/fixnum fast-conditional/fixnum)
-  (:args (x :scs (any-reg control-stack)))
-  (:arg-types tagged-num (:constant (signed-byte 29)))
-  (:info target not-p y))
+  (:args (x :scs (any-reg)
+            :load-if (or (not (typep y '(signed-byte 29)))
+                         (not (sc-is x any-reg control-stack)))))
+  (:arg-types tagged-num (:constant fixnum))
+  (:info y))
 
 (define-vop (fast-conditional/signed fast-conditional)
   (:args (x :scs (signed-reg)
@@ -1037,9 +1117,11 @@
   (:note "inline (signed-byte 64) comparison"))
 
 (define-vop (fast-conditional-c/signed fast-conditional/signed)
-  (:args (x :scs (signed-reg signed-stack)))
-  (:arg-types signed-num (:constant (signed-byte 31)))
-  (:info target not-p y))
+  (:args (x :scs (signed-reg)
+            :load-if (or (not (typep y '(signed-byte 32)))
+                         (not (sc-is x signed-reg signed-stack)))))
+  (:arg-types signed-num (:constant (signed-byte 64)))
+  (:info y))
 
 (define-vop (fast-conditional/unsigned fast-conditional)
   (:args (x :scs (unsigned-reg)
@@ -1050,9 +1132,11 @@
   (:note "inline (unsigned-byte 64) comparison"))
 
 (define-vop (fast-conditional-c/unsigned fast-conditional/unsigned)
-  (:args (x :scs (unsigned-reg unsigned-stack)))
-  (:arg-types unsigned-num (:constant (unsigned-byte 31)))
-  (:info target not-p y))
+  (:args (x :scs (unsigned-reg)
+            :load-if (or (not (typep y '(unsigned-byte 31)))
+                         (not (sc-is x unsigned-reg unsigned-stack)))))
+  (:arg-types unsigned-num (:constant (unsigned-byte 64)))
+  (:info y))
 
 (macrolet ((define-conditional-vop (tran cond unsigned not-cond not-unsigned)
              `(progn
@@ -1066,19 +1150,26 @@
                                      (format nil "~:@(FAST-CONDITIONAL~A~)"
                                              suffix)))
                         (:translate ,tran)
+                        (:conditional ,(if signed cond unsigned))
                         (: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))))
+                                          ,(case suffix
+                                             (-c/fixnum
+                                                `(if (typep y '(signed-byte 29))
+                                                     (fixnumize y)
+                                                     (register-inline-constant
+                                                      :qword (fixnumize y))))
+                                             (-c/signed
+                                                `(if (typep y '(signed-byte 32))
+                                                     y
+                                                     (register-inline-constant
+                                                      :qword y)))
+                                             (-c/unsigned
+                                                `(if (typep y '(unsigned-byte 31))
+                                                     y
+                                                     (register-inline-constant
+                                                      :qword y)))
+                                             (t 'y))))))
                    '(/fixnum -c/fixnum /signed -c/signed /unsigned -c/unsigned)
 ;                  '(/fixnum  /signed  /unsigned)
                    '(4 3 6 5 6 5)
@@ -1090,32 +1181,32 @@
 (define-vop (fast-if-eql/signed fast-conditional/signed)
   (:translate eql)
   (:generator 6
-    (inst cmp x y)
-    (inst jmp (if not-p :ne :e) target)))
+    (inst cmp x y)))
 
 (define-vop (fast-if-eql-c/signed fast-conditional-c/signed)
   (:translate eql)
   (:generator 5
     (cond ((and (sc-is x signed-reg) (zerop y))
            (inst test x x))  ; smaller instruction
+          ((typep y '(signed-byte 32))
+           (inst cmp x y))
           (t
-           (inst cmp x y)))
-    (inst jmp (if not-p :ne :e) target)))
+           (inst cmp x (register-inline-constant :qword y))))))
 
 (define-vop (fast-if-eql/unsigned fast-conditional/unsigned)
   (:translate eql)
   (:generator 6
-    (inst cmp x y)
-    (inst jmp (if not-p :ne :e) target)))
+    (inst cmp x y)))
 
 (define-vop (fast-if-eql-c/unsigned fast-conditional-c/unsigned)
   (:translate eql)
   (:generator 5
     (cond ((and (sc-is x unsigned-reg) (zerop y))
            (inst test x x))  ; smaller instruction
+          ((typep y '(unsigned-byte 31))
+           (inst cmp x y))
           (t
-           (inst cmp x y)))
-    (inst jmp (if not-p :ne :e) target)))
+           (inst cmp x (register-inline-constant :qword y))))))
 
 ;;; EQL/FIXNUM is funny because the first arg can be of any type, not just a
 ;;; known fixnum.
@@ -1135,8 +1226,8 @@
   (:note "inline fixnum comparison")
   (:translate eql)
   (:generator 4
-    (inst cmp x y)
-    (inst jmp (if not-p :ne :e) target)))
+    (inst cmp x y)))
+
 (define-vop (generic-eql/fixnum fast-eql/fixnum)
   (:args (x :scs (any-reg descriptor-reg)
             :load-if (not (and (sc-is x control-stack)
@@ -1145,41 +1236,28 @@
   (:arg-types * tagged-num)
   (:variant-cost 7))
 
-
 (define-vop (fast-eql-c/fixnum fast-conditional/fixnum)
-  (:args (x :scs (any-reg control-stack)))
-  (:arg-types tagged-num (:constant (signed-byte 29)))
-  (:info target not-p y)
+  (:args (x :scs (any-reg)
+            :load-if (or (not (typep y '(signed-byte 29)))
+                         (not (sc-is x any-reg descriptor-reg control-stack)))))
+  (:arg-types tagged-num (:constant fixnum))
+  (:info y)
   (:translate eql)
   (:generator 2
-    (cond ((and (sc-is x any-reg) (zerop y))
+    (cond ((and (sc-is x any-reg descriptor-reg) (zerop y))
            (inst test x x))  ; smaller instruction
+          ((typep y '(signed-byte 29))
+           (inst cmp x (fixnumize y)))
           (t
-           (inst cmp x (fixnumize y))))
-    (inst jmp (if not-p :ne :e) target)))
+           (inst cmp x (register-inline-constant :qword (fixnumize y)))))))
 
 (define-vop (generic-eql-c/fixnum fast-eql-c/fixnum)
-  (:args (x :scs (any-reg descriptor-reg control-stack)))
-  (:arg-types * (:constant (signed-byte 29)))
+  (:args (x :scs (any-reg descriptor-reg)))
+  (:arg-types * (:constant fixnum))
   (:variant-cost 6))
 
 ;;;; 32-bit logical operations
 
-(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)))
-  (: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)))
-  (:result-types unsigned-num)
-  (:policy :fast-safe)
-  (:generator 4
-    (move ecx shift)
-    (move result prev)
-    (inst shrd result next :cl)))
-
 ;;; Only the lower 6 bits of the shift amount are significant.
 (define-vop (shift-towards-someplace)
   (:policy :fast-safe)
@@ -1237,9 +1315,10 @@
                                         (sc-is x signed-stack))
                                     (or (sc-is r unsigned-stack)
                                         (sc-is r signed-stack))
-                                    (location= x r)))))
+                                    (location= x r)
+                                    (typep y '(signed-byte 32))))))
      (:info y)
-     (:arg-types untagged-num (:constant (or (unsigned-byte 31) (signed-byte 32))))
+     (:arg-types untagged-num (:constant (or (unsigned-byte 64) (signed-byte 64))))
      (: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))
@@ -1273,8 +1352,7 @@
                         (define-vop (,svop61cf ,vopcf) (:translate ,sfun61))))))))
   (def + t)
   (def - t)
-  ;; (no -C variant as x86 MUL instruction doesn't take an immediate)
-  (def * nil))
+  (def * t))
 
 (define-vop (fast-ash-left-mod64-c/unsigned=>unsigned
              fast-ash-c/unsigned=>unsigned)
@@ -1411,11 +1489,9 @@
   (:policy :fast-safe)
   (:args (digit :scs (unsigned-reg)))
   (:arg-types unsigned-num)
-  (:conditional)
-  (:info target not-p)
+  (:conditional :ns)
   (:generator 3
-    (inst or digit digit)
-    (inst jmp (if not-p :s :ns) target)))
+    (inst or digit digit)))
 
 
 ;;; For add and sub with carry the sc of carry argument is any-reg so