;;; The compiler likes to be able to directly SET symbols.
(define-vop (set cell-set)
- (:variant symbol-value-slot other-pointer-type))
+ (:variant symbol-value-slot other-pointer-lowtag))
;;; Do a cell ref with an error check for being unbound.
(define-vop (checked-cell-ref)
(:translate symbol-value)
(:generator 9
(move object obj-temp)
- (loadw value obj-temp symbol-value-slot other-pointer-type)
+ (loadw value obj-temp symbol-value-slot other-pointer-lowtag)
(let ((err-lab (generate-error-code vop unbound-symbol-error obj-temp)))
- (inst xor value unbound-marker-type temp)
+ (inst xor value unbound-marker-widetag temp)
(inst beq temp err-lab))))
;;; Like CHECKED-CELL-REF, only we are a predicate to see if the cell
(define-vop (boundp boundp-frob)
(:translate boundp)
(:generator 9
- (loadw value object symbol-value-slot other-pointer-type)
- (inst xor value unbound-marker-type temp)
+ (loadw value object symbol-value-slot other-pointer-lowtag)
+ (inst xor value unbound-marker-widetag temp)
(if not-p
(inst beq temp target)
(inst bne temp target))))
(define-vop (fast-symbol-value cell-ref)
- (:variant symbol-value-slot other-pointer-type)
+ (:variant symbol-value-slot other-pointer-lowtag)
(:policy :fast)
(:translate symbol-value))
\f
-;;;; FDEFINITION (fdefn) objects
+;;;; fdefinition (FDEFN) objects
-(define-vop (fdefn-function cell-ref)
- (:variant fdefn-function-slot other-pointer-type))
+(define-vop (fdefn-fun cell-ref)
+ (:variant fdefn-fun-slot other-pointer-lowtag))
-(define-vop (safe-fdefn-function)
+(define-vop (safe-fdefn-fun)
(:args (object :scs (descriptor-reg) :target obj-temp))
(:results (value :scs (descriptor-reg any-reg)))
(:vop-var vop)
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 10
(move object obj-temp)
- (loadw value obj-temp fdefn-function-slot other-pointer-type)
+ (loadw value obj-temp fdefn-fun-slot other-pointer-lowtag)
(let ((err-lab (generate-error-code vop undefined-symbol-error obj-temp)))
(inst cmpeq value null-tn temp)
(inst bne temp err-lab))))
-(define-vop (set-fdefn-function)
+(define-vop (set-fdefn-fun)
(:policy :fast-safe)
- (:translate (setf fdefn-function))
+ (:translate (setf fdefn-fun))
(:args (function :scs (descriptor-reg) :target result)
(fdefn :scs (descriptor-reg)))
(:temporary (:scs (interior-reg)) lip)
(:results (result :scs (descriptor-reg)))
(:generator 38
(let ((normal-fn (gen-label)))
- (load-type type function (- function-pointer-type))
- (inst xor type function-header-type type)
+ (load-type type function (- fun-pointer-lowtag))
+ (inst xor type simple-fun-header-widetag type)
(inst addq function
- (- (ash function-code-offset word-shift) function-pointer-type)
+ (- (ash simple-fun-code-offset word-shift) fun-pointer-lowtag)
lip)
(inst beq type normal-fn)
(inst li (make-fixup "closure_tramp" :foreign) lip)
(emit-label normal-fn)
- (storew lip fdefn fdefn-raw-addr-slot other-pointer-type)
- (storew function fdefn fdefn-function-slot other-pointer-type)
+ (storew lip fdefn fdefn-raw-addr-slot other-pointer-lowtag)
+ (storew function fdefn fdefn-fun-slot other-pointer-lowtag)
(move function result))))
(:temporary (:scs (non-descriptor-reg)) temp)
(:results (result :scs (descriptor-reg)))
(:generator 38
- (storew null-tn fdefn fdefn-function-slot other-pointer-type)
+ (storew null-tn fdefn fdefn-fun-slot other-pointer-lowtag)
(inst li (make-fixup "undefined_tramp" :foreign) temp)
(move fdefn result)
- (storew temp fdefn fdefn-raw-addr-slot other-pointer-type)))
+ (storew temp fdefn fdefn-raw-addr-slot other-pointer-lowtag)))
\f
;;;; binding and Unbinding
(symbol :scs (descriptor-reg)))
(:temporary (:scs (descriptor-reg)) temp)
(:generator 5
- (loadw temp symbol symbol-value-slot other-pointer-type)
- (inst addq bsp-tn (* 2 word-bytes) bsp-tn)
+ (loadw temp symbol symbol-value-slot other-pointer-lowtag)
+ (inst addq bsp-tn (* 2 n-word-bytes) bsp-tn)
(storew temp bsp-tn (- binding-value-slot binding-size))
(storew symbol bsp-tn (- binding-symbol-slot binding-size))
(#+gengc storew-and-remember-slot #-gengc storew
- val symbol symbol-value-slot other-pointer-type)))
+ val symbol symbol-value-slot other-pointer-lowtag)))
(define-vop (unbind)
(loadw symbol bsp-tn (- binding-symbol-slot binding-size))
(loadw value bsp-tn (- binding-value-slot binding-size))
(#+gengc storew-and-remember-slot #-gengc storew
- value symbol symbol-value-slot other-pointer-type)
+ value symbol symbol-value-slot other-pointer-lowtag)
(storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
- (inst subq bsp-tn (* 2 word-bytes) bsp-tn)))
+ (inst subq bsp-tn (* 2 n-word-bytes) bsp-tn)))
(define-vop (unbind-to-here)
(loadw value bsp-tn (- binding-value-slot binding-size))
(inst beq symbol skip)
(#+gengc storew-and-remember-slot #-gengc storew
- value symbol symbol-value-slot other-pointer-type)
+ value symbol symbol-value-slot other-pointer-lowtag)
(storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
(emit-label skip)
- (inst subq bsp-tn (* 2 word-bytes) bsp-tn)
+ (inst subq bsp-tn (* 2 n-word-bytes) bsp-tn)
(inst cmpeq where bsp-tn temp)
(inst beq temp loop)
;;;; closure indexing
(define-full-reffer closure-index-ref *
- closure-info-offset function-pointer-type
+ closure-info-offset fun-pointer-lowtag
(descriptor-reg any-reg) * %closure-index-ref)
(define-full-setter set-funcallable-instance-info *
- funcallable-instance-info-offset function-pointer-type
+ funcallable-instance-info-offset fun-pointer-lowtag
(descriptor-reg any-reg null zero) * %set-funcallable-instance-info)
(define-full-reffer funcallable-instance-info *
- funcallable-instance-info-offset function-pointer-type
+ funcallable-instance-info-offset fun-pointer-lowtag
(descriptor-reg any-reg) * %funcallable-instance-info)
(define-vop (funcallable-instance-lexenv cell-ref)
- (:variant funcallable-instance-lexenv-slot function-pointer-type))
+ (:variant funcallable-instance-lexenv-slot fun-pointer-lowtag))
(define-vop (closure-ref slot-ref)
- (:variant closure-info-offset function-pointer-type))
+ (:variant closure-info-offset fun-pointer-lowtag))
(define-vop (closure-init slot-set)
- (:variant closure-info-offset function-pointer-type))
+ (:variant closure-info-offset fun-pointer-lowtag))
\f
;;;; value cell hackery
(define-vop (value-cell-ref cell-ref)
- (:variant value-cell-value-slot other-pointer-type))
+ (:variant value-cell-value-slot other-pointer-lowtag))
(define-vop (value-cell-set cell-set)
- (:variant value-cell-value-slot other-pointer-type))
+ (:variant value-cell-value-slot other-pointer-lowtag))
\f
;;;; instance hackery
(:results (res :scs (unsigned-reg)))
(:result-types positive-fixnum)
(:generator 4
- (loadw res struct 0 instance-pointer-type)
- (inst srl res type-bits res)))
+ (loadw res struct 0 instance-pointer-lowtag)
+ (inst srl res n-widetag-bits res)))
(define-vop (instance-ref slot-ref)
- (:variant instance-slots-offset instance-pointer-type)
+ (:variant instance-slots-offset instance-pointer-lowtag)
(:policy :fast-safe)
(:translate %instance-ref)
(:arg-types instance (:constant index)))
(define-vop (instance-set slot-set)
(:policy :fast-safe)
(:translate %instance-set)
- (:variant instance-slots-offset instance-pointer-type)
+ (:variant instance-slots-offset instance-pointer-lowtag)
(:arg-types instance (:constant index) *))
(define-full-reffer instance-index-ref * instance-slots-offset
- instance-pointer-type (descriptor-reg any-reg) * %instance-ref)
+ instance-pointer-lowtag (descriptor-reg any-reg) * %instance-ref)
(define-full-setter instance-index-set * instance-slots-offset
- instance-pointer-type (descriptor-reg any-reg null zero) * %instance-set)
+ instance-pointer-lowtag (descriptor-reg any-reg null zero) * %instance-set)
\f
;;;; code object frobbing
-(define-full-reffer code-header-ref * 0 other-pointer-type
+(define-full-reffer code-header-ref * 0 other-pointer-lowtag
(descriptor-reg any-reg) * code-header-ref)
-(define-full-setter code-header-set * 0 other-pointer-type
+(define-full-setter code-header-set * 0 other-pointer-lowtag
(descriptor-reg any-reg null zero) * code-header-set)
\f
;;;; mutator accessing