(define-vop (set-slot)
(:args (object :scs (descriptor-reg))
- (value :scs (descriptor-reg any-reg null zero)))
+ (value :scs (descriptor-reg any-reg null zero)))
(:info name offset lowtag #!+gengc remember)
(:ignore name)
(:results)
(:generator 1
#!+gengc
(if remember
- (storew-and-remember-slot value object offset lowtag)
- (storew value object offset lowtag))
+ (storew-and-remember-slot value object offset lowtag)
+ (storew value object offset lowtag))
#!-gengc
(storew value object offset lowtag)))
+
+(define-vop (init-slot set-slot))
\f
;;;; symbol hacking VOPs
(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))))
+ (inst beq temp target)
+ (inst bne temp target))))
(define-vop (fast-symbol-value cell-ref)
(:variant symbol-value-slot other-pointer-lowtag)
;; ensure this is explained in the comment in objdef.lisp
(loadw res symbol symbol-hash-slot other-pointer-lowtag)
(inst bic res #.(ash lowtag-mask -1) res)))
+
+;;; On unithreaded builds these are just copies of the non-global versions.
+(define-vop (%set-symbol-global-value set))
+(define-vop (symbol-global-value symbol-value)
+ (:translate symbol-global-value))
+(define-vop (fast-symbol-global-value fast-symbol-value)
+ (:translate symbol-global-value))
\f
;;;; fdefinition (FDEFN) objects
(:policy :fast-safe)
(:translate (setf fdefn-fun))
(:args (function :scs (descriptor-reg) :target result)
- (fdefn :scs (descriptor-reg)))
+ (fdefn :scs (descriptor-reg)))
(:temporary (:scs (interior-reg)) lip)
(:temporary (:scs (non-descriptor-reg)) type)
(:results (result :scs (descriptor-reg)))
(load-type type function (- fun-pointer-lowtag))
(inst xor type simple-fun-header-widetag type)
(inst addq function
- (- (ash simple-fun-code-offset word-shift) fun-pointer-lowtag)
- lip)
+ (- (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-lowtag)
(storew function fdefn fdefn-fun-slot other-pointer-lowtag)
(move function result))))
-
+
(define-vop (fdefn-makunbound)
(:policy :fast-safe)
;;; symbol on the binding stack and stuff the new value into the symbol.
(define-vop (bind)
(:args (val :scs (any-reg descriptor-reg))
- (symbol :scs (descriptor-reg)))
+ (symbol :scs (descriptor-reg)))
(:temporary (:scs (descriptor-reg)) temp)
(:generator 5
(loadw temp symbol symbol-value-slot other-pointer-lowtag)
(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-lowtag)))
+ 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-lowtag)
+ value symbol symbol-value-slot other-pointer-lowtag)
(storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
+ (storew zero-tn bsp-tn (- binding-value-slot binding-size))
(inst subq bsp-tn (* 2 n-word-bytes) bsp-tn)))
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 0
(let ((loop (gen-label))
- (skip (gen-label))
- (done (gen-label)))
+ (skip (gen-label))
+ (done (gen-label)))
(move arg where)
(inst cmpeq where bsp-tn temp)
(inst bne temp done)
(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-lowtag)
+ value symbol symbol-value-slot other-pointer-lowtag)
(storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
(emit-label skip)
+ (storew zero-tn bsp-tn (- binding-value-slot binding-size))
(inst subq bsp-tn (* 2 n-word-bytes) bsp-tn)
(inst cmpeq where bsp-tn temp)
(inst beq temp loop)
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 fun-pointer-lowtag))
-
(define-vop (closure-ref slot-ref)
(:variant closure-info-offset fun-pointer-lowtag))
(define-vop (closure-init slot-set)
(:variant closure-info-offset fun-pointer-lowtag))
+
+(define-vop (closure-init-from-fp)
+ (:args (object :scs (descriptor-reg)))
+ (:info offset)
+ (:generator 4
+ (storew cfp-tn object (+ closure-info-offset offset) fun-pointer-lowtag)))
\f
;;;; value cell hackery
(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-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-lowtag)
- (:arg-types instance (:constant index) *))
-
(define-full-reffer instance-index-ref * instance-slots-offset
instance-pointer-lowtag (descriptor-reg any-reg) * %instance-ref)
(offset (symbolicate "MUTATOR-" slot "-SLOT"))
(fn
(let ((*package* (find-package :kernel)))
- (symbolicate "MUTATOR-" slot))))
+ (symbolicate "MUTATOR-" slot))))
(multiple-value-bind
(lisp-type ref-vop set-vop)
(ecase type
(:des
(values t
- 'mutator-descriptor-ref
- 'mutator-descriptor-set))
+ 'mutator-descriptor-ref
+ 'mutator-descriptor-set))
(:ub32
(values '(unsigned-byte 32)
- 'mutator-ub32-ref
- 'mutator-ub32-set))
+ 'mutator-ub32-ref
+ 'mutator-ub32-set))
(:sap
(values 'system-area-pointer
- 'mutator-sap-ref
- 'mutator-sap-set)))
+ 'mutator-sap-ref
+ 'mutator-sap-set)))
`(progn
(export ',fn :kernel)
(defknown ,fn () ,lisp-type (flushable))
(:variant ,offset))
,@(when writable
`((defknown ((setf ,fn)) (,lisp-type) ,lisp-type
- (unsafe))
+ (unsafe))
(define-vop (,set ,set-vop)
(:translate (setf ,fn))
(:variant ,offset)))))))))
(:translate %raw-instance-ref/word)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg)))
+ (index :scs (any-reg)))
(:arg-types * positive-fixnum)
(:results (value :scs (unsigned-reg)))
(:temporary (:scs (non-descriptor-reg)) offset)
(inst subq offset n-word-bytes offset)
(inst addq object offset lip)
(inst ldl
- value
- (- (* instance-slots-offset n-word-bytes)
+ value
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)
+ lip)
(inst mskll value 4 value)))
(define-vop (raw-instance-set/word)
(:translate %raw-instance-set/word)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg))
+ (index :scs (any-reg))
(value :scs (unsigned-reg)))
(:arg-types * positive-fixnum unsigned-num)
(:results (result :scs (unsigned-reg)))
(inst subq offset n-word-bytes offset)
(inst addq object offset lip)
(inst stl
- value
- (- (* instance-slots-offset n-word-bytes)
+ value
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)
+ lip)
(move value result)))
(define-vop (raw-instance-ref/single)
(:translate %raw-instance-ref/single)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg)))
+ (index :scs (any-reg)))
(:arg-types * positive-fixnum)
(:results (value :scs (single-reg)))
(:temporary (:scs (non-descriptor-reg)) offset)
(inst subq offset n-word-bytes offset)
(inst addq object offset lip)
(inst lds
- value
- (- (* instance-slots-offset n-word-bytes)
+ value
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)))
+ lip)))
(define-vop (raw-instance-set/single)
(:translate %raw-instance-set/single)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg))
+ (index :scs (any-reg))
(value :scs (single-reg)))
(:arg-types * positive-fixnum single-float)
(:results (result :scs (single-reg)))
(inst subq offset n-word-bytes offset)
(inst addq object offset lip)
(inst sts
- value
- (- (* instance-slots-offset n-word-bytes)
+ value
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)
+ lip)
(unless (location= result value)
(inst fmove value result))))
(:translate %raw-instance-ref/double)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg)))
+ (index :scs (any-reg)))
(:arg-types * positive-fixnum)
(:results (value :scs (double-reg)))
(:temporary (:scs (non-descriptor-reg)) offset)
(inst subq offset (* 2 n-word-bytes) offset)
(inst addq object offset lip)
(inst ldt
- value
- (- (* instance-slots-offset n-word-bytes)
+ value
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)))
+ lip)))
(define-vop (raw-instance-set/double)
(:translate %raw-instance-set/double)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg))
+ (index :scs (any-reg))
(value :scs (double-reg)))
(:arg-types * positive-fixnum double-float)
(:results (result :scs (double-reg)))
(inst subq offset (* 2 n-word-bytes) offset)
(inst addq object offset lip)
(inst stt
- value
- (- (* instance-slots-offset n-word-bytes)
+ value
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)
+ lip)
(unless (location= result value)
(inst fmove value result))))
(:translate %raw-instance-ref/complex-single)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg)))
+ (index :scs (any-reg)))
(:arg-types * positive-fixnum)
(:results (value :scs (complex-single-reg)))
(:temporary (:scs (non-descriptor-reg)) offset)
(inst subq offset (* 2 n-word-bytes) offset)
(inst addq object offset lip)
(inst lds
- (complex-double-reg-real-tn value)
- (- (* instance-slots-offset n-word-bytes)
+ (complex-double-reg-real-tn value)
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)
+ lip)
(inst lds
- (complex-double-reg-imag-tn value)
- (- (* (1+ instance-slots-offset) n-word-bytes)
+ (complex-double-reg-imag-tn value)
+ (- (* (1+ instance-slots-offset) n-word-bytes)
instance-pointer-lowtag)
- lip)))
+ lip)))
(define-vop (raw-instance-set/complex-single)
(:translate %raw-instance-set/complex-single)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg))
+ (index :scs (any-reg))
(value :scs (complex-single-reg)))
(:arg-types * positive-fixnum complex-single-float)
(:results (result :scs (complex-single-reg)))
(let ((value-real (complex-single-reg-real-tn value))
(result-real (complex-single-reg-real-tn result)))
(inst sts
- value-real
- (- (* instance-slots-offset n-word-bytes)
- instance-pointer-lowtag)
- lip)
+ value-real
+ (- (* instance-slots-offset n-word-bytes)
+ instance-pointer-lowtag)
+ lip)
(unless (location= result-real value-real)
- (inst fmove value-real result-real)))
+ (inst fmove value-real result-real)))
(let ((value-imag (complex-single-reg-imag-tn value))
(result-imag (complex-single-reg-imag-tn result)))
(inst sts
- value-imag
- (- (* (1+ instance-slots-offset) n-word-bytes)
- instance-pointer-lowtag)
- lip)
+ value-imag
+ (- (* (1+ instance-slots-offset) n-word-bytes)
+ instance-pointer-lowtag)
+ lip)
(unless (location= result-imag value-imag)
- (inst fmove value-imag result-imag)))))
+ (inst fmove value-imag result-imag)))))
(define-vop (raw-instance-ref/complex-double)
(:translate %raw-instance-ref/complex-double)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg)))
+ (index :scs (any-reg)))
(:arg-types * positive-fixnum)
(:results (value :scs (complex-double-reg)))
(:temporary (:scs (non-descriptor-reg)) offset)
(inst subq offset (* 4 n-word-bytes) offset)
(inst addq object offset lip)
(inst ldt
- (complex-double-reg-real-tn value)
- (- (* instance-slots-offset n-word-bytes)
+ (complex-double-reg-real-tn value)
+ (- (* instance-slots-offset n-word-bytes)
instance-pointer-lowtag)
- lip)
+ lip)
(inst ldt
- (complex-double-reg-imag-tn value)
- (- (* (+ instance-slots-offset 2) n-word-bytes)
+ (complex-double-reg-imag-tn value)
+ (- (* (+ instance-slots-offset 2) n-word-bytes)
instance-pointer-lowtag)
- lip)))
+ lip)))
(define-vop (raw-instance-set/complex-double)
(:translate %raw-instance-set/complex-double)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
- (index :scs (any-reg))
+ (index :scs (any-reg))
(value :scs (complex-double-reg)))
(:arg-types * positive-fixnum complex-double-float)
(:results (result :scs (complex-double-reg)))
(let ((value-real (complex-double-reg-real-tn value))
(result-real (complex-double-reg-real-tn result)))
(inst stt
- value-real
- (- (* instance-slots-offset n-word-bytes)
- instance-pointer-lowtag)
- lip)
+ value-real
+ (- (* instance-slots-offset n-word-bytes)
+ instance-pointer-lowtag)
+ lip)
(unless (location= result-real value-real)
- (inst fmove value-real result-real)))
+ (inst fmove value-real result-real)))
(let ((value-imag (complex-double-reg-imag-tn value))
(result-imag (complex-double-reg-imag-tn result)))
(inst stt
- value-imag
- (- (* (+ instance-slots-offset 2) n-word-bytes)
- instance-pointer-lowtag)
- lip)
+ value-imag
+ (- (* (+ instance-slots-offset 2) n-word-bytes)
+ instance-pointer-lowtag)
+ lip)
(unless (location= result-imag value-imag)
- (inst fmove value-imag result-imag)))))
+ (inst fmove value-imag result-imag)))))