(define-binop logxor 2 xor)
(define-binop logeqv 2 xnor nil t)
+(define-vop (fast-logand/signed-unsigned=>unsigned fast-logand/unsigned=>unsigned)
+ (:args (x :scs (signed-reg) :target r)
+ (y :scs (unsigned-reg) :target r))
+ (:arg-types signed-num unsigned-num)
+ (:translate logand))
+
;;; Special case fixnum + and - that trap on overflow. Useful when we
;;; don't know that the output type is a fixnum.
;; Some special cases where we know we want a left shift. Just do the
;; shift, instead of checking for the sign of the shift.
(macrolet
- ((frob (name sc-type type result-type cost)
+ ((def (name sc-type type result-type cost)
`(define-vop (,name)
(:note "inline ASH")
(:translate ash)
(let ((amount (tn-value amount)))
(aver (>= amount 0))
(inst sll result number amount))))))))
- (frob fast-ash-left/signed=>signed signed-reg signed-num signed-reg 3)
- (frob fast-ash-left/fixnum=>fixnum any-reg tagged-num any-reg 2)
- (frob fast-ash-left/unsigned=>unsigned unsigned-reg unsigned-num unsigned-reg 3))
+ (def fast-ash-left/signed=>signed signed-reg signed-num signed-reg 3)
+ (def fast-ash-left/fixnum=>fixnum any-reg tagged-num any-reg 2)
+ (def fast-ash-left/unsigned=>unsigned unsigned-reg unsigned-num unsigned-reg 3))
\f
(define-vop (signed-byte-32-len)
\f
;;;; Modular functions:
-(define-modular-fun lognot-mod32 (x) lognot 32)
+(define-modular-fun lognot-mod32 (x) lognot :unsigned 32)
(define-vop (lognot-mod32/unsigned=>unsigned)
(:translate lognot-mod32)
(:args (x :scs (unsigned-reg)))
(vop (symbolicate 'fast- fun '/unsigned=>unsigned))
(cvop (symbolicate 'fast- fun '-c/unsigned=>unsigned)))
`(progn
- (define-modular-fun ,mfun-name (x y) ,fun 32)
+ (define-modular-fun ,mfun-name (x y) ,fun :unsigned 32)
(define-vop (,modvop ,vop)
(:translate ,mfun-name))
,@(when constantp
(define-vop (fast-ash-left-mod32-c/unsigned=>unsigned
fast-ash-c/unsigned=>unsigned)
(:translate ash-left-mod32))
+
+(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)))
+ (when (sb!c::constant-lvar-p count)
+ (sb!c::give-up-ir1-transform))
+ '(%primitive fast-ash-left-mod32/unsigned=>unsigned integer count))
\f
;;;; Binary conditional VOPs:
(emit-label done)
(move result res))))
-(define-source-transform 32bit-logical-not (x)
- `(logand (lognot (the (unsigned-byte 32) ,x)) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-and ((x y))
- '(logand x y))
-
-(deftransform 32bit-logical-nand ((x y))
- '(logand (lognand x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-or ((x y))
- '(logior x y))
-
-(deftransform 32bit-logical-nor ((x y))
- '(logand (lognor x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-xor ((x y))
- '(logxor x y))
-
-(deftransform 32bit-logical-eqv ((x y))
- '(logand (logeqv x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-orc1 ((x y))
- '(logand (logorc1 x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-orc2 ((x y))
- '(logand (logorc2 x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-andc1 ((x y))
- '(logand (logandc1 x y) #.(1- (ash 1 32))))
-
-(deftransform 32bit-logical-andc2 ((x y))
- '(logand (logandc2 x y) #.(1- (ash 1 32))))
-
(define-vop (shift-towards-someplace)
(:policy :fast-safe)
(:args (num :scs (unsigned-reg))