(inst beq done)
;; Okay, it is an immediate. If fixnum, we want zero. Otherwise,
;; we want the low 8 bits.
- (inst andi. result object #b11)
+ (inst andi. result object fixnum-tag-mask)
(inst beq done)
;; It wasn't a fixnum, so get the low 8 bits.
(inst andi. result object widetag-mask)
(inst andi. t1 t1 widetag-mask)
(sc-case data
(any-reg
- (inst slwi t2 data (- n-widetag-bits 2))
+ (inst slwi t2 data (- n-widetag-bits n-fixnum-tag-bits))
(inst or t1 t1 t2))
(immediate
(inst ori t1 t1 (ash (tn-value data) n-widetag-bits)))
(move res x)))
-(define-vop (make-fixnum)
+(define-vop (pointer-hash)
+ (:translate pointer-hash)
(:args (ptr :scs (any-reg descriptor-reg)))
(:results (res :scs (any-reg descriptor-reg)))
+ (:policy :fast-safe)
(:generator 1
- ;;
- ;; Some code (the hash table code) depends on this returning a
- ;; positive number so make sure it does.
- (inst slwi res ptr 3)
- (inst srwi res res 1)))
+ ;; FIXME: It would be better if this would mask the lowtag,
+ ;; and shift the result into a positive fixnum like on x86.
+ (inst rlwinm res ptr n-fixnum-tag-bits 1 n-positive-fixnum-bits)))
(define-vop (make-other-immediate-type)
(:args (val :scs (any-reg descriptor-reg))
(inst slwi temp val n-widetag-bits)
(inst ori res temp (tn-value type)))
(t
- (inst srawi temp type 2)
- (inst slwi res val (- n-widetag-bits 2))
+ (inst srawi temp type n-fixnum-tag-bits)
+ (inst slwi res val (- n-widetag-bits n-fixnum-tag-bits))
(inst or res res temp)))))
\f